diff --git a/CHANGELOG.md b/CHANGELOG.md index 86dd64d..2dbf196 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ ## Descriptive changelog (All dates are DD.MM.YYYY) -#### 0.8.3-SNAPSHOT +#### 0.8.4-SNAPSHOT + +#### 0.8.3 - 28.5.2021 +- Built with kotlin 1.5.10 - Fixed loading but not initializing libsodium on js and jvm - Changed subkey id to UInt from Int, limited by JS api - Updated libsodium to latest master 710b2d3963347017ba (potentially will be switched to stable branch) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 32b00a0..b6a536a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10") implementation("com.android.tools.build:gradle:4.0.2") } diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index 57d6bc4..4e7934a 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -15,10 +15,10 @@ */ object Versions { - val kotlinCoroutines = "1.4.2" - val kotlin = "1.4.30" + val kotlinCoroutines = "1.5.0-native-mt" + val kotlin = "1.5.10" val kotlinSerialization = "1.0.1" - val kotlinSerializationPlugin = "1.4.10" + val kotlinSerializationPlugin = "1.5.10" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" val dokkaPlugin = "1.4.0-rc" @@ -41,7 +41,7 @@ object Versions { object ReleaseInfo { val group = "com.ionspin.kotlin" val version = "0.1.0-SNAPSHOT" - val bindingsVersion = "0.8.3-SNAPSHOT" + val bindingsVersion = "0.8.4-SNAPSHOT" } object Deps { diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts index e7f3beb..fcc6657 100644 --- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts +++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts @@ -708,7 +708,7 @@ publishing { artifact(tasks["javadocJar"]) pom { name.set("Kotlin Multiplatform Crypto") - description.set("Kotlin Multiplatform Crypto library") + description.set("Kotlin Multiplatform Libsodium Wrapper") url.set("https://github.com/ionspin/kotlin-multiplatform-crypto") licenses { license { @@ -724,9 +724,9 @@ publishing { } } scm { - url.set("https://github.com/ionspin/kotlin-multiplatform-crypto") - connection.set("scm:git:git://git@github.com:ionspin/kotlin-multiplatform-crypto.git") - developerConnection.set("scm:git:ssh://git@github.com:ionspin/kotlin-multiplatform-crypto.git") + url.set("https://github.com/ionspin/kotlin-multiplatform-libsodium") + connection.set("scm:git:git://git@github.com:ionspin/kotlin-multiplatform-libsodium.git") + developerConnection.set("scm:git:ssh://git@github.com:ionspin/kotlin-multiplatform-libsodium.git") } diff --git a/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com.ionspin.kotlin.crypto/util/Util.kt b/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com.ionspin.kotlin.crypto/util/Util.kt index 79a4387..32ad60a 100644 --- a/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com.ionspin.kotlin.crypto/util/Util.kt +++ b/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com.ionspin.kotlin.crypto/util/Util.kt @@ -9,11 +9,11 @@ fun String.hexStringToUByteArray() : UByteArray { return this.chunked(2).map { it.toUByte(16) }.toUByteArray() } - fun String.encodeToUByteArray() : UByteArray{ +fun String.encodeToUByteArray() : UByteArray{ return encodeToByteArray().asUByteArray() } - fun UByteArray.decodeFromUByteArray() : String { +fun UByteArray.decodeFromUByteArray() : String { return asByteArray().decodeToString() } diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-arm64-libsodium.so b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-arm64-libsodium.so index cd050c9..9b3ad8c 100755 Binary files a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-arm64-libsodium.so and b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-arm64-libsodium.so differ diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-x86-64-libsodium.so b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-x86-64-libsodium.so index 041b6e4..32662be 100755 Binary files a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-x86-64-libsodium.so and b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-linux-x86-64-libsodium.so differ diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-macos-x86-64.dylib b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-macos-x86-64.dylib index 2557c8a..2d112b5 100755 Binary files a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-macos-x86-64.dylib and b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-macos-x86-64.dylib differ diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-mingw-x86-64-libsodium.dll.a b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-mingw-x86-64-libsodium.dll.a index bbbdd72..51d8d78 100644 Binary files a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-mingw-x86-64-libsodium.dll.a and b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/dynamic-mingw-x86-64-libsodium.dll.a differ