Update kotlin to 1.9.10, update library versions, use latest libsodium stable, clean up Deps, remove deprecated targets, change PasswordHash str related functions to use String

This commit is contained in:
Ugljesa Jovanovic committed 2023-09-23 11:54:02 +02:00
1 parent b32821e13e
commit 194994f5b2
14 files changed
+76 -123

No files matched your search

+7 -28
View File
@@ -15,16 +15,14 @@
*/
object Versions {
val kotlinCoroutines = "1.7.0-Beta"
val kotlin = "1.9.0"
val kotlinSerialization = "1.5.0"
val kotlinCoroutines = "1.7.3"
val kotlin = "1.9.10"
val kotlinSerialization = "1.6.0"
val kotlinSerializationPlugin = kotlin
val nodePlugin = "1.3.0"
val dokkaPlugin = kotlin
val taskTreePlugin = "1.5"
val kotlinBigNumVersion = "0.3.7"
val jna = "5.13.0"
val kotlinPoet = "1.6.0"
val sampleLibsodiumBindings = "0.8.8-SNAPSHOT"
val ktor = "1.3.2"
val timber = "4.7.1"
@@ -61,27 +59,14 @@ object Deps {
object Js {
object JsVersions {
val react = "17.0.2-pre.218-kotlin-1.5.21"
val reactNpm = "17.0.2"
val styled = "5.3.0-pre.218-kotlin-1.5.21"
val styledNpm = "5.3.0"
}
val stdLib = "stdlib-js"
val test = "test-js"
val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Versions.kotlinCoroutines}"
val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:${Versions.kotlinSerialization}"
val ktorClient = "io.ktor:ktor-client-js:${Versions.ktor}"
val ktorClientSerialization = "io.ktor:ktor-client-serialization-js:${Versions.ktor}"
val ktorClientWebSockets = "io.ktor:ktor-client-websockets-js:${Versions.ktor}"
object Npm {
val libsodium = Pair("libsodium-wrappers-sumo", "0.7.9")
//val libsodiumWrappers = Pair("libsodium-wrappers-sumo", "file:${getProjectPath()}/multiplatform-crypto-delegated/libsodium-wrappers-sumo-0.7.6.tgz")
val libsodiumWrappers = Pair("libsodium-wrappers-sumo", "0.7.9")
val libsodiumWrappers = Pair("libsodium-wrappers-sumo", "0.7.13")
}
@@ -92,13 +77,10 @@ object Deps {
val test = "test"
val testJUnit = "test-junit"
val reflection = "reflect"
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 kotlinPoet = "com.squareup:kotlinpoet:${Versions.kotlinPoet}"
val resourceLoader = "com.goterl:resource-loader:${Versions.resourceLoader}"
object Delegated {
@@ -119,9 +101,7 @@ object Deps {
object Android {
val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinCoroutines}"
val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:${Versions.ktor}"
val ktorClient = "io.ktor:ktor-client-android:${Versions.ktor}"
val ktorClientSerialization = "io.ktor:ktor-client-serialization-jvm:${Versions.ktor}"
val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.kotlinSerialization}"
val timber = "com.jakewharton.timber:timber:${Versions.timber}"
val jna = "net.java.dev.jna:jna:${Versions.jna}@aar"
@@ -135,7 +115,6 @@ object Deps {
object AndroidPluginConfiguration {
val sdkVersion = 31
val targetVersion = 31
val minVersion = 24
}