Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Replace provided APPT2 executable path

Simon Marquis27ca4256f48b
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 93fe307e8..9ae9888db 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -24,7 +24,6 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.getByType
class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
@@ -43,7 +42,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
}
extensions.configure<ApplicationAndroidComponentsExtension> {
configurePrintApksTask(this)
- configureBadgingTasks(extensions.getByType<ApplicationExtension>(), this)
+ configureBadgingTasks(this)
}
}
}
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.kt
index 229388001..e747325ee 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
@@ -16,9 +16,8 @@
package com.google.samples.apps.nowinandroid
-import com.android.SdkConstants
import com.android.build.api.artifact.SingleArtifact
-import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.variant.Aapt2
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.google.common.truth.Truth.assertWithMessage
import org.gradle.api.DefaultTask
@@ -110,7 +109,6 @@ private fun String.capitalized() = replaceFirstChar {
}
fun Project.configureBadgingTasks(
- baseExtension: ApplicationExtension,
componentsExtension: ApplicationAndroidComponentsExtension,
) {
// Registers a callback to be called, when a new variant is configured
@@ -121,17 +119,7 @@ fun Project.configureBadgingTasks(
val generateBadging =
tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE)
- aapt2Executable.set(
- // TODO: Replace with `sdkComponents.aapt2` when it's available in AGP
- // https://issuetracker.google.com/issues/376815836
- componentsExtension.sdkComponents.sdkDirectory.map { directory ->
- directory.file(
- "${SdkConstants.FD_BUILD_TOOLS}/" +
- "${baseExtension.buildToolsVersion}/" +
- SdkConstants.FN_AAPT2,
- )
- }
- )
+ aapt2Executable = componentsExtension.sdkComponents.aapt2.flatMap(Aapt2::executable)
badging = project.layout.buildDirectory.file(
"outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
)