Update to Kotlin 2.1.0 and Adjustments for WasmJS API Changes (#980)

kittinunf · Jan 6, 2025 · 1ca2763 · 1ca2763
1 parent bb03909
commit 1ca2763
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 26 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "2.0.21" apply false
+    kotlin("multiplatform") version "2.1.0" apply false
     id("org.jetbrains.kotlinx.kover") version "0.9.0" apply false
 }
 

diff --git a/fuel-kotlinx-serialization/build.gradle.kts b/fuel-kotlinx-serialization/build.gradle.kts
@@ -1,10 +1,9 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "2.0.21"
+    kotlin("plugin.serialization") version "2.1.0"
     id("publication")
     id("org.jetbrains.kotlinx.kover")
 }
@@ -19,11 +18,6 @@ kotlin {
             useJUnit()
         }
     }
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-        binaries.executable()
-    }
     iosArm64 {
         binaries {
             framework {

diff --git a/fuel-moshi-jvm/build.gradle.kts b/fuel-moshi-jvm/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("jvm")
     id("publication")
     id("org.jetbrains.kotlinx.kover")
-    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
+    id("com.google.devtools.ksp") version "2.1.0-1.0.29"
 }
 
 kotlin {

diff --git a/fuel/build.gradle.kts b/fuel/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -18,11 +17,6 @@ kotlin {
             useJUnit()
         }
     }
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-        binaries.executable()
-    }
     iosArm64 {
         binaries {
             framework {
@@ -66,14 +60,6 @@ kotlin {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
-    /*targets.configureEach {
-        compilations.configureEach {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
-            }
-        }
-    }*/
-
     sourceSets {
         commonMain {
             dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-coroutines = "1.9.0"
-jackson = "2.18.2"
+coroutines = "1.10.1"
+jackson = "2.17.2"
 junit = "4.13.2"
 moshi = "1.15.2"
 okhttp = "5.0.0-alpha.14"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ include(":fuel-jackson-jvm")
 include(":fuel-kotlinx-serialization")
 include(":fuel-moshi-jvm")
 
-include(":samples:httpbin-wasm")
+// include(":samples:httpbin-wasm")
 include(":samples:mockbin-native")
 
 pluginManagement {