Skip to content

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

Merge remote-tracking branch 'goog/main' into feb13-merge

Don Turner36eeb19da8f6
diff --cc build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 6bc5f9f9e,dfbea8394..26b6951d3
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@@ -14,10 -14,8 +14,9 @@@
* limitations under the License.
*/
- import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.android.build.api.dsl.ApplicationExtension
- import com.google.samples.apps.nowinandroid.configureFlavors
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
+ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.google.samples.apps.nowinandroid.configureKotlinAndroid
import com.google.samples.apps.nowinandroid.configurePrintApksTask
import org.gradle.api.Plugin
@@@ -35,8 -33,6 +34,7 @@@ class AndroidApplicationConventionPlugi
extensions.configure<ApplicationExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = 33
- configureFlavors(this)
+ configureGradleManagedDevices(this)
}
extensions.configure<ApplicationAndroidComponentsExtension> {
configurePrintApksTask(this)