Update to Kotlin 2.0

atomgomba · May 24, 2024 · fee956f · fee956f
1 parent 4116400
commit fee956f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ captures
 .externalNativeBuild
 .cxx
 local.properties
-xcuserdata
+xcuserdata
+.kotlin
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
@@ -9,21 +9,10 @@ plugins {
 kotlin {
     applyDefaultHierarchyTemplate()
 
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
-    }
+    jvm()
 
     androidTarget {
         publishLibraryVariants("release", "debug")
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
     }
 
     linuxX64()

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,12 @@
 plugins {
     // trick: for the same plugin versions in all sub-modules
     alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.compose.compiler).apply(false)
     alias(libs.plugins.composeMultiplatform).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)
 }
 
 allprojects {
     group = "com.ekezet.hurok"
-    version = "1.0.0"
+    version = "1.0.1"
 }
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -4,27 +4,17 @@ plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.compose.compiler)
     id("module.publication")
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
-    }
+    jvm()
 
     androidTarget {
         publishLibraryVariants("release", "debug")
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
     }
 
     linuxX64()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,21 +2,20 @@
 agp = "8.2.0"
 android-compileSdk = "34"
 android-minSdk = "24"
-androidx-lifecycle = "2.7.0"
-cmp = "1.6.2"
-kotlin = "1.9.23"
-kotlinx-coroutines = "1.8.0"
-nexus-publish = "2.0.0-rc-1"
+androidx-lifecycle = "2.8.0"
+cmp = "1.6.10"
+kotlin = "2.0.0"
+kotlinx-coroutines = "1.8.1"
 
 [libraries]
 androidx-lifecycle-viewmodelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
-nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" }
 
 [plugins]
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "cmp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -9,21 +9,10 @@ plugins {
 kotlin {
     applyDefaultHierarchyTemplate()
 
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
-    }
+    jvm()
 
     androidTarget {
         publishLibraryVariants("release", "debug")
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = ProjectDefaults.javaVersion.toString()
-            }
-        }
     }
 
     linuxX64()