From c6946c90b46037bfb6d65eaf48356738f4e8aebd Mon Sep 17 00:00:00 2001
From: kildishevps <epic.rabbit@mail.ru>
Date: Sun, 29 Dec 2024 17:41:29 +0300
Subject: [PATCH] Fixed Throable cast error and changed gradle version in one
 more place

---
 buildSrc/build.gradle.kts                                     | 2 +-
 multiplatform-crypto-api/build.gradle.kts                     | 2 +-
 multiplatform-crypto-libsodium-bindings/build.gradle.kts      | 2 +-
 .../kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt        | 4 ++--
 sample/build.gradle.kts                                       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3d33254..1ea0a09 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
     implementation("com.android.tools.build:gradle:7.2.2")
     implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
 }
diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts
index 39cb7ce..423c93a 100644
--- a/multiplatform-crypto-api/build.gradle.kts
+++ b/multiplatform-crypto-api/build.gradle.kts
@@ -17,7 +17,7 @@
 
 @file:Suppress("UnstableApiUsage")
 
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
 plugins {
diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
index d4e2de5..399e413 100644
--- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts
+++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
@@ -18,8 +18,8 @@
 @file:Suppress("UnstableApiUsage")
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
diff --git a/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt b/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt
index 7dfa7a4..a96f2d4 100644
--- a/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt
@@ -32,11 +32,11 @@ object JsSodiumLoader {
                 continuation.resumeWith(Result.success(Unit))
                 null
             }.catch { e ->
-                val throwable = e as? Throwable
+                val throwable = e.toThrowableOrNull()
                 if (throwable != null) {
                     continuation.resumeWith(Result.failure(throwable))
                 } else {
-                    continuation.resumeWith(Result.failure(Exception("Error: $e")))
+                    continuation.resumeWith(Result.failure(Throwable("Unknown error", throwable)))
                 }
                 null
             }
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index cc0d7a8..1eefd25 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -18,7 +18,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 import org.jetbrains.kotlin.gradle.tasks.FatFrameworkTask