diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build.gradle | 46 | ||||
| -rw-r--r-- | build.properties | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 27 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore index 0f3c189a5e..e607c8a11c 100644 --- a/.gitignore +++ b/.gitignore @@ -81,4 +81,4 @@ gradlew.bat # Linux *~ -*.bat + diff --git a/build.gradle b/build.gradle index 9c1a02fa01..e240b12ab7 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'idea' +apply plugin: 'signing' file "build.properties" withReader { def prop = new Properties() @@ -75,32 +76,16 @@ repositories { } maven { // GalacticGreg, YAMCore,.. name 'UsrvDE' - url "http://jenkins.usrv.de:8082/nexus/content/repositories/releases/" - } - 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 'Railcraft' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]" + url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" } ivy { - name 'IC2NuclearControl' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]" - - } - ivy { - name 'ImmersiveEngineering' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.immeng.cf}/[module]-[revision].[ext]" + name 'gtnh_download_source_stupid_underscore_typo' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]" } - ivy { - name 'magneticraft' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.magneticraft.cf}/[module]-[revision].[ext]" + + ivy { + name 'gtnh_download_source' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" } } @@ -167,4 +152,19 @@ task devJar(type: Jar) { artifacts { archives devJar +} + +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 12408058fa..0cc7aad375 100644 --- a/build.properties +++ b/build.properties @@ -9,7 +9,7 @@ buildcraft.version=7.1.11 codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 cofhcore.cf=2246/920 -cofhcore.version=[1.7.10]3.0.3-303-dev +cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.cf=2246/918 cofhlib.version=[1.7.10]1.0.3-175-dev enderio.cf=2219/296 @@ -29,4 +29,4 @@ magneticraft.version=0.6.1-final mantle.version=0.3.2.jenkins187 tconstruct.version=1.8.4.build951 translocators.version=1.1.2.16 -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 678d9d8de3..aae599bbfa 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 |