Merge pull request #352 from skydoves/kotlin/2.0.0

Bump Kotlin to 2.0.0 and Compose compiler

Author: skydoves

build-logic/convention/build.gradle.kts

@@ -1,49 +1,50 @@
 plugins {
-    `kotlin-dsl`
+  `kotlin-dsl`
 }
 
 group = "com.skydoves.chatgpt.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
-    compileOnly(libs.android.gradlePlugin)
-    compileOnly(libs.kotlin.gradlePlugin)
-    compileOnly(libs.spotless.gradlePlugin)
+  compileOnly(libs.android.gradlePlugin)
+  compileOnly(libs.kotlin.gradlePlugin)
+  compileOnly(libs.compose.compiler.gradlePlugin)
+  compileOnly(libs.spotless.gradlePlugin)
 }
 
 gradlePlugin {
-    plugins {
-        register("androidApplicationCompose") {
-            id = "skydoves.android.application.compose"
-            implementationClass = "AndroidApplicationComposeConventionPlugin"
-        }
-        register("androidApplication") {
-            id = "skydoves.android.application"
-            implementationClass = "AndroidApplicationConventionPlugin"
-        }
-        register("androidLibraryCompose") {
-            id = "skydoves.android.library.compose"
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
-        }
-        register("androidLibrary") {
-            id = "skydoves.android.library"
-            implementationClass = "AndroidLibraryConventionPlugin"
-        }
-        register("androidFeature") {
-            id = "skydoves.android.feature"
-            implementationClass = "AndroidFeatureConventionPlugin"
-        }
-        register("androidHilt") {
-            id = "skydoves.android.hilt"
-            implementationClass = "AndroidHiltConventionPlugin"
-        }
-        register("spotless") {
-            id = "skydoves.spotless"
-            implementationClass = "SpotlessConventionPlugin"
-        }
+  plugins {
+    register("androidApplicationCompose") {
+      id = "skydoves.android.application.compose"
+      implementationClass = "AndroidApplicationComposeConventionPlugin"
     }
+    register("androidApplication") {
+      id = "skydoves.android.application"
+      implementationClass = "AndroidApplicationConventionPlugin"
+    }
+    register("androidLibraryCompose") {
+      id = "skydoves.android.library.compose"
+      implementationClass = "AndroidLibraryComposeConventionPlugin"
+    }
+    register("androidLibrary") {
+      id = "skydoves.android.library"
+      implementationClass = "AndroidLibraryConventionPlugin"
+    }
+    register("androidFeature") {
+      id = "skydoves.android.feature"
+      implementationClass = "AndroidFeatureConventionPlugin"
+    }
+    register("androidHilt") {
+      id = "skydoves.android.hilt"
+      implementationClass = "AndroidHiltConventionPlugin"
+    }
+    register("spotless") {
+      id = "skydoves.spotless"
+      implementationClass = "SpotlessConventionPlugin"
+    }
+  }
 }

build-logic/convention/src/main/kotlin/com/skydoves/chatgpt/AndroidCompose.kt

@@ -5,50 +5,26 @@ import java.io.File
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
 
 /**
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
   commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
-  val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+  pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
 
   commonExtension.apply {
     buildFeatures {
       compose = true
     }
-
-    composeOptions {
-      kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").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
-    )
+  extensions.configure<ComposeCompilerGradlePluginExtension> {
+    enableStrongSkippingMode = true
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
   }
-  return metricParameters.toList()
 }

build.gradle.kts

@@ -7,6 +7,7 @@ buildscript {
 
 plugins {
   alias(libs.plugins.android.application) apply false
+  alias(libs.plugins.compose.compiler) apply false
   alias(libs.plugins.kotlin.jvm) apply false
   alias(libs.plugins.ksp) apply false
   alias(libs.plugins.hilt) apply false

gradle/libs.versions.toml

@@ -7,7 +7,6 @@ androidGradlePlugin = "8.4.2"
 androidxActivity = "1.9.0"
 androidxAppCompat = "1.7.0"
 androidxCompose = "1.6.8"
-androidxComposeCompiler = "1.5.11"
 androidxComposeMaterial3 = "1.2.1"
 androidxComposeConstraintLayout = "1.0.1"
 androidxComposeNavigation = "2.7.7"
@@ -28,9 +27,9 @@ viewModelLifecycle = "1.1.0"
 hilt = "2.51.1"
 hiltWorker = "1.2.0"
 junit4 = "4.13.2"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 kotlinxCoroutines = "1.8.1"
-ksp = "1.9.23-1.0.20"
+ksp = "2.0.0-1.0.22"
 ktlint = "0.43.0"
 okhttp = "4.12.0"
 googleSecretPlugin = "2.0.1"
@@ -99,12 +98,14 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 # Dependencies of the included build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+compose-compiler-gradlePlugin = { group = "org.jetbrains.kotlin", name = "compose-compiler-gradle-plugin", version.ref = "kotlin" }
 spotless-gradlePlugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }