A fully functional Android app built entirely with Kotlin and Jetpack Compose
Use SdkConstants for getting aapt2 executable location
Alex Vanyoc730cf20fad7
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex 9230dd6b7..b6650aa75 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -36,6 +36,7 @@ tasks.withType<KotlinCompile>().configureEach {dependencies {compileOnly(libs.android.gradlePlugin)+ compileOnly(libs.android.tools.common)compileOnly(libs.firebase.crashlytics.gradlePlugin)compileOnly(libs.firebase.performance.gradlePlugin)compileOnly(libs.kotlin.gradlePlugin)diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.ktindex 4ed01ac6b..eb52423c4 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt@@ -19,6 +19,7 @@ package com.google.samples.apps.nowinandroidimport com.android.build.api.artifact.SingleArtifactimport com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.android.build.gradle.BaseExtension+import com.android.SdkConstantsimport org.gradle.api.DefaultTaskimport org.gradle.api.GradleExceptionimport org.gradle.api.Project@@ -113,7 +114,9 @@ fun Project.configureBadgingTasks(aapt2Executable.set(File(baseExtension.sdkDirectory,- "build-tools/${baseExtension.buildToolsVersion}/aapt2",+ "${SdkConstants.FD_BUILD_TOOLS}/" ++ "${baseExtension.buildToolsVersion}/" ++ SdkConstants.FN_AAPT2,),)diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 9f33c732d..0c841e484 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,7 +1,9 @@[versions]accompanist = "0.32.0"androidDesugarJdkLibs = "2.0.3"+# AGP and tools should be updated togetherandroidGradlePlugin = "8.1.2"+androidTools = "31.1.2"androidxActivity = "1.8.0"androidxAppCompat = "1.6.1"androidxBrowser = "1.6.0"@@ -139,6 +141,7 @@ turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine# Dependencies of the included build-logicandroid-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }+android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }