diff --git a/Jenkinsfile b/Jenkinsfile index fee8f5e..cf539c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,16 +5,20 @@ pipeline { stages { stage('Clean') { steps { - echo 'Cleaning Project' - sh 'chmod +x gradlew' - sh './gradlew clean' + withCredentials([file(credentialsId: 'mod_build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile')]) { + echo 'Cleaning Project' + sh 'chmod +x gradlew' + sh './gradlew clean' + } } } stage('Build and Deploy') { steps { - echo 'Building and Deploying to Maven' - sh './gradlew build publish' - } + withCredentials([file(credentialsId: 'mod_build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile')]) { + echo 'Building and Deploying to Maven' + sh './gradlew build publish' + } + } } } post { @@ -22,4 +26,4 @@ pipeline { archive 'build/libs/**.jar' } } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 444b080..49ab3f7 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,15 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'maven-publish' + +apply from: 'https://raw.githubusercontent.com/MinecraftModDevelopment/Gradle-Collection/22e7d543a18cd30675277fbfa3669e3d9e206010/generic/secrets.gradle' + +import groovy.json.JsonOutput + +if (project.hasProperty('secretFile')) { + loadSecrets(new File((String) findProperty('secretFile'))) +} + version = "${version}" group = "tschipp.carryon" archivesBaseName = "carryon-${minecraft_version}" @@ -148,16 +157,16 @@ task signJar(type: SignJar, dependsOn: reobfJar) { // Skips if the keyStore property is missing. onlyIf { - project.hasProperty('modkeyStore') + project.hasProperty('keyStore') } // findProperty allows us to reference the property without it existing. // Using project.propName would cause the script to fail validation if // the property did not exist. - keyStore = project.findProperty('modkeyStore') - alias = project.findProperty('modkeyStoreAlias') - storePass = project.findProperty('modkeyStorePass') - keyPass = project.findProperty('modkeyStoreKeyPass') + keyStore = project.findProperty('keyStore') + alias = project.findProperty('keyStoreAlias') + storePass = project.findProperty('keyStorePass') + keyPass = project.findProperty('keyStoreKeyPass') inputFile = jar.archivePath outputFile = jar.archivePath } diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index 9b0ab09..d7ef2a8 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -45,7 +45,7 @@ public class CarryOn { public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/"; public static final Logger LOGGER = LogManager.getFormatterLogger("CarryOn"); public static final String DEPENDENCIES = "required-after:forge@[13.20.1.2386,);after:gamestages;"; - public static final String CERTIFICATE_FINGERPRINT = "55e88f24d04398481ae6f1ce76f65fd776f14227"; + public static final String CERTIFICATE_FINGERPRINT = "FD21553434F4905F2F73EA7838147AC4EA07BD88"; public static File CONFIGURATION_FILE; public static boolean FINGERPRINT_VIOLATED = false;