Remove unused repositories, fix deprecated declarations

3 files changed, 17 insertions, 50 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index 95fb94fc6c..556cd3fa4b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,16 +1,17 @@
 dependencies {
-    compile('com.github.GTNewHorizons:GTNHLib:0.0.11:dev')
-    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.264:dev')
-    compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
-    compile("com.github.GTNewHorizons:ModularUI:1.0.52:dev") {transitive=false}
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.3.24-GTNH:dev")
-    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev')
-    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev')
-    compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-    compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.146:dev')
+    api('com.github.GTNewHorizons:GTNHLib:0.0.11:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.264:dev')
+    api("com.github.GTNewHorizons:StructureLib:1.2.1:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.0.54:dev") {transitive=false}
+    api("com.github.GTNewHorizons:NotEnoughItems:2.3.25-GTNH:dev")
+    api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
 
-    compile('curse.maven:cofh-core-69162:2388751')
-    compile('curse.maven:advsolar-362768:2885953')
+    // TODO: this needs to be removed ASAP
+    api('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.146: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:Applied-Energistics-2-Unofficial:rv3-beta-152-GTNH:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.15:dev') {transitive=false}
@@ -20,14 +21,14 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:EnderCore:0.2.12:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:SC2:2.0.2:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Binnie:2.0.48:dev') {transitive = false}
-    compile("com.github.GTNewHorizons:bartworks:0.5.150:dev") {transitive = false}
+    api("com.github.GTNewHorizons:bartworks:0.5.150:dev") {transitive = false}
     compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') {transitive=false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Chisel:2.10.16-GTNH:dev') {transitive=false}
     compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false}
 
-    compile("com.github.GTNewHorizons:TecTech:5.0.88:dev")
+    api("com.github.GTNewHorizons:TecTech:5.0.88:dev")
 
     runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
 }
diff --git a/gradle.properties b/gradle.properties
index 501a65ba03..c7817827a1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -62,6 +62,9 @@ forceEnableMixins = true
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = false
 
+# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories
+includeWellKnownRepositories = true
+
 # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
 # projects. New projects should not use this parameter.
 customArchiveBaseName = GT-PlusPlus
diff --git a/repositories.gradle b/repositories.gradle
index 9f52f3660b..c227b16ec2 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,41 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    mavenLocal()
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        name 'ic2'
-        url 'http://maven.ic2.player.to/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        // IC2
-        name = "ic2"
-        url = "https://maven2.ic2.player.to/"
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        name 'CurseForge Maven'
-        url 'https://minecraft.curseforge.com/api/maven/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url 'https://cursemaven.com'
-        content {
-            includeGroup 'curse.maven'
-        }
-    }
 }