diff --git a/build.gradle b/build.gradle index 42c8bdb..6bfc58e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ buildscript { import de.undercouch.gradle.tasks.download.Download apply plugin: 'forge' +apply plugin: 'signing' ext.configFile = file "build.properties" configFile.withReader { @@ -68,6 +69,10 @@ repositories { name 'rx14' url 'http://mvn.rx14.co.uk/local/' } + maven { // Baubles + name 'UsrvDE_3rdParty' + url "http://jenkins.usrv.eu:8081/nexus/content/repositories/thirdparty/" + } } minecraft { @@ -87,7 +92,7 @@ dependencies { compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf" compile "tconstruct:TConstruct:" + config.mc_version + "-" + config.tconstruct_version + ":deobf" compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf" - compile 'com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf' + compile "com.azanor.baubles:Baubles:" + config.baubles_version + ":deobf" compile fileTree(dir: 'libs', include: '*.jar') } @@ -113,7 +118,7 @@ task getThaumcraft(type: Download) { onlyIf { !file("libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar").exists() } - src 'https://dl.dropboxusercontent.com/u/47135879/Thaumcraft-deobf-1.7.10-4.2.3.5.jar' + src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/Thaumcraft-1.7.10-4.2.3.5-deobf.jar' dest file("libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar") mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" @@ -123,7 +128,7 @@ task getBloodMagic(type: Download, dependsOn: "getThaumcraft") { onlyIf { !file("libs/BloodMagic-1.7.10-1.3.3-17-deobf.jar").exists() } - src 'https://dl.dropboxusercontent.com/u/3065898/BloodMagic-1.7.10-1.3.3-17-deobf.jar' + src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/BloodMagic-1.7.10-1.3.3-17-deobf.jar' dest file("libs/BloodMagic-1.7.10-1.3.3-17-deobf.jar") mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" @@ -144,3 +149,18 @@ task deobfJar(type: Jar) { task.options.encoding = 'UTF-8' } } + +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 + ) + } +} \ No newline at end of file diff --git a/build.properties b/build.properties index bc4c6ed..df9f5b3 100644 --- a/build.properties +++ b/build.properties @@ -11,6 +11,7 @@ tconstruct_version=1.8.5.build959 forgeMultipart_version=1.2.0.347 waila_version=1.5.11-RC2-NONEI guideapi_version=1.0.1-20 +baubles_version=1.0.1.10 forge_version=10.13.4.1614 build_number=7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..aae599b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip