From 7839613a5b2fab6c16a0f1beb9ee2cb693d25816 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 9 Jan 2026 11:00:58 +0100 Subject: [PATCH] Restore kotlin-dsl extension available on `NamedDomainObjectContainer` --- .../kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 daa58ad4b..96ca6073d 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 @@ -4,6 +4,7 @@ import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.ApplicationProductFlavor import com.android.build.api.dsl.CommonExtension import com.android.build.api.dsl.ProductFlavor +import org.gradle.kotlin.dsl.invoke @Suppress("EnumEntryName") enum class FlavorDimension { @@ -28,12 +29,12 @@ fun configureFlavors( flavorDimensions += flavorDimension.name } - productFlavors.apply flavors@{ + productFlavors { NiaFlavor.entries.forEach { niaFlavor -> register(niaFlavor.name) { dimension = niaFlavor.dimension.name flavorConfigurationBlock(this, niaFlavor) - if (this@flavors is ApplicationExtension && this is ApplicationProductFlavor) { + if (commonExtension is ApplicationExtension && this is ApplicationProductFlavor) { if (niaFlavor.applicationIdSuffix != null) { applicationIdSuffix = niaFlavor.applicationIdSuffix }