diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 556e38e..2f18d4e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,7 @@ val releaseKeystorePath = providers.environmentVariable("MEGAPROXY_KEYSTORE_PATH val releaseKeystorePassword = providers.environmentVariable("MEGAPROXY_KEYSTORE_PASSWORD").orNull val releaseKeyAlias = providers.environmentVariable("MEGAPROXY_KEY_ALIAS").orNull val releaseKeyPassword = providers.environmentVariable("MEGAPROXY_KEY_PASSWORD").orNull -val versionCodeBase = 8 +val versionCodeBase = 9 val versionVariant = providers.gradleProperty("megaproxyVersionVariant") .orElse("universal") .get() @@ -43,9 +43,17 @@ android { // universal code below the ABI variants lets app stores prefer the // smaller compatible APK when both are available. versionCode = versionCodeBase * 1000 + versionVariantCode - versionName = "0.0.8" + versionName = "0.0.9" buildConfigField("String", "GIT_COMMIT_HASH", "\"$gitCommitHash\"") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + if (versionVariant != "universal") { + // Keep every ABI-specific APK genuinely single-ABI. Without this, + // transitive native libraries are packaged for every architecture + // even when the Go core itself was built for only one target. + ndk { + abiFilters += versionVariant + } + } } signingConfigs { diff --git a/scripts/build-release-apks.sh b/scripts/build-release-apks.sh index 2900aef..4388423 100755 --- a/scripts/build-release-apks.sh +++ b/scripts/build-release-apks.sh @@ -129,10 +129,10 @@ echo "Running native tests" # gomobile architecture names and their corresponding Android ABI names. targets=( - "arm64:arm64-v8a:8002" - "arm:armeabi-v7a:8001" - "amd64:x86_64:8004" - "386:x86:8003" + "arm64:arm64-v8a:9002" + "arm:armeabi-v7a:9001" + "amd64:x86_64:9004" + "386:x86:9003" ) # A clean checkout has no app/libs/megaproxy.aar. Gradle resolves local AAR @@ -232,7 +232,7 @@ if [[ ! -f "$built_apk" ]]; then fi cp "$built_apk" "$universal_apk" verify_release_apk "$universal_apk" -verify_release_version_code "$universal_apk" 8000 +verify_release_version_code "$universal_apk" 9000 ( cd "$MEGAPROXY_RELEASE_DIR"