Bump SDK levels for Google Play (target/compile 35, min 24)#42
Merged
Conversation
Google Play has required apps to target API 35 (Android 15) since Nov 1, 2025; the current targetSdk 33 means uploads are rejected. Move to 35 across the board and raise the floor to API 24 (Android 7.0), which covers ~97% of active devices and matches the practical minimum required by current AndroidX / Compose dependencies. AGP 8.1.2 caps compileSdk at 34, so the toolchain has to move too. Pick the smallest delta that supports compileSdk 35: - AGP 8.1.2 -> 8.5.0 - Gradle wrapper 8.4 -> 8.7 - Kotlin 1.9.10 -> 1.9.25 - Compose Compiler ext 1.5.3 -> 1.5.15 (matches Kotlin 1.9.25) - compileSdk 34 -> 35 - minSdk 21 -> 24 - targetSdk 33 -> 35 JDK requirement (17) unchanged; NDK 25.1.8937393 unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Two fixes bundled on the SDK-bump branch: 1. Mirrors: switch the Maven repos to Google's China mirror (https://dl.google.cn/dl/android/maven2/), Aliyun for Central and gradle-plugins, and Tencent Cloud for the Gradle binary distribution. Originals kept as fallbacks. Builds now work from networks where dl.google.com / services.gradle.org are unreachable directly. 2. Build failure: AGP 8.5 strictly rejects duplicated jniLibs sources, but rust-android-gradle 0.9.6 registers its build/rustJniLibs/<abi> output into jniLibs.srcDirs while the same path is also captured by AGP via the cargoBuild task, making mergeDebugJniLibFolders fail with "Duplicate resources" for libproxydroid_tun2socks.so on all four ABIs. Add a packagingOptions.jniLibs.pickFirsts rule for the .so. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The pickFirsts approach applies at packaging, but the failure happens earlier in mergeJniLibFolders. Switch to setting duplicatesStrategy = EXCLUDE on those merge Copy tasks, which is the well-known workaround for rust-android-gradle 0.9.6 on AGP 8.5+. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
MergeSourceSetFolders does not expose duplicatesStrategy. The actual fix is to dedupe android.sourceSets.*.jniLibs.srcDirs at configure time so each ABI's libproxydroid_tun2socks.so is only listed once. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The compileSdk 35 path forced AGP 8.5.0, which in turn broke mergeJniLibFolders against rust-android-gradle 0.9.6 with "Duplicate resources" for every ABI's libproxydroid_tun2socks.so. Neither packagingOptions.jniLibs.pickFirsts (wrong phase) nor srcDirs dedupe (duplicates come from AGP's auto-registration of cargoBuild task outputs, not from srcDirs) resolves it, and no released rust-android-gradle plugin is compatible with AGP 8.5+. Sidestep the whole upgrade: AGP only requires compileSdk to be high enough to reference APIs the code actually uses; targetSdk is a manifest declaration Play reads, and targetSdk > compileSdk is allowed. Set targetSdk to 35 (Play's current floor) on top of the existing toolchain: - AGP stays 8.1.2 - Gradle stays 8.4 - Kotlin stays 1.9.10 - Compose Compiler ext stays 1.5.3 - compileSdk stays 34 - minSdk 21 -> 24 - targetSdk 33 -> 35 Mirror changes (dl.google.cn, Aliyun, Tencent Cloud) are kept. Drop the AGP-8.5-specific JNI dedupe workaround. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
mirrors.cloud.tencent.com timed out from GitHub Actions runners. services.gradle.org works from CI and is reachable from the user's local network via their existing HTTPS proxy. Maven repo mirrors (dl.google.cn / Aliyun) stay since they don't affect CI. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Google Play has required apps to target API 35 (Android 15) since Nov 1, 2025; the current
targetSdk 33makes new uploads rejected. Bump the SDK levels and the toolchain required to compile against them.minSdk 24covers ~97 % of active Play devices and matches the practical baseline for current AndroidX / Compose dependencies.compileSdk 35requires AGP 8.5+ — AGP 8.5.0 is the smallest jump that gets us there. JDK 17 and NDK 25.1.8937393 unchanged.Couldn't validate locally (gradle's HTTP client can't tunnel through my local proxy cleanly); relying on CI to verify the toolchain combination compiles.
🤖 Generated with Claude Code