Merge pull request #38 from ionspin/kotlin-1.9.0

Kotlin 1.9.10
ionspin · Sep 23, 2023 · 4a96c32 · 4a96c32
2 parents 5107382 + c7fbc71
commit 4a96c32
Show file tree

Hide file tree

Showing 25 changed files with 1,234 additions and 2,881 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,27 @@
 ## Descriptive changelog
 (All dates are DD.MM.YYYY)
 
-#### 0.8.9-SNAPSHOT - Current development snapshot
+#### 0.9.1-SNAPSHO - current development snapshot
+
+#### 0.9.0-SNAPSHOT - 23.9.2023
+- Breaking changes: 
+  - PasswordHash.str now returns String 
+  - PasswordHash.strNeedsRehash and PasswordHash.strVerify now take String type for `passwordHash` parameter
+
+- Update to latest stable build of libsodium
+- Update to kotlin 1.9.10
+- Targets deprecated by kotlin 1.9.10 and therefore removed from this library:  
+  - iosArm32
+  - watchosX86
+  - wasm32
+  - mingwX86
+  - linuxArm32Hfp
+
+#### 0.8.9-SNAPSHOT - 26.3.2023
 - Update to latest stable build of libsodium
 - Update to kotlin 1.8.10
 
+
 #### 0.8.8 - 9.10.2022
 - Fix for missing mingw target in published library modules.xml (#29)
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,12 @@
 
 buildscript {
 
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
+        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
+    }
+
     repositories {
         mavenCentral()
         google()

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -28,9 +28,9 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
     implementation("com.android.tools.build:gradle:7.2.2")
-    implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
+    implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.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
@@ -15,16 +15,14 @@
  */
 
 object Versions {
-    val kotlinCoroutines = "1.7.0-Beta"
-    val kotlin = "1.8.10"
-    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
 }