Move all Compose Gradle config to build-logic

skydoves · May 22, 2024 · 6cdf6b3 · 6cdf6b3
1 parent de49565
commit 6cdf6b3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,6 @@ freeline_project_description.json
 .project
 .settings
 .classpath
+
+# Kotlin
+.kotlin
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -64,15 +64,9 @@ android {
   }
 
   buildFeatures {
-    compose = true
     buildConfig = true
   }
 
-  composeCompiler {
-    enableStrongSkippingMode = true
-    reportsDestination = layout.buildDirectory.dir("compose_compiler")
-  }
-
   hilt {
     enableAggregatingTask = true
   }

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -12,6 +12,7 @@ java {
 
 dependencies {
   compileOnly(libs.android.gradlePlugin)
+  compileOnly(libs.compose.compiler.gradlePlugin)
   compileOnly(libs.kotlin.gradlePlugin)
   compileOnly(libs.spotless.gradlePlugin)
 }

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -8,7 +8,6 @@ class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
   override fun apply(target: Project) {
     with(target) {
       pluginManager.apply("com.android.application")
-      pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
       val extension = extensions.getByType<BaseAppModuleExtension>()
       configureAndroidCompose(extension)
     }

diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -1,21 +1,17 @@
 import com.android.build.gradle.LibraryExtension
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.skydoves.pokedex.compose.configureAndroidCompose
 import com.skydoves.pokedex.compose.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.getByType
 
 class AndroidFeatureConventionPlugin : Plugin<Project> {
   override fun apply(target: Project) {
     with(target) {
       pluginManager.apply {
         apply("com.android.library")
         apply("org.jetbrains.kotlin.android")
-        apply("org.jetbrains.kotlin.plugin.compose")
       }
 
       dependencies {

diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -8,7 +8,6 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
   override fun apply(target: Project) {
     with(target) {
       pluginManager.apply("com.android.library")
-      pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
       val extension = extensions.getByType<LibraryExtension>()
       configureAndroidCompose(extension)
     }

diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/pokedex/compose/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/skydoves/pokedex/compose/AndroidCompose.kt
@@ -1,20 +1,27 @@
 package com.skydoves.pokedex.compose
 
 import com.android.build.api.dsl.CommonExtension
-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<*, *, *, *, *, *>,
 ) {
+  pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
+
   commonExtension.apply {
     buildFeatures {
       compose = true
     }
   }
+
+  extensions.configure<ComposeCompilerGradlePluginExtension> {
+    enableStrongSkippingMode = true
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+  }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -90,6 +90,7 @@ uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref =
 
 # Dependencies of the included build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
+compose-compiler-gradlePlugin = { group = "org.jetbrains.kotlin", name = "compose-compiler-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 spotless-gradlePlugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }