Update Kotlin to 2.0.0

oblakr24 · Jun 6, 2024 · a920dff · a920dff
1 parent ebca08b
commit a920dff
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 12 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,7 +3,9 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("kotlin-kapt")
     id("com.google.dagger.hilt.android")
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
+
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -47,9 +49,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -59,7 +58,7 @@ android {
 
 dependencies {
     val composeHiltNavigationVersion = "1.2.0"
-    val navVersion = "2.8.0-beta01"
+    val navVersion = "2.8.0-beta02"
     val composeUiVersion = "1.6.7"
     val timberVersion = "5.0.1"
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,14 +4,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        val kotlinVersion = "1.9.22"
+        val kotlinVersion = "2.0.0"
         classpath("app.cash.molecule:molecule-gradle-plugin:1.4.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 plugins {
-    id("com.android.application") version "8.3.0" apply false
-    id("com.android.library") version "8.3.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+    id("com.android.application") version "8.4.1" apply false
+    id("com.android.library") version "8.4.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
     id("com.google.dagger.hilt.android") version "2.49" apply false
-}
+
+    alias(libs.plugins.compose.compiler) apply false
+}
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,7 @@
+[versions]
+kotlin = "2.0.0"
+
+[plugins]
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Mar 17 14:00:43 ICT 2024
 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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists