Update to use compose compiler gradle plugin (#300)

EmergeTools · Nov 6, 2024 · d19daa3 · d19daa3
1 parent e7898ba
commit d19daa3
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 37 deletions.
diff --git a/distribution/sample/app/build.gradle.kts b/distribution/sample/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.buildconfig)
@@ -61,10 +62,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 buildConfig {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,12 +2,11 @@
 androidx-navigation = "2.8.0-beta02"
 androidx-test = "1.5.0"
 androidx-test-ext = "1.1.5"
-agp = "8.1.1"
+agp = "8.5.2"
 androidxactivity = "1.7.1"
-compose-bom = "2024.09.03"
-compose-compiler-extension = "1.5.10"
+compose-bom = "2024.10.01"
 detekt = "1.22.0"
-kotlin = "1.9.22"
+kotlin = "2.0.21"
 kotlin-coroutines = "1.8.0"
 kotlinpoet = "1.14.2"
 kotlin-compile-testing = "1.5.0"
@@ -27,7 +26,7 @@ foundation-layout-android = "1.7.3"
 emerge-gradle-plugin = "4.0.2"
 emerge-performance = "2.1.2"
 emerge-reaper = "1.0.0-rc03"
-emerge-snapshots = "1.3.0-rc02"
+emerge-snapshots = "1.3.0-rc03"
 emerge-distribution = "0.0.1"
 
 [plugins]
@@ -37,6 +36,7 @@ android-lint = { id = "com.android.lint", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
 benchmark = { id = "androidx.benchmark", version.ref = "benchmark" }
 buildconfig = "com.github.gmazzo.buildconfig:5.3.5"
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

diff --git a/performance/sample/app/build.gradle.kts b/performance/sample/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   id("com.emergetools.android")
 }
@@ -79,10 +80,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 dependencies {

diff --git a/reaper/sample/app/build.gradle.kts b/reaper/sample/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.buildconfig)
@@ -62,10 +63,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 buildConfig {

diff --git a/reaper/sample/manuallyInitializedApp/build.gradle.kts b/reaper/sample/manuallyInitializedApp/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.buildconfig)
@@ -60,10 +61,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 buildConfig {

diff --git a/reaper/sample/stress/build.gradle.kts b/reaper/sample/stress/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.buildconfig)
@@ -73,10 +74,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 buildConfig {

diff --git a/snapshots/sample/app/build.gradle.kts b/snapshots/sample/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.application)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
   id("com.emergetools.android")
 }
@@ -58,10 +59,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 dependencies {

diff --git a/snapshots/sample/ui-module/build.gradle.kts b/snapshots/sample/ui-module/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.android)
 }
 
@@ -24,10 +25,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
 }
 
 dependencies {

diff --git a/snapshots/snapshots/build.gradle.kts b/snapshots/snapshots/build.gradle.kts
@@ -3,6 +3,7 @@ import java.util.Date
 
 plugins {
   alias(libs.plugins.android.library)
+  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.grgit)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.serialization)
@@ -38,10 +39,6 @@ android {
     compose = true
   }
 
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.extension.get()
-  }
-
   // Ensures our version.txt is packaged in with release.
   // Will be pulled in automatically to test APK upon build
   sourceSets.getByName("main").resources.srcDir(metaInfResDir)