diff --git a/CHANGELOG.md b/CHANGELOG.md index a1b0aed..1c2a3ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ #### 0.9.1-SNAPSHOT - current development snapshot - Fix #42, return values from libsodium calls are now checked +- Bump kotlin to 1.9.23 +- Update to latest libsodium +- Update latest MSVC library #### 0.9.0 - 23.9.2023 - Breaking changes: diff --git a/build.gradle.kts b/build.gradle.kts index e6b2015..701a712 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,9 +18,9 @@ buildscript { dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") classpath("com.android.tools.build:gradle:7.2.2") - classpath ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20") + classpath ("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") } repositories { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 21b3436..3d33254 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -28,9 +28,9 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") implementation("com.android.tools.build:gradle:7.2.2") - implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20") + implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") } System.setProperty("PROJECT_PATH", project.projectDir.parentFile.toString()) diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index eac401b..4efa7bb 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -15,9 +15,9 @@ */ object Versions { - val kotlinCoroutines = "1.7.3" - val kotlin = "1.9.10" - val kotlinSerialization = "1.6.0" + val kotlinCoroutines = "1.8.0" + val kotlin = "1.9.23" + val kotlinSerialization = "1.6.3" val kotlinSerializationPlugin = kotlin val taskTreePlugin = "1.5" val kotlinBigNumVersion = "0.3.7" diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/libdynamic-msvc-x86-64-libsodium.dll b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/libdynamic-msvc-x86-64-libsodium.dll index a43e47a..c6cedec 100644 Binary files a/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/libdynamic-msvc-x86-64-libsodium.dll and b/multiplatform-crypto-libsodium-bindings/src/jvmMain/resources/libdynamic-msvc-x86-64-libsodium.dll differ diff --git a/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt b/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt index dacfcb1..5119b58 100644 --- a/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt +++ b/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/LibsodiumInitializer.kt @@ -4,7 +4,7 @@ package com.ionspin.kotlin.crypto import com.ionspin.kotlin.crypto.GeneralLibsodiumException.Companion.ensureLibsodiumSuccess import libsodium.sodium_init -import kotlin.native.concurrent.AtomicInt +import kotlin.concurrent.AtomicInt actual object LibsodiumInitializer { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 578553e..f65e1a9 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -118,20 +118,12 @@ kotlin { } } } - val iosArm32Target = iosArm32() { - binaries { - framework { - baseName = "LibsodiumBindings" - export(Deps.Common.libsodiumBindings) - } - } - } + val macosX64Target = macosX64() val tvosX64Target = tvosX64() val tvosArm64Target = tvosArm64() val watchosArm64Target = watchosArm64() val watchosArm32Target = watchosArm32() - val watchosX86Target = watchosX86() configure(listOf(macosX64Target)) { binaries.executable {} @@ -159,7 +151,6 @@ kotlin { from( iosX64Target.binaries.getFramework(mode), iosArm64Target.binaries.getFramework(mode), - iosArm32Target.binaries.getFramework(mode) ) } } @@ -323,12 +314,7 @@ kotlin { dependsOn(nativeTest) } - val iosArm32Main by getting { - dependsOn(nativeMain) - } - val iosArm32Test by getting { - dependsOn(nativeTest) - } + val macosX64Main by getting { dependsOn(nativeMain)