Skip to content

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

Refactor to improve `FlavorDimension` extensibility, and replace to `register` lazy api.

Jaehwa Noh65d7e4519ea7
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 633098604..c3d996014 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
@@ -21,13 +21,16 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St
fun configureFlavors(
commonExtension: CommonExtension<*, *, *, *, *, *>,
- flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}
+ flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {},
) {
commonExtension.apply {
- flavorDimensions += FlavorDimension.contentType.name
+ FlavorDimension.values().forEach {
+ flavorDimensions += it.name
+ }
+
productFlavors {
NiaFlavor.values().forEach {
- create(it.name) {
+ register(it.name) {
dimension = it.dimension.name
flavorConfigurationBlock(this, it)
if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {