diff options
| -rw-r--r-- | build.gradle | 38 | ||||
| -rw-r--r-- | build.properties | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 32 insertions, 20 deletions
diff --git a/build.gradle b/build.gradle index 9137fbf07d..440fee920a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ buildscript { import de.undercouch.gradle.tasks.download.Download apply plugin: 'forge' +apply plugin: 'signing' allprojects { apply plugin: 'java' @@ -52,20 +53,18 @@ configurations { repositories { maven { name 'UsrvDE' - url "http://jenkins.usrv.de:8082/nexus/content/repositories/releases/" + url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" } maven { name = "ic2" url = "http://maven.ic2.player.to/" } - //ivy { - // name 'CoFHLib' - // artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]" - //} - //ivy { - // name 'CoFHCore' - // artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]" - //} + + ivy { + name 'gtnh_download_source' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" + } + maven { name = "chickenbones" url = "http://chickenbones.net/maven/" @@ -75,8 +74,8 @@ repositories { dependencies { compile "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf" compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - //provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" @@ -86,7 +85,7 @@ task getGregTech(type: Download) { onlyIf { !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists() } - src "http://jenkins.usrv.de:8081/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar" + 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" @@ -117,3 +116,18 @@ processResources exclude 'mcmod.info' } } + +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') ?: '', + verbose: true + ) + } +} diff --git a/build.properties b/build.properties index b76fc301bd..9e784e469a 100644 --- a/build.properties +++ b/build.properties @@ -6,11 +6,9 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=884 -gregtech.version=5.09.32.06 -cofhcore.cf=2246/920 -cofhcore.version=[1.7.10]3.0.3-303-dev -cofhlib.cf=2246/918 +gregtech.jenkinsbuild=2 +gregtech.version=5.09.32.22 +cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev -yamcore.version=0.5.77 +yamcore.version=0.5.78 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 692a0d0831..d1621dd0d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 10 07:59:03 CET 2018 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
\ No newline at end of file |