Merge addon dependencies

5 files changed, 17 insertions, 75 deletions

diff --git a/bartworks/dependencies.gradle b/bartworks/dependencies.gradle
deleted file mode 100644
index 1c63563399..0000000000
--- a/bartworks/dependencies.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-// Add your dependencies here
-
-dependencies {
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev')
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:waila:1.8.0:dev')
-
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha50:api') { transitive = false }
-
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.23:dev')
-    api("com.github.GTNewHorizons:TecTech:5.4.2:dev")
-    api("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") {
-        exclude group:"com.github.GTNewHorizons", module:"bartworks"
-    }
-    api("com.github.GTNewHorizons:Avaritia:1.49:dev")
-    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.1-GTNH:dev")
-
-    compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:api") {transitive = false}
-}
diff --git a/dependencies.gradle b/dependencies.gradle
index 955bd5b4e8..83a8a5cbc1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -42,20 +42,23 @@ dependencies {
     api("com.github.GTNewHorizons:waila:1.8.0:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-402-GTNH:dev")
     api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.0-gtnh:dev")
+    api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
 
+    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev') { transitive = false }
     implementation("com.github.GTNewHorizons:Avaritia:1.49:dev")
+    implementation("com.github.GTNewHorizons:ForestryMC:4.9.0:dev") { transitive = false }
 
     compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha50:api') { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.0:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.9.5-GTNH:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.0:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false }
 
+    compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
     compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.1-GTNH:dev") { transitive = false }
+    implementation("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev") { transitive = false }
+    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.1-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Chisel:2.15.0-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
     compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false }
@@ -64,7 +67,18 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.8:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:Botania:1.11.1-GTNH:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.10-GTNH:dev') { transitive = false }
+    compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive=false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false }
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:api") {transitive = false}
+    // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
+    implementation('curse.maven:advsolar-362768:2885953')
+
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:SC2:2.1.1:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:Binnie:2.3.4:dev') {transitive = false}
+    compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
+
+    shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
 
     compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
     annotationProcessor("com.google.auto.value:auto-value:1.10.1")
diff --git a/galacticgreg/dependencies.gradle b/galacticgreg/dependencies.gradle
deleted file mode 100644
index 1a4675dd3d..0000000000
--- a/galacticgreg/dependencies.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-// Add your dependencies here
-
-dependencies {
-    api("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev")
-    api("com.github.GTNewHorizons:bartworks:0.9.2:dev") {
-        exclude group:"com.github.GTNewHorizons", module:"GalacticGregGT5"
-    }
-}
diff --git a/gtpp/dependencies.gradle b/gtpp/dependencies.gradle
deleted file mode 100644
index 5fc96521dc..0000000000
--- a/gtpp/dependencies.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.23:dev')
-    api("com.github.GTNewHorizons:bartworks:0.10.11:dev")
-
-    implementation('curse.maven:cofh-core-69162:2388751')
-    // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
-    implementation('curse.maven:advsolar-362768:2885953')
-
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:SC2:2.1.1:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:Binnie:2.3.4:dev') {transitive = false}
-    compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
-    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.15.0-GTNH:dev') {transitive=false}
-
-    runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.9.0:dev') {transitive=false}
-}
diff --git a/tectech/dependencies.gradle b/tectech/dependencies.gradle
deleted file mode 100644
index 6d54b5e925..0000000000
--- a/tectech/dependencies.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-// Add your dependencies here
-
-dependencies {
-    shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.23:dev')
-    api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
-    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev')
-
-    compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false}
-    compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.12.1-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.12.10:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:Avaritia:1.49: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.12.1-GTNH:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.4.9:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.9.5:dev') {
-    //    exclude group: "com.github.GTNewHorizons", module: "TecTech"
-    //}
-    //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive=false}
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Avaritia:1.49:dev') {transitive=false}
-}