Updating Wasm

.gitignore

@@ -17,4 +17,6 @@ build/
 
 local.properties
 
-Pods
+Pods
+.kotlin/metadata/
+samples/sample/.kotlin/metadata/

convention-plugins/src/main/kotlin/wasm-setup.gradle.kts

@@ -8,7 +8,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
@@ -42,7 +42,7 @@ kotlin {
             group("jsAndWasmJs") {
                 withJs()
                 if (wasmEnabled) {
-                    withWasm()
+                    withWasmJs()
                 }
             }
         }
@@ -51,7 +51,7 @@ kotlin {
 
 if (project.findProperty("enableWasm") == "true") {
     rootProject.the<NodeJsRootExtension>().apply {
-        nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-        nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+        version = "21.0.0-v8-canary202309143a48826a08"
+        downloadBaseUrl = "https://nodejs.org/download/v8-canary"
     }
 }

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ minSdk = "21"
 compileSdk = "34"
 
 # Dependencies
-kotlin = "1.9.22"
+kotlin = "2.0.21"
 binaryCompatability = "0.13.2"
 
 androidx-core = "1.12.0"

kermit-core/src/jsAndWasmJsMain/kotlin/co/touchlab/kermit/ConsoleWriter.kt

@@ -49,4 +49,9 @@ internal interface ConsoleIntf {
     fun log(output: String)
 }
 
-internal expect object ConsoleActual : ConsoleIntf
+internal expect object ConsoleActual : ConsoleIntf {
+    override fun error(output: String)
+    override fun warn(output: String)
+    override fun info(output: String)
+    override fun log(output: String)
+}

kermit-core/src/jsMain/kotlin/co/touchlab/kermit/Js.ConsoleActual.kt

@@ -11,19 +11,19 @@
 package co.touchlab.kermit
 
 internal actual object ConsoleActual : ConsoleIntf {
-    override fun error(output: String) {
+    actual override fun error(output: String) {
         console.error(output)
     }
 
-    override fun warn(output: String) {
+    actual override fun warn(output: String) {
         console.warn(output)
     }
 
-    override fun info(output: String) {
+    actual override fun info(output: String) {
         console.info(output)
     }
 
-    override fun log(output: String) {
+    actual override fun log(output: String) {
         console.log(output)
     }
 }

kermit-core/src/wasmJsMain/kotlin/co/touchlab/kermit/Wasm.ConsoleActual.kt

@@ -23,19 +23,19 @@ external fun consoleInfo(output: String)
 external fun consoleLog(output: String)
 
 internal actual object ConsoleActual : ConsoleIntf {
-    override fun error(output: String) {
+    actual override fun error(output: String) {
         consoleError(output)
     }
 
-    override fun warn(output: String) {
+    actual override fun warn(output: String) {
         consoleWarn(output)
     }
 
-    override fun info(output: String) {
+    actual override fun info(output: String) {
         consoleInfo(output)
     }
 
-    override fun log(output: String) {
+    actual override fun log(output: String) {
         consoleLog(output)
     }
 }

samples/sample/shared/shared.podspec

@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
         Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
     end
 
+    spec.xcconfig = {
+        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
+    }
+
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':shared',
         'PRODUCT_MODULE_NAME' => 'shared',

samples/sample/wasm-browser/README.md

@@ -6,7 +6,7 @@ A simple app showing Kermit calls directly and through a shared module.
 
 Check out the repo, navigate to the project folder, and use the following command:
 ```
-./gradlew :wasm-browser:wasmBrowserRun
+./gradlew :wasm-browser:wasmJsBrowserRun
 ```
 
 ## Setup Environment