Update Kotlin to 2.0.0 (#172)

ajalt · May 22, 2024 · adad637 · adad637
1 parent 0b7b82c
commit adad637
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+### Changed
+- Update Kotlin to 2.0.0
 
 ## 2.6.0
 ### Added

diff --git a/buildSrc/src/main/kotlin/mordant-js-conventions.gradle.kts b/buildSrc/src/main/kotlin/mordant-js-conventions.gradle.kts
@@ -27,6 +27,6 @@ kotlin {
 // Need to compile using a canary version of Node due to
 // https://youtrack.jetbrains.com/issue/KT-63014
 rootProject.the<NodeJsRootExtension>().apply {
- nodeVersion = "21.0.0-v8-canary2023091837d0630120"
- nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+ version = "21.0.0-v8-canary2023091837d0630120"
+ downloadBaseUrl = "https://nodejs.org/download/v8-canary"
 }
diff --git a/buildSrc/src/main/kotlin/mordant-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/mordant-kotlin-conventions.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 }
 
 tasks.withType<KotlinJvmCompile>().configureEach {
- kotlinOptions {
- freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
+ compilerOptions {
+ freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+ jvmTarget.set(JvmTarget.JVM_1_8)
  }
- compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
 }
 
 tasks.withType<JavaCompile>().configureEach {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.23"
-coroutines = "1.8.0"
+kotlin = "2.0.0"
+coroutines = "1.8.1"
 
 [libraries]
 colormath = "com.github.ajalt.colormath:colormath:3.5.0"
@@ -14,7 +14,7 @@ graalvm-svm = "org.graalvm.nativeimage:svm:23.1.0"
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 
 # used in tests
-kotest = "io.kotest:kotest-assertions-core:5.9.0.1440-SNAPSHOT"
+kotest = "io.kotest:kotest-assertions-core:5.9.0"
 systemrules = "com.github.stefanbirkner:system-rules:1.19.0"
 r8 = "com.android.tools:r8:8.3.37"
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -26,4 +26,4 @@ publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.
 
 [plugins]
 graalvm-nativeimage = "org.graalvm.buildtools.native:0.9.28"
-kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.13.2"
+kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.14.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,11 +17,6 @@ include(
 dependencyResolutionManagement {
  repositories {
  mavenCentral()
- // TODO: we can remove this once kotest releases a new version
- maven {
- url= uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
- mavenContent { snapshotsOnly() }
- }
  }
 }