From 1e7095d76a00999b5252dfba5af3e87268870168 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Tue, 11 Nov 2025 09:47:47 +0100
Subject: [PATCH] Revert AGP's APIs change workarounds with `.apply{}` to
 reduce visual changes as requested

---
 .../apps/nowinandroid/AndroidCompose.kt       |  4 ++-
 .../apps/nowinandroid/GradleManagedDevices.kt | 26 ++++++++++---------
 .../apps/nowinandroid/KotlinAndroid.kt        | 16 +++++++-----
 .../samples/apps/nowinandroid/NiaFlavor.kt    | 16 +++++++-----
 4 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
index 1daa63d2e..f018cbfc5 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -31,7 +31,9 @@ internal fun Project.configureAndroidCompose(
     commonExtension: CommonExtension,
 ) {
     commonExtension.apply {
-        buildFeatures.compose = true
+        buildFeatures.apply {
+            compose = true
+        }
 
         dependencies {
             val bom = libs.findLibrary("androidx-compose-bom").get()
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 25e506b7f..310d90d81 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
@@ -35,20 +35,22 @@ internal fun configureGradleManagedDevices(
     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.apply {
+        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 281cca5fa..a923ce24e 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
@@ -37,13 +37,17 @@ internal fun Project.configureKotlinAndroid(
     commonExtension.apply {
         compileSdk = 35
 
-        defaultConfig.minSdk = 23
+        defaultConfig.apply {
+            minSdk = 23
+        }
 
-        // 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
+        compileOptions.apply {
+            // 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
+        }
     }
 
     configureKotlin<KotlinAndroidProjectExtension>()
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
index 9778eb641..9fbf0625c 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
@@ -28,13 +28,15 @@ fun configureFlavors(
             flavorDimensions += flavorDimension.name
         }
 
-        NiaFlavor.values().forEach { niaFlavor ->
-            productFlavors.register(niaFlavor.name) {
-                dimension = niaFlavor.dimension.name
-                flavorConfigurationBlock(this, niaFlavor)
-                if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
-                    if (niaFlavor.applicationIdSuffix != null) {
-                        applicationIdSuffix = niaFlavor.applicationIdSuffix
+        productFlavors.apply {
+            NiaFlavor.values().forEach { niaFlavor ->
+                register(niaFlavor.name) {
+                    dimension = niaFlavor.dimension.name
+                    flavorConfigurationBlock(this, niaFlavor)
+                    if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
+                        if (niaFlavor.applicationIdSuffix != null) {
+                            applicationIdSuffix = niaFlavor.applicationIdSuffix
+                        }
                     }
                 }
             }