Merge pull request #78 from krzdabrowski/renovate/major-kotlin-monorepo

Update kotlin monorepo to v2 (major)
krzdabrowski · Jun 15, 2024 · 4adab3f · 4adab3f
2 parents 25243bd + b61456e
commit 4adab3f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,6 @@ lint/tmp/
 
 # Build cache
 build-cache
+
+# Since Kotlin 2.0.0, folder named ".kotlin" is created at compile time
+.kotlin
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlin.compose.compiler)
     alias(libs.plugins.ksp)
     alias(libs.plugins.ktlint)
 }
@@ -38,8 +39,8 @@ android {
         }
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+    composeCompiler {
+        enableStrongSkippingMode = true
     }
 
     kotlin {

diff --git a/basic-feature/build.gradle.kts b/basic-feature/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.junit)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlin.compose.compiler)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
@@ -33,18 +34,18 @@ android {
         }
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+    composeCompiler {
+        enableStrongSkippingMode = true
     }
 
     kotlin {
         jvmToolchain(17)
-    }
 
-    kotlinOptions {
-        freeCompilerArgs = listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
+            )
+        }
     }
 
     sourceSets {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.junit) apply false
     alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.kotlin.compose.compiler) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.hilt)
     alias(libs.plugins.junit)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlin.compose.compiler)
     alias(libs.plugins.ksp)
     alias(libs.plugins.ktlint)
 }
@@ -33,21 +34,21 @@ android {
         }
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+    composeCompiler {
+        enableStrongSkippingMode = true
     }
 
     kotlin {
         jvmToolchain(17)
-    }
 
-    kotlinOptions {
-        freeCompilerArgs = listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-        )
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+                "-opt-in=kotlinx.coroutines.FlowPreview",
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+            )
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,9 @@
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8 -XX:+UseParallelGC
+org.gradle.jvmargs=-Xms8g -Xmx10g -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 org.gradle.parallel=true
+org.gradle.workers.max=5
 
 # Application properties
 android.useAndroidX=true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ android-gradle                      = "8.5.0"
 detekt                              = "1.23.6"
 detekt-compose-rules                = "0.4.4"
 junit                               = "1.10.0.0"
-ksp                                 = "1.9.24-1.0.20"
+ksp                                 = "2.0.0-1.0.22"
 ktlint                              = "3.16.0"
 
 # production libraries
@@ -13,9 +13,9 @@ compose-bom                         = "2024.06.00"
 compose-compiler                    = "1.5.14"
 compose-material3                   = "1.2.1"
 hilt                                = "2.51.1"
-kotlin                              = "1.9.24"
+kotlin                              = "2.0.0"
 kotlin-coroutines                   = "1.8.1"
-kotlin-serialization                = "1.6.3"
+kotlin-serialization                = "1.7.0"
 lifecycle                           = "2.7.0" # update to 2.8.x when it fixes the crash on release version that happens on 2.8.2
 navigation                          = "2.7.7"
 navigation-hilt                     = "1.2.0"
@@ -46,6 +46,7 @@ detekt                              = { id = "io.gitlab.arturbosch.detekt", vers
 hilt                                = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 junit                               = { id = "de.mannodermaus.android-junit5", version.ref = "junit" }
 kotlin                              = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+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" }