@@ -14,6 +14,7 @@ import org.gradle.kotlin.dsl.provideDelegate
1414import org.gradle.kotlin.dsl.the
1515import org.gradle.kotlin.dsl.withType
1616import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
17+ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
1718import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1819import java.io.File
1920
@@ -75,25 +76,20 @@ internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *,
7576 }
7677
7778 extensions.configure<ComposeCompilerGradlePluginExtension > {
78- // Enable strong skipping mode
79- enableStrongSkippingMode.set(true )
80-
81- // Enable experimental compiler opts
82- // https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.9
83- enableNonSkippingGroupOptimization.set(true )
79+ featureFlags.set(setOf (ComposeFeatureFlag .OptimizeNonSkippingGroups ))
8480
8581 val enableMetrics = project.providers.gradleProperty(" enableComposeCompilerMetrics" ).orNull.toBoolean()
8682 val enableReports = project.providers.gradleProperty(" enableComposeCompilerReports" ).orNull.toBoolean()
8783
88- val rootProjectDir = rootProject.layout.buildDirectory.asFile.get()
84+ val rootBuildDir = rootProject.layout.buildDirectory.asFile.get()
8985 val relativePath = projectDir.relativeTo(rootDir)
86+
9087 if (enableMetrics) {
91- val buildDirPath = rootProjectDir.resolve(" compose-metrics" ).resolve(relativePath)
92- metricsDestination.set(buildDirPath)
88+ rootBuildDir.resolve(" compose-metrics" ).resolve(relativePath).let (metricsDestination::set)
9389 }
90+
9491 if (enableReports) {
95- val buildDirPath = rootProjectDir.resolve(" compose-reports" ).resolve(relativePath)
96- reportsDestination.set(buildDirPath)
92+ rootBuildDir.resolve(" compose-reports" ).resolve(relativePath).let (reportsDestination::set)
9793 }
9894 }
9995
0 commit comments