update deps +bs

GTNewHorizons · Jan 3, 2024 · fd33d7c · fd33d7c
1 parent 07330c4
commit fd33d7c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git 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
@@ -2,24 +2,24 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev')
     api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
     implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev')
 
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false}
-    compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.45:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.1-GTNH:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:GTplusplus:1.11.9:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Avaritia:1.46:dev') {transitive=false}
 
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
     compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive=false}
 
     // for testing EOH recipes
     //runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf")
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.50:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.7.14:dev') {
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev')
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.4:dev')
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.8.2:dev') {
     //    exclude group: "com.github.GTNewHorizons", module: "TecTech"
     //}
     //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive=false}