From 2a4059169cd52df935a7d93fb361848c647a4ad6 Mon Sep 17 00:00:00 2001 From: Luca Spinazzola Date: Mon, 13 Feb 2023 21:06:39 -0500 Subject: [PATCH] update to kotlin 1.8.10 --- gradle/libs.versions.toml | 29 ++++++++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlin-js-store/yarn.lock | 7 ------ sample/build.gradle.kts | 10 ++------ secretk/build.gradle.kts | 1 - 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b72281..7c3b6cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,8 @@ com-vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.re [versions] -kotlin = "1.8.0" +kotlin = "1.8.10" +## ⬆ = "1.8.20-Beta" ## ⬆ = "1.8.255-SNAPSHOT" ## ⬆ = "1.9.255-SNAPSHOT" agp = "7.3.1" @@ -34,6 +35,7 @@ agp = "7.3.1" ##⬆ = "7.4.0-rc02" ##⬆ = "7.4.0-rc03" ##⬆ = "7.4.0" +##⬆ = "7.4.1" ##⬆ = "8.0.0-alpha01" ##⬆ = "8.0.0-alpha02" ##⬆ = "8.0.0-alpha03" @@ -46,15 +48,17 @@ agp = "7.3.1" ##⬆ = "8.0.0-alpha10" ##⬆ = "8.0.0-alpha11" ##⬆ = "8.0.0-beta01" +##⬆ = "8.0.0-beta02" ##⬆ = "8.1.0-alpha01" ##⬆ = "8.1.0-alpha02" -vanniktech-publish = "0.23.2" -## ⬆ = "0.23.3-SNAPSHOT" -## ⬆ = "0.24.0-SNAPSHOT" +##⬆ = "8.1.0-alpha03" +##⬆ = "8.1.0-alpha04" +vanniktech-publish = "0.24.0" +## ⬆ = "0.24.1-SNAPSHOT" swift-package = "2.1.1" okio = "3.3.0" ##⬆ = "3.4.0-SNAPSHOT" -ktor = "2.2.2" +ktor = "2.2.3" kotlinx-datetime = "0.4.0" kotlinx-serialization = "1.5.0-RC" kotlinx-coroutines = "1.6.4" @@ -64,21 +68,26 @@ androidx-activity = "1.6.1" ## ⬆ = "1.7.0-alpha02" ## ⬆ = "1.7.0-alpha03" ## ⬆ = "1.7.0-alpha04" +## ⬆ = "1.7.0-beta01" +## ⬆ = "1.8.0-alpha01" androidx-lifecycle = "2.5.1" androidx-startup = "1.1.1" -androidx-appcompat = "1.6.0" +androidx-appcompat = "1.6.1" ## ⬆ = "1.7.0-alpha01" +## ⬆ = "1.7.0-alpha02" kermit = "1.2.2" secretk = "0.1.2" -compose-jb = "1.3.0-rc05" +compose-jb = "1.3.0" ## ⬆ = "1.4.0-alpha01-dev924" +## ⬆ = "1.4.0-alpha01-dev929" +## ⬆ = "1.4.0-alpha01-dev933" bootstrap-compose = "0.1.10" -bignum = "0.3.7" -## ⬆ = "0.3.8-SNAPSHOT" +bignum = "0.3.8" +## ⬆ = "0.3.9-SNAPSHOT" libsodium = "0.8.8" ## ⬆ = "0.8.9-SNAPSHOT" bip39 = "1.0.2-mpp" @@ -88,7 +97,7 @@ ripemd160 = "1.1.3-nativempp" slf4j-simple = "2.0.6" siv-mode = "1.4.4" -kryptools="0.2.0" +kryptools="0.2.1" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..da1db5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 07ee3ad..0a2b83b 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -4718,13 +4718,6 @@ libsodium-wrappers-sumo@0.7.9: dependencies: libsodium-sumo "^0.7.0" -libsodium-wrappers-sumo@^0.7.10: - version "0.7.10" - resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.10.tgz#592b0cc714ddf3954f93e2292ff3aadebd2b282b" - integrity sha512-1noz8Mcl/LUzO/iSO/FJzoJyIaPwxl+/+E4CoTIXtsPiEEXQx2sxalmrVWxteLpynqgX0ASo28ChB9NEVRh0Pg== - dependencies: - libsodium-sumo "^0.7.0" - libsodium-wrappers@^0.7.6: version "0.7.10" resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz#13ced44cacb0fc44d6ac9ce67d725956089ce733" diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index d91c280..c9232e2 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -151,12 +151,6 @@ kotlin { } } -compose { - // workaround for: - // This version of Compose Multiplatform doesn't support Kotlin 1.7.21 - // https://github.com/JetBrains/compose-jb/blob/master/VERSIONING.md#using-jetpack-compose-compiler - kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.0-alpha02") -} compose.desktop { application { @@ -201,9 +195,9 @@ compose.desktop.nativeApplication { } compose { - // workaround to use kotlin 1.8.0 + // workaround to use kotlin 1.8.10 // https://github.com/JetBrains/compose-jb/blob/master/VERSIONING.md#using-jetpack-compose-compiler - kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.0") + kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.2") } // TODO: remove when https://youtrack.jetbrains.com/issue/KT-50778 fixed diff --git a/secretk/build.gradle.kts b/secretk/build.gradle.kts index 311db68..9df2413 100644 --- a/secretk/build.gradle.kts +++ b/secretk/build.gradle.kts @@ -118,7 +118,6 @@ kotlin { implementation(npm("stream-browserify", "^3.0.0")) implementation(npm("os-browserify", "^0.3.0")) implementation(npm("miscreant", "^0.3.2")) - implementation(npm("libsodium-wrappers-sumo", "^0.7.10")) implementation(npm("secretjs", "^1.4.5")) implementation(npm("google-protobuf", "^3.21.0")) implementation(npm("@cosmjs/amino", "^0.29.3"))