From 11118c43c56bcb2e99d2bccebc0bf2d569ef58df Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 22 Apr 2025 18:16:15 +0800 Subject: [PATCH] Explicitly build the universal apk (#8790) * Explicitly build the universal apk * remove universal APK link from github release --- android/app/build.gradle | 3 ++- fastlane/Fastfile | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2ef3f71fd..dfb77ffd9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -70,6 +70,7 @@ if (System.getenv("SENTRY_ENABLED") == "true") { * and want to have separate APKs to upload to the Play Store */ def enableSeparateBuildPerCPUArchitecture = project.hasProperty('separateApk') ? project.property('separateApk').toBoolean() : false +def enableUniversalBuild = project.hasProperty('universalApk') ? project.property('universalApk').toBoolean() : false /** * Set this to true to Run Proguard on Release builds to minify the Java bytecode. @@ -140,7 +141,7 @@ android { abi { reset() enable enableSeparateBuildPerCPUArchitecture - universalApk enableSeparateBuildPerCPUArchitecture // If true, also generate a universal APK + universalApk enableUniversalBuild // If true, also generate a universal APK include (*reactNativeArchitectures()) } } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1065175c9..f3008b103 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -340,7 +340,6 @@ lane :github do android = [ " * [Mattermost arm64-v8a](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost-arm64-v8a.apk)", " * [Mattermost armeabi-v7a](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost-armeabi-v7a.apk)", - " * [Mattermost Universal](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost.apk)", " * [Mattermost x86](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost-x86.apk)", " * [Mattermost x86_64](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost-x86_64.apk)", ] @@ -874,7 +873,7 @@ platform :android do project_dir: 'android/', properties: { 'separateApk' => ENV["SEPARATE_APKS"] || false, - 'universalApk' => ENV["SEPARATE_APKS"] || false, + 'universalApk' => ENV["UNIVERSAL_APK"] || false, } ) end