From 952fef28fff3022157701dfd7f4cdb87393e0a83 Mon Sep 17 00:00:00 2001 From: jlplks Date: Thu, 21 Nov 2024 14:39:17 -0700 Subject: [PATCH] MBL-1902: Fix circleCI builds (#2174) * FIX CIRCLE CI BUILD FORCING JVM 17 * force jvm 17 on fastlane * update lanes to force jvm 17 * upgrade internal version name --- Gemfile.lock | 1 + app/internal_version_code.txt | 2 +- app/internal_version_name.txt | 2 +- fastlane/Fastfile | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30ae0feec4..0f6634c920 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,6 +226,7 @@ GEM PLATFORMS arm64-darwin-22 + arm64-darwin-24 DEPENDENCIES activesupport diff --git a/app/internal_version_code.txt b/app/internal_version_code.txt index fa31d1abab..98eead86a0 100644 --- a/app/internal_version_code.txt +++ b/app/internal_version_code.txt @@ -1 +1 @@ -2014150920 +2014150921 diff --git a/app/internal_version_name.txt b/app/internal_version_name.txt index 2175a86d93..cc6b5127bc 100644 --- a/app/internal_version_name.txt +++ b/app/internal_version_name.txt @@ -1 +1 @@ -3.26.1 \ No newline at end of file +3.26.2 \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9023002907..a7dccc3d71 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -13,7 +13,7 @@ lane :alpha do version_name = Milkrun::VersionName.new(audience: audience).read slack_message = ["🚀",audience,build_type,"|",version_name,version_code,"successfully delivered to Firebase!"].join(' ') - build_android_app(task: "assembleInternalDebug") + build_android_app(task: "assembleInternalDebug -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64") firebase_app_distribution( app: Milkrun::FirebaseCredentialsExtractor.new.internal_debug, @@ -35,7 +35,7 @@ lane :external do slack_message = ["🚀",audience,build_type,"|",version_name,version_code,"successfully delivered to Firebase!"].join(' ') release_notes = "Release " + version_name - build_android_app(task: "assembleExternalRelease") + build_android_app(task: "assembleExternalRelease -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64") firebase_app_distribution( app: Milkrun::FirebaseCredentialsExtractor.new.external_release, @@ -63,7 +63,7 @@ lane :internal do version_name = Milkrun::VersionName.new(audience: audience).read slack_message = ["🚀",audience,build_type,"|",version_name,version_code,"successfully delivered to S3 and Firebase!"].join(' ') - build_android_app(task: "assembleInternalRelease") + build_android_app(task: "assembleInternalRelease -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64") path_to_apk = lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] Milkrun::S3Package.new(version_code: version_code, file_path: path_to_apk).upload