chore: update kotlin again (#679)

ocean-ds · Jul 22, 2024 · 896f629 · 896f629
1 parent f72287c
commit 896f629
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("androidx.baselineprofile")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -29,10 +30,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Configs.kotlinCompilerExtensionVersion
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,3 +10,7 @@ buildscript {
         classpath(libs.benchmark.baseline.profile.gradle.plugin)
     }
 }
+
+plugins {
+    alias(libs.plugins.compose.compiler) apply false
+}
diff --git a/buildSrc/src/main/kotlin/Configs.kt b/buildSrc/src/main/kotlin/Configs.kt
@@ -2,7 +2,6 @@ object Configs {
     const val compileSdkVersion = 34
     const val minSdkVersion = 23
     const val targetSdkVersion = 34
-    const val kotlinCompilerExtensionVersion = "1.5.14"
     const val gprBaseUrl = "https://maven.pkg.github.com"
     const val gprRepoOwner = "ocean-ds"
     const val gprRepoId = "ocean-android"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 gradle = "8.3.2"
 junitVersion = "4.13.2"
-kotlinGradlePlugin = "1.9.24"
+kotlinGradlePlugin = "2.0.0"
 benchmarkBaselineProfileGradlePlugin = "1.2.4"
 benchmarkMacroJunit4 = "1.2.4"
-composeBom = "2024.04.00"
+composeBom = "2024.06.00"
 espressoCore = "3.6.1"
 junit = "1.2.1"
 robolectric = "4.13"
 uiautomator = "2.3.0"
 lifecycleViewModel = "2.8.3"
 constraintLayout = "2.1.4"
-androidCoreKtx = "1.12.0"
+androidCoreKtx = "1.13.1"
 
 [libraries]
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" }
@@ -27,11 +27,11 @@ lifecycleExtensions = { module = "androidx.lifecycle:lifecycle-extensions", vers
 recyclerView = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" }
 lifecycleViewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewModel" }
 androidKtx = { module = "androidx.core:core-ktx", version.ref = "androidCoreKtx" }
-androidAppCompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
+androidAppCompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 skydoves-balloon = { module = "com.github.skydoves:balloon", version = "1.6.5" }
 skydoves-balloon-compose = { module = "com.github.skydoves:balloon-compose", version = "1.6.5" }
-skydovesLandscapist = { module = "com.github.skydoves:landscapist-glide", version = "2.3.2" }
+skydovesLandscapist = { module = "com.github.skydoves:landscapist-glide", version = "2.3.6" }
 androidMaterial = { module = "com.google.android.material:material", version = "1.10.0" }
 canarinho = { module = "com.github.concretesolutions:canarinho", version = "2.0.2" }
 glide = { module = "com.github.bumptech.glide:glide", version = "4.16.0" }
@@ -53,4 +53,5 @@ compose-uiTestJunit4 = { group = "androidx.compose.ui", name =  "ui-test-junit4"
 compose-uiTestManifest = { group = "androidx.compose.ui", name =  "ui-test-manifest" }
 compose-runtimeLiveData = { group = "androidx.compose.runtime", name =  "runtime-livedata" }
 
-[plugins]
+[plugins]
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinGradlePlugin" }
diff --git a/ocean-components/build.gradle.kts b/ocean-components/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("androidx.baselineprofile")
+    alias(libs.plugins.compose.compiler)
 }
 
 fun getVersionName(): String {
@@ -55,10 +56,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Configs.kotlinCompilerExtensionVersion
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17