From 140947e249df3b058cf3b7fd10d7e6ba5bc539da Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Wed, 22 Sep 2021 20:41:05 +0200 Subject: [PATCH] Kotlin to 1.3.51, coroutines and serialization update, libsodium update to latest master --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Deps.kt | 8 ++++---- sodiumWrapper/libsodium | 2 +- sodiumWrapper/makeIosWatchosTvos.sh | 6 +++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 04f0628..204f764 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -28,7 +28,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31") 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 21b3169..5d09a77 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -15,10 +15,10 @@ */ object Versions { - val kotlinCoroutines = "1.5.0-native-mt" - val kotlin = "1.5.21" - val kotlinSerialization = "1.0.1" - val kotlinSerializationPlugin = "1.5.10" + val kotlinCoroutines = "1.5.2-native-mt" + val kotlin = "1.5.31" + val kotlinSerialization = "1.3.0-RC" + val kotlinSerializationPlugin = "1.5.31" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" val dokkaPlugin = "1.5.0" diff --git a/sodiumWrapper/libsodium b/sodiumWrapper/libsodium index 710b2d3..31e0c16 160000 --- a/sodiumWrapper/libsodium +++ b/sodiumWrapper/libsodium @@ -1 +1 @@ -Subproject commit 710b2d3963347017ba73047550d8822e50d3bcec +Subproject commit 31e0c16a16ff1b566d7c0e17c218de1560656d44 diff --git a/sodiumWrapper/makeIosWatchosTvos.sh b/sodiumWrapper/makeIosWatchosTvos.sh index 0741fa3..2053c11 100755 --- a/sodiumWrapper/makeIosWatchosTvos.sh +++ b/sodiumWrapper/makeIosWatchosTvos.sh @@ -7,6 +7,7 @@ mkdir ../static-watchos mkdir ../static-watchos-simulators mkdir ../static-tvos mkdir ../static-tvos-simulators +mkdir ../static-macos cp -R ./libsodium-apple/ios/lib ../static-ios/lib cp -R ./libsodium-apple/ios/include ../static-ios @@ -21,4 +22,7 @@ cp -R ./libsodium-apple/watchos-simulators/include ../static-watchos-simulators cp -R ./libsodium-apple/tvos/lib ../static-tvos/lib cp -R ./libsodium-apple/tvos/include ../static-tvos cp -R ./libsodium-apple/tvos-simulators/lib ../static-tvos-simulators/lib -cp -R ./libsodium-apple/tvos-simulators/include ../static-tvos-simulators \ No newline at end of file +cp -R ./libsodium-apple/tvos-simulators/include ../static-tvos-simulators + +cp -R ./libsodium-apple/macos/lib ../static-macos/lib +cp -R ./libsodium-apple/macos/include ../static-macos