Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions scripts/build-release-apks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down