Commit 0249f91
Revert toolchain bump; target 35 on top of AGP 8.1.2
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>1 parent 8875c74 commit 0249f91
3 files changed
Lines changed: 5 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | 89 | | |
101 | 90 | | |
102 | 91 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
0 commit comments