diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-10-14 08:23:20 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-10-15 09:12:33 +0200 |
| commit | 289dfdee5e346fb1d9512844dd1b086a3ac13583 (patch) | |
| tree | b6d1b5d39ca77847e6d0d465c2bb25ecc8ad3625 /android | |
| parent | 841c7b37c4a2104188634ec5fecd2dd674204530 (diff) | |
| download | mullvadvpn-289dfdee5e346fb1d9512844dd1b086a3ac13583.tar.xz mullvadvpn-289dfdee5e346fb1d9512844dd1b086a3ac13583.zip | |
Clarify aapt version
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/gradle/libs.versions.toml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/android/build.gradle.kts b/android/build.gradle.kts index c1296cfcd3..249a2a5f15 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -31,11 +31,11 @@ buildscript { // Dependency class paths are required for Gradle metadata verification to work properly, // see: // https://github.com/gradle/gradle/issues/19228 - val (aapt, aaptVersion) = with(libs.android.gradle.aapt.get()) { module to version } - val agpVersion = libs.plugins.android.gradle.plugin.get().version.requiredVersion - classpath("$aapt:$agpVersion-$aaptVersion:linux") - classpath("$aapt:$agpVersion-$aaptVersion:osx") - classpath("$aapt:$agpVersion-$aaptVersion:windows") + val aapt = libs.android.gradle.aapt.get() + val aaptVersion = "${libs.versions.android.gradle.plugin.get()}-${libs.versions.android.gradle.aapt.get()}" + classpath("$aapt:$aaptVersion:linux") + classpath("$aapt:$aaptVersion:osx") + classpath("$aapt:$aaptVersion:windows") // Protoc plugin val protoc = libs.plugins.protobuf.protoc.get().toString() diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 59c174e800..5a12b72d99 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -10,7 +10,7 @@ target-sdk = "36" ndk = "27.3.13750724" # Android -# The android-gradle-aapt plugin version must be in sync with the android plugin version. +# The android-gradle-aapt plugin version must be in sync with the android gradle plugin version. # Required for Gradle metadata verification to work properly, see: # https://github.com/gradle/gradle/issues/19228 # Find the relevant AAPT version here: @@ -97,7 +97,7 @@ profileinstaller = "1.4.1" [libraries] # Android android-billingclient = { module = "com.android.billingclient:billing-ktx", version.ref = "android-billingclient" } -android-gradle-aapt = { module = "com.android.tools.build:aapt2", version.ref = "android-gradle-aapt" } +android-gradle-aapt = { module = "com.android.tools.build:aapt2" } # AndroidX androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activitycompose" } |