Update to new Compose compiler.

touchlab · May 30, 2024 · ce6db20 · ce6db20
1 parent e567688
commit ce6db20
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -72,8 +72,8 @@ The central part of the "Kit" is the starter app. It includes a set of libraries
 You will need the following:
 
 - JVM 17
-- Android SDK and the latest stable Android Studio (2022.3+) or IntelliJ(2023.2+)
-- Mac with Xcode 14+ for the iOS build
+- Android SDK and the latest stable Android Studio (2023.3+) or IntelliJ(2024.1+)
+- Mac with Xcode 15+ for the iOS build
 
 For a more detailed guide targeted at iOS developers, see [DETAILED_DEV_SETUP](docs/DETAILED_DEV_SETUP.md).
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -41,10 +42,6 @@ android {
         compose = true
         buildConfig = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
 }
 
 dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.skie) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 subprojects {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,23 +7,23 @@ compileSdk = "34"
 # Dependencies
 kotlin = "2.0.0"
 
-android-gradle-plugin = "8.2.2"
+android-gradle-plugin = "8.2.0"
 ktlint-gradle = "12.1.0"
 
 compose = "1.6.7"
-composeCompiler = "1.5.14"
 
 android-desugaring = "2.0.4"
-androidx-core = "1.12.0"
+androidx-core = "1.13.1"
 androidx-test-junit = "1.1.5"
-androidx-activity-compose = "1.8.2"
+androidx-activity-compose = "1.9.0"
+# TODO: Update to 2.8.+ when updating to Compose 1.7.+
 androidx-lifecycle = "2.7.0"
 
 junit = "4.13.2"
 
-coroutines = "1.8.0"
+coroutines = "1.8.1"
 kotlinx-datetime = "0.6.0"
-ktor = "2.3.9"
+ktor = "2.3.11"
 
 robolectric = "4.10.3"
 
@@ -43,7 +43,6 @@ androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmode
 androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 androidx-test-junit = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-junit" }
 
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
@@ -95,10 +94,10 @@ android-application = { id = "com.android.application", version.ref = "android-g
 android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 skie = { id = "co.touchlab.skie", version.ref = "skie" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [bundles]
 app-ui = [
-    "compose-compiler",
     "androidx-core",
     "androidx-lifecycle-runtime",
     "androidx-lifecycle-viewmodel",
@@ -124,4 +123,3 @@ shared-androidTest = [
     "roboelectric",
     "sqlDelight-jvm"
 ]
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME