Skip to content

Commit

Permalink
started work on updating gradle stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Sep 1, 2024
1 parent e2f2370 commit 3c40981
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 105 deletions.
13 changes: 6 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "maven-publish"
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply(false)
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply(false)
id "com.github.johnrengelman.shadow" version "7.0.0" apply(false)
}

Expand Down Expand Up @@ -49,12 +49,11 @@ allprojects {
apply plugin: "maven-publish"
apply plugin: "java"
apply plugin: "architectury-plugin"
apply from: 'https://raw.githubusercontent.com/GregTech-Intergalactical/GradleSripts/main/repositories.gradle'


group = rootProject.maven_group

apply from: 'https://raw.githubusercontent.com/GregTech-Intergalactical/GradleSripts/main/repositories.gradle'

java {
withSourcesJar()
}
Expand Down Expand Up @@ -87,20 +86,20 @@ subprojects{

shadowJar {
configurations = [project.configurations.shadowCommon]
classifier "dev-shadow"
archiveClassifier.set "dev-shadow"
}

remapJar {
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
archiveClassifier.set null
}

jar {
classifier "dev"
archiveClassifier.set "dev"
}

components.java {
components.java {
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
skip()
}
Expand Down
13 changes: 1 addition & 12 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,7 @@ architectury {
loom{
accessWidenerPath = project(":antimatter-common").file("src/main/resources/antimatter.accesswidener")
forge {
mixinConfigs = [
"gt4r.mixins.json", "gt4r.mixins.forge.json"
]
dataGen {
mod project.modid
}

launches {
data {
arg "--existing", file("src/main/resources").absolutePath
}
}
mixinConfigs("gt4r.mixins.json")
}
}

Expand Down

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions forge/src/main/resources/gt4r.mixins.forge.json

This file was deleted.

12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx5G
org.gradle.daemon=false
org.gradle.parallel=true

mod_version=0.1-alpha-15
mod_version=0.1-alpha-16
archive_base_name=gt4r
modid=gt4r

Expand All @@ -15,10 +15,10 @@ fabric_api_version=0.76.0+1.18.2
fabric_transfer_api_version=1.6.+
fabric_loader_version=0.14.6

gt_core_version=0.1.1-pre32
gt_core_version=0.1.1-pre38
terraform_version=3.1.4
jei_version=10.1.0.223
crafttweaker_version=9.1.90
jei_version=10.2.1.1004
crafttweaker_version=9.1.207
kubejs_version=1802.5.1-build.329
nightconfig_version=3.6.5
port_lib_version=1.2.575
Expand All @@ -31,9 +31,9 @@ energy_version=2.2.0
top_forge_file=3671753
structurelib_version=2.0.0-pre10
carbon_config_fabric_version=ec9yfAHJ
carbon_config_forge_version=L3ipBBnb
carbon_config_forge_version=u2cqt0OR

maven_group=com.github.gregtech-intergalactical
maven_group=io.github.gregtechintergalactical

antimatter_mod_version=0.1
antimatter_archive_base_name=AntimatterAPI
Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Aug 20 17:56:19 CEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 3c40981

Please sign in to comment.