kotlin 2.1.20

Author: CharlieTap

gradle/libs.versions.toml

@@ -36,7 +36,7 @@ hilt-integrations = "1.2.0"
 
 junit = "4.13.2"
 
-kotlin = "2.1.0"
+kotlin = "2.1.20"
 k-poet = "1.18.1"
 kotlinter = "5.0.1"
 
@@ -48,7 +48,7 @@ kotlinx-io = "0.6.0"
 kotlinx-serialization = "1.8.0"
 kotlinx-test-resources = "0.10.0"
 
-ksp = "2.1.0-1.0.29"
+ksp = "2.1.20-1.0.31"
 
 result = "2.0.1"
 

gradle/plugins/kmp-conventions/src/main/kotlin/kmp-conventions.gradle.kts

@@ -31,7 +31,6 @@ kotlin {
     compilerOptions {
         extraWarnings.set(true)
 
-        freeCompilerArgs.add("-Xjdk-release=" + libs.versions.java.bytecode.version.get().toInt())
         freeCompilerArgs.add("-opt-in=kotlin.ExperimentalUnsignedTypes")
 
         freeCompilerArgs.add("-Xsuppress-warning=NOTHING_TO_INLINE")
@@ -44,6 +43,8 @@ kotlin {
 
     jvm {
         compilerOptions {
+            freeCompilerArgs.add("-Xjdk-release=" + libs.versions.java.bytecode.version.get().toInt())
+
             freeCompilerArgs.add("-Xno-call-assertions")
             freeCompilerArgs.add("-Xno-param-assertions")
             freeCompilerArgs.add("-Xno-receiver-assertions")

memory/build.gradle.kts

@@ -38,5 +38,5 @@ kotlin {
 
 configure<PublishingConventionsExtension> {
     name = "memory"
-    description = "chasms memory instance functionality"
+    description = "a kotlin multiplatform wasm linear memory implementation"
 }

predecoder/src/commonMain/kotlin/io/github/charlietap/chasm/predecoder/LoadFactory.kt

@@ -13,28 +13,28 @@ internal inline fun LoadFactory(
 ): LoadOp {
     return context.loadCache.getOrPut(operand) {
         when (operand) {
-            is FusedOperand.I32Const -> {
-                { operand.const.toLong() }
+            is FusedOperand.I32Const -> { _ ->
+                operand.const.toLong()
             }
-            is FusedOperand.I64Const -> {
-                { operand.const }
+            is FusedOperand.I64Const -> { _ ->
+                operand.const
             }
-            is FusedOperand.F32Const -> {
-                { operand.const.toRawBits().toLong() }
+            is FusedOperand.F32Const -> { _ ->
+                operand.const.toRawBits().toLong()
             }
-            is FusedOperand.F64Const -> {
-                { operand.const.toRawBits() }
+            is FusedOperand.F64Const -> { _ ->
+                operand.const.toRawBits()
             }
             is FusedOperand.GlobalGet -> {
                 val address = context.instance.globalAddress(operand.index).value
                 val global = context.store.global(address);
                 { global.value }
             }
-            is FusedOperand.LocalGet -> {
-                { stack -> stack.getLocal(operand.index.idx) }
+            is FusedOperand.LocalGet -> { stack ->
+                stack.getLocal(operand.index.idx)
             }
-            is FusedOperand.ValueStack -> {
-                { stack -> stack.pop() }
+            is FusedOperand.ValueStack -> { stack ->
+                stack.pop()
             }
         }
     }

predecoder/src/commonMain/kotlin/io/github/charlietap/chasm/predecoder/StoreFactory.kt

@@ -18,11 +18,11 @@ internal inline fun StoreFactory(
                 val global = context.store.global(address);
                 { value, _ -> global.value = value }
             }
-            is FusedDestination.LocalSet -> {
-                { value, stack -> stack.setLocal(destination.index.idx, value) }
+            is FusedDestination.LocalSet -> { value, stack ->
+                stack.setLocal(destination.index.idx, value)
             }
-            FusedDestination.ValueStack -> {
-                { value, stack -> stack.push(value) }
+            FusedDestination.ValueStack -> { value, stack ->
+                stack.push(value)
             }
         }
     }