Update to Kotlin 2.0.0

Doist · Jul 16, 2024 · 82c528e · 82c528e
1 parent df2316c
commit 82c528e
Show file tree

Hide file tree

Showing 4 changed files with 237 additions and 206 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,44 +1,38 @@
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
     id("targets")
     id("cinterop")
     id("publish")
-    id("com.goncalossilva.resources") version "0.4.0"
+    id("com.goncalossilva.resources") version "0.9.0"
 }
 
 repositories {
     mavenCentral()
 }
 
 kotlin {
-    jvmToolchain(11)
-
     explicitApi()
 
+    jvmToolchain(11)
+
     sourceSets {
         all {
             languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation("com.goncalossilva:resources:0.4.2")
+                implementation("com.goncalossilva:resources:0.9.0")
             }
         }
     }
 }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.release.set(8)
-}
-
 rootProject.plugins.withType(YarnPlugin::class.java) {
     rootProject.configure<YarnRootExtension> {
         yarnLockMismatchReport = YarnLockMismatchReport.WARNING

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
     implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,9 @@ ossrhStagingProfileId=28f59cc72c4fe0
 # Build properties.
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
 kotlin.code.style=official
-kotlin.js.generate.executable.default=false
+kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
+kotlin.apple.xcodeCompatibility.nowarn=true
+kotlin.js.generate.executable.default=false
+