From 3c77cc0698459c00b7d7e9709c09e218d5ac69ac Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Mon, 27 Jul 2020 20:41:25 +0200 Subject: [PATCH] Bump to 1.4.0-rc --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Deps.kt | 27 +++++++------------ .../kotlin/crypto/keyderivation/Sodium.kt | 7 ----- 3 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Sodium.kt diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6870178..6b9af03 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.4-M3") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-rc") } 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 106513c..6a6b215 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -15,15 +15,15 @@ */ object Versions { - val kotlinCoroutines = "1.3.5-native-mt-arm-1.4-M2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build - val kotlin = "1.4-M3" - val kotlinSerialization = "0.20.0-1.4-M3" + val kotlinCoroutines = "1.3.8-1.4.0-rc" + val kotlin = "1.4.0-rc" + val kotlinSerialization = "1.0-M1-1.4.0-rc" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" val dokkaPlugin = "0.11.0-dev-44" val taskTreePlugin = "1.5" - val kotlinBigNumVersion = "0.1.6-1.4-M3-2-SNAPSHOT" + val kotlinBigNumVersion = "0.1.6-1.4.0-rc-SNAPSHOT" val lazySodium = "4.2.6" val jna = "5.5.0" @@ -42,8 +42,7 @@ object Deps { val stdLib = "stdlib-common" val test = "test-common" val testAnnotation = "test-annotations-common" -// val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.kotlinCoroutines}" - val coroutines = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" + val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.kotlinCoroutines}" val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Versions.kotlinSerialization}" val atomicfu = "com.ionspin.kotlin.atomicfu:atomicfu:${Versions.atomicfu}" @@ -56,13 +55,11 @@ object Deps { object Js { val stdLib = "stdlib-js" val test = "test-js" -// val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Versions.kotlinCoroutines}" - val coroutines = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" + val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Versions.kotlinCoroutines}" val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:${Versions.kotlinSerialization}" object Npm { val libsodium = Pair("libsodium-wrappers-sumo", "0.7.6") -// val libsodiumWrappers = Pair("libsodium-wrappers-sumo", "0.7.6") val libsodiumWrappers = Pair("libsodium-wrappers-sumo", "file:${getProjectPath()}/multiplatform-crypto-delegated/libsodium-wrappers-sumo-0.7.6.tgz") } @@ -73,12 +70,10 @@ object Deps { val test = "test" val testJUnit = "test-junit" val reflection = "reflect" -// val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" - val coroutinesCore = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" + val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" val coroutinesjdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${Versions.kotlinCoroutines}" val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.kotlinSerialization}" -// val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}" - val coroutinesTest = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-test:${Versions.kotlinCoroutines}" + val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}" object Delegated { val lazysodium = "com.goterl.lazycode:lazysodium-java:${Versions.lazySodium}" @@ -88,14 +83,12 @@ object Deps { object iOs { val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.kotlinSerialization}" -// val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.kotlinCoroutines}" - val coroutines = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" + val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.kotlinCoroutines}" } object Native { val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.kotlinSerialization}" -// val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.kotlinCoroutines}" - val coroutines = "com.ionspin.kotlin.coroutines:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" + val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.kotlinCoroutines}" } diff --git a/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Sodium.kt b/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Sodium.kt deleted file mode 100644 index 2207add..0000000 --- a/multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Sodium.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.ionspin.kotlin.crypto.keyderivation - -/** - * Created by Ugljesa Jovanovic - * ugljesa.jovanovic@ionspin.com - * on 26-Jul-2020 - */