diff options
| -rw-r--r-- | build.gradle | 31 | ||||
| -rw-r--r-- | dependencies.gradle | 26 |
2 files changed, 26 insertions, 31 deletions
diff --git a/build.gradle b/build.gradle index 50c3291c86..f4f81bd7e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1702141377 +//version: 1704135167 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -31,8 +31,7 @@ buildscript { maven { // GTNH RetroFuturaGradle and ASM Fork name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true + url "https://nexus.gtnewhorizons.com/repository/public/" } mavenLocal() } @@ -49,7 +48,7 @@ plugins { id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.palantir.git-version' version '3.0.0' apply false - id 'de.undercouch.download' version '5.4.0' + id 'de.undercouch.download' version '5.5.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false @@ -118,7 +117,7 @@ propertyDefaultIfUnset("forceEnableMixins", false) propertyDefaultIfUnset("channel", "stable") propertyDefaultIfUnset("mappingsVersion", "12") propertyDefaultIfUnset("usesMavenPublishing", true) -propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") +propertyDefaultIfUnset("mavenPublishUrl", "https://nexus.gtnewhorizons.com/repository/releases/") propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") @@ -573,13 +572,15 @@ afterEvaluate { repositories { maven { - name 'Overmind forge repo mirror' - url 'https://gregtech.overminddl1.com/' + name = "GTNH Maven" + url = "https://nexus.gtnewhorizons.com/repository/public/" + // Links for convenience: + // Simple HTML browsing: https://nexus.gtnewhorizons.com/service/rest/repository/browse/releases/ + // Rich web UI browsing: https://nexus.gtnewhorizons.com/#browse/browse:releases } maven { - name = "GTNH Maven" - url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true + name 'Overmind forge repo mirror' + url 'https://gregtech.overminddl1.com/' } maven { name 'sonatype' @@ -960,8 +961,7 @@ if (usesShadowedDependencies.toBoolean()) { configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) tasks.named("jar", Jar) { - enabled = false - finalizedBy(tasks.shadowJar) + archiveClassifier.set('dev-preshadow') } tasks.named("reobfJar", ReobfuscatedJar) { inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile})) @@ -970,11 +970,6 @@ if (usesShadowedDependencies.toBoolean()) { javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { skip() } - for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) { - tasks.named(runTask).configure { - dependsOn("shadowJar") - } - } } ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar ext.publishableObfJar = tasks.reobfJar @@ -1178,7 +1173,7 @@ publishing { if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) { maven { url = mavenPublishUrl - allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven + allowInsecureProtocol = mavenPublishUrl.startsWith("http://") credentials { username = System.getenv("MAVEN_USER") ?: "NONE" password = System.getenv("MAVEN_PASSWORD") ?: "NONE" diff --git a/dependencies.gradle b/dependencies.gradle index d6856f6c2b..98f51b6350 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,20 +35,20 @@ */ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.108:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev') { exclude group:"com.github.GTNewHorizons", module:"ModularUI" } - api("com.github.GTNewHorizons:EnderCore:0.2.18:dev") - api("com.github.GTNewHorizons:EnderIO:2.5.8:dev") - api("com.github.GTNewHorizons:ForestryMC:4.7.0:dev") + api("com.github.GTNewHorizons:EnderCore:0.2.19:dev") + api("com.github.GTNewHorizons:EnderIO:2.6.2:dev") + api("com.github.GTNewHorizons:ForestryMC:4.8.1:dev") api("com.github.GTNewHorizons:ModularUI:1.1.24:dev") - api("com.github.GTNewHorizons:Mobs-Info:0.1.12-GTNH:dev") + api("com.github.GTNewHorizons:Mobs-Info:0.2.1-GTNH:dev") devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev") //compileOnly("curse.maven:extrautilities-225561:2264384") { // transitive = false //} - compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.0:dev") + compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.9:dev") { transitive = false } @@ -64,11 +64,11 @@ dependencies { { transitive = false } - compileOnly("com.github.GTNewHorizons:bartworks:0.8.22:dev") + compileOnly("com.github.GTNewHorizons:bartworks:0.9.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.0:dev") + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.4:dev") { transitive = false } @@ -87,16 +87,16 @@ dependencies { // For testing //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.3-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.11.0:dev") + //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.11.9:dev") //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.4-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.0:dev") - //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.8.2-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.22:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.4:dev") + //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.8.3-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:bartworks:0.9.3:dev") //runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev") //api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev") //api("com.github.GTNewHorizons:twilightforest:2.5.1:dev") //api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev") - runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.2.1-GTNH:dev") + runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.2.2-GTNH:dev") //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") //runtimeOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") //api("curse.maven:witchery-69673:2234410") |