Revert AGP's APIs change workarounds with `.apply{}` to reduce visual changes as requested

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()

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt

@@ -35,7 +35,8 @@ internal fun configureGradleManagedDevices(
     val ciDevices = listOf(pixel4, pixelC)
 
 
-    commonExtension.testOptions.managedDevices {
+    commonExtension.testOptions.apply {
+        managedDevices {
             allDevices {
                 allDevices.forEach { deviceConfig ->
                     maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
@@ -54,6 +55,7 @@ internal fun configureGradleManagedDevices(
             }
         }
     }
+}
 
 private data class DeviceConfig(
     val device: String,

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
+        }
 
+        compileOptions.apply {
             // 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
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+            isCoreLibraryDesugaringEnabled = true
+        }
     }
 
     configureKotlin<KotlinAndroidProjectExtension>()

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt

@@ -28,8 +28,9 @@ fun configureFlavors(
             flavorDimensions += flavorDimension.name
         }
 
+        productFlavors.apply {
             NiaFlavor.values().forEach { niaFlavor ->
-            productFlavors.register(niaFlavor.name) {
+                register(niaFlavor.name) {
                     dimension = niaFlavor.dimension.name
                     flavorConfigurationBlock(this, niaFlavor)
                     if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
@@ -41,3 +42,4 @@ fun configureFlavors(
             }
         }
     }
+}