diff --git a/Jenkinsfile b/Jenkinsfile index 71327da..dda3eae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,8 @@ JAVA_HOME: '/usr/java/latest', ANDROID_HOME: '/opt/android/sdk', GRADLE_USER_HOME: '/opt/android/gradle', - GRADLE_OPTS: '-XX:MaxMetaspaceSize=128m -Xmx1024m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins', + GRADLE_OPTS: '-XX:MaxMetaspaceSize=128m -Xmx1024m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins', + GOOGLE_API_CID: 'dappre-google-api', ], noIndex: '(.+_.+|production)', // Avoid automatic indexing for release and private branches ) @@ -181,7 +182,10 @@ }, run: { if ( !lazyConfig.env.DRYRUN ) { - fastLane('android', 'alpha', '', 'rh-ruby24') + withCredentials([file(credentialsId: env.GOOGLE_API_CID, variable: 'GOOGLE_API_FILE')]) { + sh('cp $GOOGLE_API_FILE ~/GoogleAPICredentials.json') + fastLane('android', 'alpha', '', 'rh-ruby24') + } } }, args: "-v /opt/android:/opt/android" @@ -203,7 +207,10 @@ }, run: { if ( !lazyConfig.env.DRYRUN ) { - fastLane('android', 'beta', '', 'rh-ruby24') + withCredentials([file(credentialsId: env.GOOGLE_API_CID, variable: 'GOOGLE_API_FILE')]) { + sh('cp $GOOGLE_API_FILE ~/GoogleAPICredentials.json') + fastLane('android', 'beta', '', 'rh-ruby24') + } } }, args: "-v /opt/android:/opt/android" @@ -247,7 +254,10 @@ }, run: { if ( !lazyConfig.env.DRYRUN ) { - fastLane('android', 'production', '', 'rh-ruby24') + withCredentials([file(credentialsId: env.GOOGLE_API_CID, variable: 'GOOGLE_API_FILE')]) { + sh('cp $GOOGLE_API_FILE ~/GoogleAPICredentials.json') + fastLane('android', 'production', '', 'rh-ruby24') + } } }, args: "-v /opt/android:/opt/android" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7d40857..84bafe6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -243,6 +243,7 @@ skip_upload_images: true, skip_upload_screenshots: true, package_name: "#{getPackageName(options)}", + version_code: "#{lane_context[SharedValues::VERSION_CODE]}", ) end @@ -256,6 +257,7 @@ skip_upload_images: true, skip_upload_screenshots: true, package_name: "#{getPackageName(options)}", + version_code: "#{lane_context[SharedValues::VERSION_CODE]}", ) end