Skip to content

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

Merge "Fix FTL test APKs resolution" into main

Wojtek Kalicińskid81aa055ee17
diff --cc build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index fe7df5c77,824bf5dcf..4369a7380
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@@ -30,8 -32,11 +32,11 @@@ class AndroidApplicationConventionPlugi
extensions.configure<BaseAppModuleExtension> {
configureKotlinAndroid(this)
- defaultConfig.targetSdk = 32
+ defaultConfig.targetSdk = 33
}
+ extensions.configure<ApplicationAndroidComponentsExtension> {
+ configurePrintApksTask(this)
+ }
}
}
diff --cc build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 66c918492,4c000737e..8cc061cca
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@@ -34,10 -36,12 +36,12 @@@ class AndroidLibraryConventionPlugin :
extensions.configure<LibraryExtension> {
configureKotlinAndroid(this)
- defaultConfig.targetSdk = 32
+ defaultConfig.targetSdk = 33
configureFlavors(this)
}
-
+ extensions.configure<LibraryAndroidComponentsExtension> {
+ configurePrintApksTask(this)
+ }
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies {
configurations.configureEach {