From 454e7b6e644b8b112b882b8f1282e15fc46553e0 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 10:23:06 +0100 Subject: [PATCH 1/3] Replace deprecated `stabilityConfigurationFile` with `stabilityConfigurationFiles` https://kotlinlang.org/api/kotlin-gradle-plugin/compose-compiler-gradle-plugin/org.jetbrains.kotlin.compose.compiler.gradle/-compose-compiler-gradle-plugin-extension/stability-configuration-file.html --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d32470dac1..911f02ebba 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 @@ -67,7 +67,7 @@ internal fun Project.configureAndroidCompose( .relativeToRootProject("compose-reports") .let(reportsDestination::set) - stabilityConfigurationFile = - isolated.rootProject.projectDirectory.file("compose_compiler_config.conf") + stabilityConfigurationFiles + .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) } } From 2a180f9d49075ab87fdf0fa44d3e7f94882a476b Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 10:26:22 +0100 Subject: [PATCH 2/3] Use lambda syntax --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 911f02ebba..8fc46a436b 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 @@ -67,7 +67,8 @@ internal fun Project.configureAndroidCompose( .relativeToRootProject("compose-reports") .let(reportsDestination::set) - stabilityConfigurationFiles - .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) + stabilityConfigurationFiles.add { + isolated.rootProject.projectDirectory.file("compose_compiler_config.conf") + } } } From 042cb7690d85dc79d43c6c2435c8a315d205f250 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 16:22:57 +0100 Subject: [PATCH 3/3] Restore initial function call --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 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 8fc46a436b..911f02ebba 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 @@ -67,8 +67,7 @@ internal fun Project.configureAndroidCompose( .relativeToRootProject("compose-reports") .let(reportsDestination::set) - stabilityConfigurationFiles.add { - isolated.rootProject.projectDirectory.file("compose_compiler_config.conf") - } + stabilityConfigurationFiles + .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) } }