From 6a47f7d90bc3283470132fae0e5080368f399bc9 Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ugljesa.jovanovic@ionspin.com>
Date: Thu, 19 May 2022 16:52:27 +0200
Subject: [PATCH] Enable initialization on 32bit android devices

---
 CHANGELOG.md                                               | 5 +++--
 buildSrc/src/main/kotlin/Deps.kt                           | 2 +-
 .../com/ionspin/kotlin/crypto/LibsodiumInitializer.kt      | 7 +------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2cfb4e..570e7f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 (All dates are DD.MM.YYYY)
 
 #### 0.8.6-SNAPSHOT
-- Bump to 1.6.20-RC2
-- Fix for #23
+- Bump to 1.6.21
+- Enable initialization on 32bit Android devices
+- Fix for #23 JS libsodium won't initalize
 - API change chacha20IetfXorIc now takes UInt initial counter parameter
 
 #### 0.8.5 - 5.3.2022
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index 661a28b..5983ed8 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -16,7 +16,7 @@
 
 object Versions {
     val kotlinCoroutines = "1.6.0-native-mt"
-    val kotlin = "1.6.20-RC2"
+    val kotlin = "1.6.21"
     val kotlinSerialization = "1.3.2"
     val kotlinSerializationPlugin = kotlin
     val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build
diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
index c18773d..3a20046 100644
--- a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt
@@ -29,12 +29,7 @@ actual object LibsodiumInitializer {
                 SharedLibraryLoader.get().load("dynamic-msvc-x86-64-libsodium.dll", JnaLibsodiumInterface::class.java)
             }
             Platform.isAndroid() -> {
-                when {
-                    Platform.is64Bit() -> {
-                        File("irrelevant")
-                    }
-                    else -> throw RuntimeException("Unsupported platform")
-                }
+                File("irrelevant")
             }
             else -> throw RuntimeException("Unknown platform")