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

Use library loader instead of file loader as it fails when in published jar form

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2021-02-24 17:19:12 +01:00
parent 09be83fcef
commit e30f4f0e86
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ object Versions {
object ReleaseInfo { object ReleaseInfo {
val group = "com.ionspin.kotlin" val group = "com.ionspin.kotlin"
val version = "0.1.0-SNAPSHOT" val version = "0.1.0-SNAPSHOT"
val bindingsVersion = "0.8.2-SNAPSHOT" val bindingsVersion = "0.8.3-SNAPSHOT"
} }
object Deps { object Deps {

7
multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
View File

@ -1,6 +1,7 @@
package com.ionspin.kotlin.crypto package com.ionspin.kotlin.crypto
import co.libly.resourceloader.FileLoader import co.libly.resourceloader.FileLoader
import co.libly.resourceloader.SharedLibraryLoader
import com.sun.jna.Native import com.sun.jna.Native
import com.sun.jna.Platform import com.sun.jna.Platform
import java.io.File import java.io.File
@ -15,13 +16,13 @@ actual object LibsodiumInitializer {
private fun loadLibrary() : JnaLibsodiumInterface { private fun loadLibrary() : JnaLibsodiumInterface {
val libraryFile = when { val libraryFile = when {
Platform.isMac() -> { Platform.isMac() -> {
FileLoader.get().load("dynamic-macos-x86-64.dylib", Any::class.java) SharedLibraryLoader.get().load("dynamic-macos-x86-64.dylib", JnaLibsodiumInterface::class.java)
} }
Platform.isLinux() -> { Platform.isLinux() -> {
FileLoader.get().load("dynamic-linux-x86-64-libsodium.so", Any::class.java) SharedLibraryLoader.get().load("dynamic-linux-x86-64-libsodium.so", JnaLibsodiumInterface::class.java)
} }
Platform.isWindows() -> { Platform.isWindows() -> {
FileLoader.get().load("dynamic-msvc-x86-64-libsodium.dll", Any::class.java) SharedLibraryLoader.get().load("dynamic-msvc-x86-64-libsodium.dll", JnaLibsodiumInterface::class.java)
} }
Platform.isAndroid() -> { Platform.isAndroid() -> {
when { when {