Merge branch 'develop' into feature/widget

# Conflicts: # .idea/deploymentTargetSelector.xml # gradle/libs.versions.toml
jeprubio · Jun 7, 2024 · c0e2c01 · c0e2c01
2 parents 16c2d65 + 45bd01a
commit c0e2c01
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 28 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
@@ -33,9 +34,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/feature-characters/build.gradle.kts b/feature-characters/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
@@ -29,9 +30,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/feature-comics/build.gradle.kts b/feature-comics/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
@@ -29,9 +30,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,9 @@
 [versions]
-agp = "8.4.0"
+agp = "8.4.1"
 compose-bom = "2024.05.00"
-# @keep this version
-compose-compiler = "1.5.12"
 konsist = "0.15.1"
-kotlin = "1.9.23"
-appcompat = "1.6.1"
+kotlin = "2.0.0"
+appcompat = "1.7.0"
 core-splashscreen = "1.0.1"
 core-ktx = "1.13.1"
 core-testing = "2.2.0"
@@ -16,28 +14,28 @@ retrofit = "2.11.0"
 hilt = "2.51.1"
 hilt-navigation-compose = "1.2.0"
 coil-compose = "2.6.0"
-window = "1.2.0"
-kotlinx-serialization-json = "1.6.3"
+window = "1.3.0"
+kotlinx-serialization-json = "1.7.0"
 navigation-runtime-ktx = "2.7.7"
 nav_compose = "2.7.7"
-gson = "2.10.1"
+gson = "2.11.0"
 okio = "3.9.0"
 okhttp = "4.12.0"
 logging-interceptor = "4.12.0"
 timber = "5.0.1"
 material = "1.12.0"
-lottie-compose = "6.4.0"
+lottie-compose = "6.4.1"
 androidx-test-ext-junit = "1.1.5"
 espresso = "3.5.1"
 junitparams = "1.1.1"
 junit-jupiter = "5.10.2"
-mockk = "1.13.10"
-coroutines-test = "1.8.0"
+mockk = "1.13.11"
+coroutines-test = "1.8.1"
 mockwebserver = "4.12.0"
 secrets-gradle-plugin = "2.0.1"
 shot = "6.1.0"
 versions = "0.51.0"
-ksp = "1.9.23-1.0.20"
+ksp = "2.0.0-1.0.22"
 glance = "1.0.0"
 ui-tooling-preview-android = "1.6.7"
 test-core = "1.5.0"
@@ -102,6 +100,7 @@ androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "u
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

diff --git a/library-components/build.gradle.kts b/library-components/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.parcelize)
     id("shot")
 }
@@ -30,9 +31,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"