diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-05-24 13:06:11 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-05-26 09:42:46 +0200 |
| commit | 344c02328bc95d71ff104bb8b76383347df4368d (patch) | |
| tree | b413621003b4fe2e3c8f1c153f1b53abdaecbaaa /android | |
| parent | 1a421b646b09599c6f329226284b66b8416eef88 (diff) | |
| download | mullvadvpn-344c02328bc95d71ff104bb8b76383347df4368d.tar.xz mullvadvpn-344c02328bc95d71ff104bb8b76383347df4368d.zip | |
Make aapt version references more logical
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/gradle/libs.versions.toml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 28007c4ffb..f8cae73e0a 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -30,9 +30,8 @@ buildscript { // see: // https://github.com/gradle/gradle/issues/19228s //noinspection UseTomlInstead - val aapt = libs.android.gradle.aapt.get().toString() - val aaptVersion = libs.versions.android.gradle.aapt.get() - val agpVersion = libs.versions.android.gradle.plugin.get() + 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") diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 049c849729..15561de31d 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -95,7 +95,7 @@ turbine = "1.2.0" [libraries] # Android android-billingclient = { module = "com.android.billingclient:billing-ktx", version.ref = "android-billingclient" } -android-gradle-aapt = { module = "com.android.tools.build:aapt2" } +android-gradle-aapt = { module = "com.android.tools.build:aapt2", version.ref = "android-gradle-aapt" } # AndroidX androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activitycompose" } |