diff --git a/Jenkinsfile b/Jenkinsfile index 46fc6a5..9f24257 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -243,7 +243,6 @@ ] } -// From alpha to beta, only for deploy branches lazyStage { name = 'alpha' onlyif = ( deployBranches.contains(lazyConfig['branch']) ) @@ -256,13 +255,16 @@ if ( !lazyConfig.env.DRYRUN ) { withCredentials([file(credentialsId: env.GOOGLE_API_CID, variable: 'GOOGLE_API_FILE')]) { sh('cp $GOOGLE_API_FILE ~/GoogleAPICredentials.json') - fastLane('android', 'alpha') + def currentVersion = androidVersion() + withEnv(["VERSION=${currentVersion.string}-${currentVersion.number}"],) { + fastLane('android', 'alpha') + } } } }, args: "-v /opt/android:/opt/android" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", in: [ 'centos7' ], on: 'android', ] @@ -288,8 +290,8 @@ } }, args: "-v /opt/android:/opt/android" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", in: [ 'centos7' ], on: 'android', ] diff --git a/app/build.gradle b/app/build.gradle index 6fcddc5..34c5d2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ applicationId "nl.digital_me.dummyandroidapp" minSdkVersion build_versions.min_sdk targetSdkVersion build_versions.target_sdk - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 78 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 79 versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5" vectorDrawables.useSupportLibrary true multiDexEnabled true diff --git a/fastlane/metadata/android/en-US/changelogs/80.txt b/fastlane/metadata/android/en-US/changelogs/80.txt new file mode 100644 index 0000000..ed3b331 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/80.txt @@ -0,0 +1,3 @@ +- Switch to new signing key - reinstall needed +- Nothing else visible +- Update base image to CentOS 7.8 diff --git a/fastlane/metadata/android/nl-NL/changelogs/80.txt b/fastlane/metadata/android/nl-NL/changelogs/80.txt new file mode 100644 index 0000000..0274f99 --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/80.txt @@ -0,0 +1,3 @@ +- Wisselen nieuwe specifiek sleutel - reinstall nodig +- Niets anders zichtbaar +- Bijwerken base image met CentOS 7.8