summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--android/build.gradle.kts5
-rw-r--r--android/gradle/libs.versions.toml2
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" }