From 504e8db46b79939be3726f2071f9f60014bf6800 Mon Sep 17 00:00:00 2001
From: kildishevps <epic.rabbit@mail.ru>
Date: Sat, 28 Dec 2024 06:22:08 +0300
Subject: [PATCH] Changed gradle and kotlin versions and made
 LibsodiumInitializer.initializeWithCallback a bit prettier

---
 build.gradle.kts                                     |  2 +-
 buildSrc/src/main/kotlin/Deps.kt                     |  2 +-
 .../build.gradle.kts                                 |  2 +-
 .../com/ionspin/kotlin/crypto/JsSodiumLoader.kt      | 12 ++++--------
 .../ionspin/kotlin/crypto/LibsodiumInitializer.kt    |  2 --
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 903e93b..dc29a2f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@
 buildscript {
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
         classpath("com.android.tools.build:gradle:7.2.2")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
     }
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index 8ff2a7a..5b8d02d 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -16,7 +16,7 @@
 
 object Versions {
     val kotlinCoroutines = "1.8.0"
-    val kotlin = "1.9.23"
+    val kotlin = "2.0.21"
     val kotlinSerialization = "1.6.3"
     val kotlinSerializationPlugin = kotlin
     val taskTreePlugin = "1.5"
diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
index 1d16ecf..d4e2de5 100644
--- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts
+++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
@@ -407,7 +407,7 @@ kotlin {
                         )
                     )
 
-                    compilations.getByName("main") {
+                    this@withType.compilations.getByName("main") {
                         val libsodiumCinterop by cinterops.creating {
                             defFile(projectRef.file("src/nativeInterop/cinterop/libsodium.def"))
                             compilerOpts.add("-I${projectRef.rootDir}/sodiumWrapper/static-arm64/include/")
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 14937b2..7dfa7a4 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
@@ -2,12 +2,7 @@ package ext.libsodium.com.ionspin.kotlin.crypto
 
 import com.ionspin.kotlin.crypto.getSodiumLoaded
 import com.ionspin.kotlin.crypto.sodiumLoaded
-import ext.libsodium._libsodiumPromise
-import ext.libsodium.crypto_generichash
-import ext.libsodium.crypto_hash_sha256
-import ext.libsodium.crypto_hash_sha256_init
-import ext.libsodium.crypto_hash_sha512
-import ext.libsodium.sodium_init
+import ext.libsodium.*
 import kotlin.coroutines.suspendCoroutine
 
 /**
@@ -50,12 +45,13 @@ object JsSodiumLoader {
         }
     }
 
-    fun loadWithCallback(doneCallback: () -> (JsAny)) {
+    fun loadWithCallback(doneCallback: () -> (Unit)) {
         if (!getSodiumLoaded()) {
-            _libsodiumPromise.then<JsAny> {
+            _libsodiumPromise.then<JsAny?> {
                 sodium_init()
                 sodiumLoaded = true
                 doneCallback.invoke()
+                null
             }
         } else {
             doneCallback.invoke()
diff --git a/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt b/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
index 6d63773..aa5254b 100644
--- a/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
@@ -26,8 +26,6 @@ actual object LibsodiumInitializer {
         JsSodiumLoader.loadWithCallback {
             isPlatformInitialized = true
             done()
-            // TODO: there's no return needed!!!
-            "null".toJsString()
         }
     }