UpdatedGradle to 5.6.4

Former-commit-id: 25b98d89c4395cb843b40fd1c3a447f679c89922

1 files changed, 92 insertions, 100 deletions

diff --git a/build.gradle b/build.gradle
index 96e65157ca..9bbee2d10b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,35 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-        classpath "de.undercouch:gradle-download-task:3.1.2"
-    }
-}
-
-plugins {
-    id "org.sonarqube" version "2.2"
-}
-
-apply plugin: 'forge'
-apply plugin: 'signing'
-apply plugin: 'idea'
-idea{
-    module {
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
 /*
  * Copyright (c) 2018-2020 bartimaeusnek
  *
@@ -51,18 +19,39 @@ idea{
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import de.undercouch.gradle.tasks.download.Download
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
+    }
+    dependencies {
+        classpath "com.github.GTNH2:ForgeGradle:0d2484b"
+    }
+}
+
+apply plugin: "forge"
+apply plugin: "signing"
+apply plugin: "idea"
+idea{
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
 
 //noinspection GroovyUnusedAssignment
 sourceCompatibility = JavaVersion.VERSION_1_8
 //noinspection GroovyUnusedAssignment
 targetCompatibility = JavaVersion.VERSION_1_8
-//noinspection GroovyUnusedAssignment
-sourceCompatibility = 1.8
-//noinspection GroovyUnusedAssignment
-targetCompatibility = 1.8
 
-compileJava.options.encoding = 'UTF-8'
+compileJava.options.encoding = "UTF-8"
 
 ext.configFile = file "build.properties"
 configFile.withReader {
@@ -90,70 +79,80 @@ minecraft {
 repositories {
     mavenLocal()
     maven {
+        name = "gt"
+        url = "https://gregtech.overminddl1.com/"
+    }
+    maven {
         name = "ic2"
         url = "http://maven.ic2.player.to/"
     }
-    maven { // AppleCore
-        url "http://www.ryanliptak.com/maven/"
-    }
     maven { // GalacticGreg, YAMCore,..
-        name 'UsrvDE'
+        name "UsrvDE"
         url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/"
     }
     ivy {
-        name 'gtnh_download_source_stupid_underscore_typo'
+        name "gtnh_download_source_stupid_underscore_typo"
         artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]"
     }
     ivy {
-        name 'gtnh_download_source'
+        name "gtnh_download_source"
         artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]"
     }
     maven {
-        name = "gt"
-        url = "https://gregtech.overminddl1.com/"
+        name = "OC repo"
+        url = "http://maven.cil.li/"
     }
     maven {
-        url = "http://maven.cil.li/"
+        name = "jabba"
+        url = "http://default.mobiusstrip.eu/maven"
+    }
+    maven {
+        name = "chickenbones"
+        url = "http://chickenbones.net/maven/"
+    }
+    maven {
+        name = "Apple"
+        url "http://www.ryanliptak.com/maven/"
+    }
+    ivy {
+        name "BuildCraft"
+        artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision](-[classifier]).[ext]"
+    }
+    maven {
+        name = "jitpack"
+        url = "https://jitpack.io"
     }
 }
 
 dependencies {
+    //hard deps
     compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
-    compile "micdoodle8.mods:MicdoodleCore:${config.galacticraft.version}:Dev"
-    compile "micdoodle8.mods:GalacticraftCore:${config.galacticraft.version}:Dev"
-    compile "micdoodle8.mods:Galacticraft-Planets:${config.galacticraft.version}:Dev"
-    compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
+    //compile "com.github.GTNH2:GT5-Unofficial:experimental-SNAPSHOT:dev" //broken jitpack.io dep
+    //soft deps
+    compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
+    compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
+    compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
+    compileOnly "micdoodle8.mods:MicdoodleCore:${config.galacticraft.version}:Dev"
+    compileOnly "micdoodle8.mods:GalacticraftCore:${config.galacticraft.version}:Dev"
+    compileOnly "micdoodle8.mods:Galacticraft-Planets:${config.galacticraft.version}:Dev"
+    compileOnly "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
+    compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
+    compileOnly "com.github.GTNewHorizons:GalacticGregGT5:master-SNAPSHOT"
+    compileOnly fileTree(dir: "libs", include: "*.jar")
+
+    //CoreLibs for compile-age
+    //compileOnly "com.github.GTNH2:Yamcl:master-SNAPSHOT" //broken jitpack.io dep
     compileOnly "applecore:AppleCore:${config.applecore.version}:api"
     compileOnly "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
     compileOnly "com.enderio:EnderIO:${config.enderio.version}:dev"
     compileOnly "com.enderio:EnderIO:${config.enderio.version}:dev"
-}
 
-task getRailCraft(type: Download) {
-    onlyIf {
-        !file("libs/Railcraft_1.7.10-9.12.2.0-dev.jar").exists()
-    }
-    src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/Railcraft_1.7.10-9.12.2.0-dev.jar'
-    dest file("libs/Railcraft_1.7.10-9.12.2.0-dev.jar")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
+    //NEI
+    compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
+    compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
+    compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
 }
 
-//task getGregTech(type: Download) {
-//    onlyIf {
-//        !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists()
-//    }
-//    src "http://jenkins.usrv.eu:8080/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar"
-//    dest file("libs/gregtech-${config.gregtech.version}-dev.jar")
-//    mustRunAfter "deobfBinJar"
-//    mustRunAfter "repackMinecraft"
-//}
-
-tasks.setupCIWorkspace.dependsOn getRailCraft
-tasks.setupDevWorkspace.dependsOn getRailCraft
-tasks.setupDecompWorkspace.dependsOn getRailCraft
-tasks.compileJava.dependsOn getRailCraft
-
 processResources
 {
     // this will ensure that this task is redone when the versions change.
@@ -162,15 +161,15 @@ processResources
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
+        include "mcmod.info"
                 
         // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+        expand "version":project.version, "mcversion":project.minecraft.version
     }
         
     // copy everything else, thats not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+        exclude "mcmod.info"
     }
 }
 
@@ -178,28 +177,28 @@ jar {
     exclude ("assets/gregtech/textures/items/materialicons/copy.bat")
     exclude ("assets/gregtech/textures/blocks/materialicons/copy.bat")
     manifest {
-        attributes 'FMLCorePlugin': 'com.github.bartimaeusnek.ASM.BWCorePlugin','FMLCorePluginContainsFMLMod': 'true'
+        attributes "FMLCorePlugin": "com.github.bartimaeusnek.ASM.BWCorePlugin","FMLCorePluginContainsFMLMod": "true"
     }
 }
 
 task apiJar(type: Jar){
     from(sourceSets.main.output) {
-        include 'com/github/bartimaeusnek/bartworks/API/**'
-        include 'com/github/bartimaeusnek/bartworks/util/**'
-        include 'com/github/bartimaeusnek/bartworks/system/material/Werkstoff.class'
-        include 'com/github/bartimaeusnek/crossmod/thaumcraft/util/**'
+        include "com/github/bartimaeusnek/bartworks/API/**"
+        include "com/github/bartimaeusnek/bartworks/util/**"
+        include "com/github/bartimaeusnek/bartworks/system/material/Werkstoff.class"
+        include "com/github/bartimaeusnek/crossmod/thaumcraft/util/**"
     }
-    classifier = 'API'
+    classifier = "API"
 }
 
 task sourceJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    classifier = "sources"
 }
 
 task devJar(type: Jar) {
     from sourceSets.main.output
-    classifier = 'dev'
+    classifier = "dev"
 }
 
 artifacts {
@@ -208,24 +207,17 @@ artifacts {
     archives apiJar
 }
 
-sonarqube {
-    properties {
-        property "sonar.projectName", "bartworks"
-        property "sonar.projectKey", "bartimaeusnek_bartworks"
-    }
-}
-
-task signJar(dependsOn: 'reobf'){
+task signJar(dependsOn: "reobf"){
     doLast {
         ant.signjar(
                 destDir: jar.destinationDir,
                 jar: jar.getArchivePath(),
-                alias: findProperty('keyStoreAlias') ?: '',
-                keystore: findProperty('keyStore') ?: '',
-                storepass: findProperty('keyStorePass') ?: '',
-                digestalg: findProperty('signDigestAlg') ?: '',
-                tsaurl: findProperty('signTSAurl') ?: '',
+                alias: findProperty("keyStoreAlias") ?: "",
+                keystore: findProperty("keyStore") ?: "",
+                storepass: findProperty("keyStorePass") ?: "",
+                digestalg: findProperty("signDigestAlg") ?: "",
+                tsaurl: findProperty("signTSAurl") ?: "",
                 verbose: true
         )
     }
-}
+}
\ No newline at end of file