From ddffc459ca74e6abd607aecfc7a2fe2a9c1a1c4a Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 23 Aug 2024 15:00:25 +0900 Subject: [PATCH] Integrate compose-metrics and compose-reports in one property "enableComposeCompilerReportsAndMetrics". Change-Id: Iaa78284fae1532e728c5f4546ac825b7509e450f --- .../apps/nowinandroid/AndroidCompose.kt | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 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 f16a8051a..ec9238a6a 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 @@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid import com.android.build.api.dsl.CommonExtension import org.gradle.api.Project -import org.gradle.api.provider.Provider import org.gradle.kotlin.dsl.assign import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies @@ -52,21 +51,14 @@ internal fun Project.configureAndroidCompose( } extensions.configure { - fun Provider.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } } - fun Provider<*>.relativeToRootProject(dir: String) = flatMap { - rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir)) - }.map { it.dir(dir) } - - project.providers.gradleProperty("enableComposeCompilerMetrics").onlyIfTrue() - .relativeToRootProject("compose-metrics") - .let(metricsDestination::set) + if (project.hasProperty("enableComposeCompilerReportsAndMetrics")) { + metricsDestination = relativeToRootProject("compose-metrics") + reportsDestination = relativeToRootProject("compose-reports") + } - project.providers.gradleProperty("enableComposeCompilerReports").onlyIfTrue() - .relativeToRootProject("compose-reports") - .let(reportsDestination::set) + stabilityConfigurationFile = + rootProject.layout.projectDirectory.file("compose_compiler_config.conf") - stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf") - enableStrongSkippingMode = true } }