A fully functional Android app built entirely with Kotlin and Jetpack Compose
Move compose metrics parameters to Android Compose script
takahiromd3ffb1f80675
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.ktindex b59ec5625..8f2500871 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@@ -19,8 +19,8 @@ package com.google.samples.apps.nowinandroidimport com.android.build.api.dsl.CommonExtensionimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtension-import org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByType+import java.io.File/*** Configure Compose-specific options@@ -38,5 +38,33 @@ internal fun Project.configureAndroidCompose(composeOptions {kotlinCompilerExtensionVersion = libs.findVersion("androidxCompose").get().toString()}++ kotlinOptions {+ freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()+ }}}++private fun Project.buildComposeMetricsParameters(): List<String> {+ val metricParameters = mutableListOf<String>()+ val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")+ val enableMetrics = (enableMetricsProvider.orNull == "true")+ if (enableMetrics) {+ val metricsFolder = File(project.buildDir, "compose-metrics")+ metricParameters.add("-P")+ metricParameters.add(+ "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath+ )+ }++ val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")+ val enableReports = (enableReportsProvider.orNull == "true")+ if (enableReports) {+ val reportsFolder = File(project.buildDir, "compose-reports")+ metricParameters.add("-P")+ metricParameters.add(+ "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath+ )+ }+ return metricParameters.toList()+}\ No newline at end of filediff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex 76583e0eb..ef9ec9072 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@ -24,7 +24,6 @@ import org.gradle.api.plugins.ExtensionAwareimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByTypeimport org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions-import java.io.File/*** Configure base Kotlin with Android options@@ -57,7 +56,7 @@ internal fun Project.configureKotlinAndroid("-opt-in=kotlin.Experimental",// Enable experimental kotlinx serialization APIs"-opt-in=kotlinx.serialization.ExperimentalSerializationApi"- ) + buildComposeMetricsParameters()+ )// Set JVM target to 1.8jvmTarget = JavaVersion.VERSION_1_8.toString()@@ -71,26 +70,6 @@ internal fun Project.configureKotlinAndroid(}}-private fun Project.buildComposeMetricsParameters(): List<String> {- val metricParameters = mutableListOf<String>()- val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")- val enableMetrics = (enableMetricsProvider.orNull == "true")- if (enableMetrics) {- val metricsFolder = File(project.buildDir, "compose-metrics")- metricParameters.add("-P")- metricParameters.add("plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath)- }-- val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")- val enableReports = (enableReportsProvider.orNull == "true")- if (enableReports) {- val reportsFolder = File(project.buildDir, "compose-reports")- metricParameters.add("-P")- metricParameters.add("plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath)- }- return metricParameters-}--private fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {+fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {(this as ExtensionAware).extensions.configure("kotlinOptions", block)}