YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changed gradle and kotlin versions and made LibsodiumInitializer.initializeWithCallback a bit prettier

Browse Source
This commit is contained in:
kildishevps 2024-12-28 06:22:08 +03:00
parent 59f2d77890
commit 504e8db46b
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -18,7 +18,7 @@
buildscript { buildscript {
dependencies { 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("com.android.tools.build:gradle:7.2.2")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
} }

2
buildSrc/src/main/kotlin/Deps.kt
View File

@ -16,7 +16,7 @@
object Versions { object Versions {
val kotlinCoroutines = "1.8.0" val kotlinCoroutines = "1.8.0"
val kotlin = "1.9.23" val kotlin = "2.0.21"
val kotlinSerialization = "1.6.3" val kotlinSerialization = "1.6.3"
val kotlinSerializationPlugin = kotlin val kotlinSerializationPlugin = kotlin
val taskTreePlugin = "1.5" val taskTreePlugin = "1.5"

2
multiplatform-crypto-libsodium-bindings/build.gradle.kts
View File

@ -407,7 +407,7 @@ kotlin {
) )
) )
compilations.getByName("main") { this@withType.compilations.getByName("main") {
val libsodiumCinterop by cinterops.creating { val libsodiumCinterop by cinterops.creating {
defFile(projectRef.file("src/nativeInterop/cinterop/libsodium.def")) defFile(projectRef.file("src/nativeInterop/cinterop/libsodium.def"))
compilerOpts.add("-I${projectRef.rootDir}/sodiumWrapper/static-arm64/include/") compilerOpts.add("-I${projectRef.rootDir}/sodiumWrapper/static-arm64/include/")

12
multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumLoader.kt
View File

@ -2,12 +2,7 @@ package ext.libsodium.com.ionspin.kotlin.crypto
import com.ionspin.kotlin.crypto.getSodiumLoaded import com.ionspin.kotlin.crypto.getSodiumLoaded
import com.ionspin.kotlin.crypto.sodiumLoaded import com.ionspin.kotlin.crypto.sodiumLoaded
import ext.libsodium._libsodiumPromise import ext.libsodium.*
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 kotlin.coroutines.suspendCoroutine import kotlin.coroutines.suspendCoroutine
/** /**
@ -50,12 +45,13 @@ object JsSodiumLoader {
} }
} }
fun loadWithCallback(doneCallback: () -> (JsAny)) { fun loadWithCallback(doneCallback: () -> (Unit)) {
if (!getSodiumLoaded()) { if (!getSodiumLoaded()) {
_libsodiumPromise.then<JsAny> { _libsodiumPromise.then<JsAny?> {
sodium_init() sodium_init()
sodiumLoaded = true sodiumLoaded = true
doneCallback.invoke() doneCallback.invoke()
null
} }
} else { } else {
doneCallback.invoke() doneCallback.invoke()

2
multiplatform-crypto-libsodium-bindings/src/wasmJsMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
View File

@ -26,8 +26,6 @@ actual object LibsodiumInitializer {
JsSodiumLoader.loadWithCallback { JsSodiumLoader.loadWithCallback {
isPlatformInitialized = true isPlatformInitialized = true
done() done()
// TODO: there's no return needed!!!
"null".toJsString()
} }
} }