Merge pull request #9 from GTNewHorizons/maven

Maven

3 files changed, 46 insertions, 92 deletions

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 56a1ad52cc..948a90b218 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -33,11 +33,11 @@ jobs:
     - name: Build the mod
       run: ./gradlew build
 
-    - name: Run server for 1.5 minutes
+    - name: Run server for 3 minutes
       run: |
         mkdir run
         echo "eula=true" > run/eula.txt
-        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
+        timeout 180 ./gradlew runServer 2>&1 | tee -a server.log || true
 
     - name: Test no errors reported during server run
       run: |
diff --git a/dependencies.gradle b/dependencies.gradle
index c629fcb6f4..2314f8d404 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,60 +1,39 @@
 // Add your dependencies here
 
 dependencies {
-	
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.39:dev")
-	compile("com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.21:dev")
-    compile("com.github.GTNewHorizons:StructureLib:1.0.16:dev")
-
-    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:EnderCore:0.2.6:dev") {
-        transitive = false
-    }
-	
-    compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-79-GTNH:dev")
-	
-    compile("com.github.GTNewHorizons:bartworks:0.5.39:dev")
-
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.28:dev") {
-
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:AppleCore:3.1.9:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:TecTech:5.0.6:dev")
-	compile("com.github.GTNewHorizons:GoodGenerator:0.4.1:dev")
-    compile("com.github.GTNewHorizons:ForestryMC:4.4.6:dev")
-    compileOnly("com.github.GTNewHorizons:Railcraft:9.13.6:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.31:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:BuildCraft:7.1.27:dev") {
-        transitive = false
-    }
-
-	compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
-    compile("com.github.GTNewHorizons:CodeChickenCore:1.1.5:dev")
-	
-	//compile files('Botdustries-1.7.10-1.0.1.jar')
-    
-	runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
-    runtime("com.github.GTNewHorizons:Yamcl:0.5.82:dev")
-    
-	compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.9:dev") {
-        transitive = false
-    }
-	
-/*    compileOnly("com.github.GTNewHorizons:Avaritia:1.25) {
-        setChanging(true)
-    }*/
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
-        transitive = false
-    }
+    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.39:dev')
+	compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.21:dev')
+    compile('com.github.GTNewHorizons:StructureLib:1.0.16:dev')
+    compile('com.github.GTNewHorizons:GTplusplus:1.7.28:dev')
+    compile('com.github.GTNewHorizons:GoodGenerator:0.4.1:dev')
+    compile('com.github.GTNewHorizons:TecTech:5.0.6:dev')
+    compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
+    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-79-GTNH:dev')
+    compile('com.github.GTNewHorizons:bartworks:0.5.39:dev')
+    compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev')
+
+    compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+
+    compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.31:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive=false}
+
+    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
+
+	//compile('com.github.GTNewHorizons:GalacticGregGT5:1.0.7:dev')
+	//compile('com.github.GTNewHorizons:TecTech:5.0.6:dev')
+	//compile('com.github.GTNewHorizons:Galacticraft:3.0.40-GTNH:dev')
+
+    //compileOnly('com.github.GTNewHorizons:Avaritia:1.25)
+
 	//compile files('ThaumicTinkerer-1.7.10-2.5-4-dev.jar')
-	
+    //compile files('Botdustries-1.7.10-1.0.1.jar')
+
+   	//runtime('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
+    //runtime('com.github.GTNewHorizons:Yamcl:0.5.82:dev')
+    runtime('curse.maven:cofh-core-69162:2388751') //for GT++
+    runtime('curse.maven:advsolar-362768:2885953') //for GT++
 }
diff --git a/repositories.gradle b/repositories.gradle
index 7dc8d31382..1dc4c3cb4c 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,51 +1,26 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    jcenter()
-    maven { // EnderIO & EnderCore
-        name = 'tterrag Repo'
-        url = "http://maven.tterrag.com"
-    }
-    maven {
-        name = "CodeChicken"
-        url = "http://chickenbones.net/maven/"
-    }
     maven {
-        name = "sponge"
-        url = "https://repo.spongepowered.org/repository/maven-public"
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+        allowInsecureProtocol
     }
     maven {
-        name = "ic2"
-        url = "https://maven.ic2.player.to/"
+        name 'ic2'
+        url 'https://maven.ic2.player.to/'
         metadataSources {
             mavenPom()
             artifact()
         }
     }
-	
-	maven {
-		url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-	}
-	
     maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        url = "https://jitpack.io"
-    }
-    ivy {
-        name = "gtnh_download_source"
-        artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
-    }
-    maven {
-        name = "UsrvDE/GTNH"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/"
-    }
-    maven {
-        name = "gt"
-        url = "https://gregtech.overminddl1.com/"
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
     }
     maven {
-        url = "http://www.ryanliptak.com/maven/"
+        url 'https://jitpack.io'
     }
 }