Upgraded Kotlin from 1.5.21 to 1.5.30. Also upgraded kotlinx.coroutines and kotlin logging. Now using languageSettings.optIn everywhere instead of compiler options.

buildSrc/build.gradle.kts

@@ -7,6 +7,6 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.5.21")
+    implementation("org.jetbrains.kotlin:kotlin-serialization:1.5.30")
 }

buildSrc/src/main/kotlin/world/phantasmal/ExperimentalAnnotations.kt

@@ -6,6 +6,3 @@ val EXPERIMENTAL_ANNOTATIONS: List<String> = listOf(
     "kotlin.contracts.ExperimentalContracts",
     "kotlin.time.ExperimentalTime",
 )
-
-val EXPERIMENTAL_ANNOTATION_COMPILER_ARGS: List<String> =
-    EXPERIMENTAL_ANNOTATIONS.map { "-Xopt-in=$it" }

buildSrc/src/main/kotlin/world/phantasmal/common.gradle.kts

@@ -8,9 +8,9 @@ repositories {
     mavenCentral()
 }
 
-project.extra["coroutinesVersion"] = "1.5.1"
+project.extra["coroutinesVersion"] = "1.5.2"
 project.extra["junitVersion"] = "5.7.1"
-project.extra["kotlinLoggingVersion"] = "2.0.6"
+project.extra["kotlinLoggingVersion"] = "2.0.11"
 project.extra["ktorVersion"] = "1.6.1"
 project.extra["log4jVersion"] = "2.14.1"
 project.extra["serializationVersion"] = "1.2.2"

buildSrc/src/main/kotlin/world/phantasmal/js.gradle.kts

@@ -8,10 +8,8 @@ plugins {
 
 kotlin {
     js {
-        compilations.all {
+        compilations.configureEach {
-            kotlinOptions {
+            EXPERIMENTAL_ANNOTATIONS.forEach(languageSettings::optIn)
-                freeCompilerArgs = freeCompilerArgs + EXPERIMENTAL_ANNOTATION_COMPILER_ARGS
-            }
         }
         browser {
             testTask {

buildSrc/src/main/kotlin/world/phantasmal/jvm.gradle.kts

@@ -10,12 +10,16 @@ plugins {
 val junitVersion: String by project.extra
 val log4jVersion: String by project.extra
 
+kotlin {
+    sourceSets.configureEach {
+        EXPERIMENTAL_ANNOTATIONS.forEach(languageSettings::optIn)
+    }
+}
+
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs +
+        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
-                EXPERIMENTAL_ANNOTATION_COMPILER_ARGS +
-                "-Xjvm-default=all"
     }
 }
 

buildSrc/src/main/kotlin/world/phantasmal/multiplatform.gradle.kts

@@ -23,16 +23,17 @@ kotlin {
     }
 
     jvm {
-        compilations.all {
+        compilations.configureEach {
             kotlinOptions {
                 jvmTarget = "11"
+                freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
             }
         }
     }
 
     sourceSets {
-        all {
+        configureEach {
-            EXPERIMENTAL_ANNOTATIONS.forEach(languageSettings::useExperimentalAnnotation)
+            EXPERIMENTAL_ANNOTATIONS.forEach(languageSettings::optIn)
         }
 
         commonMain {

psolib/build.gradle.kts

@@ -21,6 +21,10 @@ val serializationVersion: String by project.extra
 
 kotlin {
     sourceSets {
+        all {
+            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        }
+
         commonMain {
             kotlin.setSrcDirs(kotlin.srcDirs + generatedCommonSrc)
             dependencies {

web/assembly-worker/build.gradle.kts

@@ -4,6 +4,10 @@ plugins {
 
 kotlin {
     js {
+        compilations.configureEach {
+            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        }
+
         binaries.executable()
     }
 }

web/assets-generation/build.gradle.kts

@@ -2,6 +2,12 @@ plugins {
     id("world.phantasmal.jvm")
 }
 
+kotlin {
+    sourceSets.configureEach {
+        languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+    }
+}
+
 dependencies {
     implementation(project(":psolib"))
     implementation(project(":web:shared"))

web/build.gradle.kts

@@ -5,6 +5,9 @@ plugins {
 
 kotlin {
     js {
+        compilations.configureEach {
+            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        }
         browser {
             commonWebpackConfig {
                 cssSupport.enabled = true

web/shared/build.gradle.kts

@@ -7,6 +7,9 @@ val serializationVersion: String by project.extra
 
 kotlin {
     sourceSets {
+        configureEach {
+            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        }
         commonMain {
             dependencies {
                 api(project(":psolib"))