Skip to content

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

Replace API breaking changes

Simon Marquisb060fd0b71cf
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
index eaab1175f..25e506b7f 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
@@ -34,22 +34,21 @@ internal fun configureGradleManagedDevices(
val allDevices = listOf(pixel4, pixel6, pixelC)
val ciDevices = listOf(pixel4, pixelC)
- commonExtension.testOptions {
- managedDevices {
- allDevices {
- allDevices.forEach { deviceConfig ->
- maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
- device = deviceConfig.device
- apiLevel = deviceConfig.apiLevel
- systemImageSource = deviceConfig.systemImageSource
- }
+
+ commonExtension.testOptions.managedDevices {
+ allDevices {
+ allDevices.forEach { deviceConfig ->
+ maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
+ device = deviceConfig.device
+ apiLevel = deviceConfig.apiLevel
+ systemImageSource = deviceConfig.systemImageSource
}
}
- groups {
- maybeCreate("ci").apply {
- ciDevices.forEach { deviceConfig ->
- targetDevices.add(localDevices[deviceConfig.taskName])
- }
+ }
+ groups {
+ maybeCreate("ci").apply {
+ ciDevices.forEach { deviceConfig ->
+ targetDevices.add(localDevices[deviceConfig.taskName])
}
}
}
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 5c0b2a4b1..281cca5fa 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -39,13 +39,11 @@ internal fun Project.configureKotlinAndroid(
defaultConfig.minSdk = 23
- compileOptions {
- // Up to Java 11 APIs are available through desugaring
- // https://developer.android.com/studio/write/java11-minimal-support-table
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- isCoreLibraryDesugaringEnabled = true
- }
+ // Up to Java 11 APIs are available through desugaring
+ // https://developer.android.com/studio/write/java11-minimal-support-table
+ compileOptions.sourceCompatibility = JavaVersion.VERSION_11
+ compileOptions.targetCompatibility = JavaVersion.VERSION_11
+ compileOptions.isCoreLibraryDesugaringEnabled = true
}
configureKotlin<KotlinAndroidProjectExtension>()