From f6f5e879cbd89af2699e84d92d9a589e92980b8a Mon Sep 17 00:00:00 2001 From: Krzysztof <6444719+krizzu@users.noreply.github.com> Date: Tue, 7 May 2024 11:54:52 +0200 Subject: [PATCH 1/5] bump kotlin, kps, coroutines --- packages/default-storage/android/config.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/default-storage/android/config.gradle b/packages/default-storage/android/config.gradle index c8971b72..da2388e4 100644 --- a/packages/default-storage/android/config.gradle +++ b/packages/default-storage/android/config.gradle @@ -1,7 +1,7 @@ import java.nio.file.Paths -def DEFAULT_KOTLIN_VERSION = "1.9.20" -def DEFAULT_ROOM_VERSION = "2.4.3" +def DEFAULT_KOTLIN_VERSION = "1.9.23" +def DEFAULT_ROOM_VERSION = "2.6.1" def kotlinVersion = getKotlinVersion(DEFAULT_KOTLIN_VERSION) @@ -19,8 +19,8 @@ project.ext.AsyncStorageConfig = [ ] project.ext.AsyncStorageLibs = [ - coroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3", - testCoroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3", + coroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0", + testCoroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0", testJunit : "junit:junit:4.13.2", testRunner : "androidx.test:runner:1.4.0", testRules : "androidx.test:rules:1.4.0", @@ -54,6 +54,9 @@ String getKspVersion(String kotlinVersion) { } // https://github.com/google/ksp/releases def kspVersions = [ + "1.9.23-1.0.20", + "1.9.22-1.0.17", + "1.9.21-1.0.16", "1.9.20-1.0.14", "1.9.10-1.0.13", "1.9.0-1.0.13", From 69b921299bfaa39b340156e5b944835a6965f223 Mon Sep 17 00:00:00 2001 From: Krzysztof <6444719+krizzu@users.noreply.github.com> Date: Tue, 7 May 2024 11:57:12 +0200 Subject: [PATCH 2/5] docs --- packages/website/docs/advanced/Next.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/website/docs/advanced/Next.md b/packages/website/docs/advanced/Next.md index 2df18e66..fbb60a42 100644 --- a/packages/website/docs/advanced/Next.md +++ b/packages/website/docs/advanced/Next.md @@ -47,28 +47,28 @@ AsyncStorage_useNextStorage=true **Kotlin version** -Next storage is tested against Kotlin version `1.9.20`. +Next storage is tested against Kotlin version `1.9.23`. You can specify different version, in one of two ways: - add `kotlinVersion` extension to the `rootProject`: ```groovy -rootProject.ext.kotlinVersion = '1.9.20' +rootProject.ext.kotlinVersion = '1.9.23' ``` - specify `AsyncStorage_kotlinVersion` in `gradle.properties`: ```groovy -AsyncStorage_kotlinVersion=1.9.20 +AsyncStorage_kotlinVersion=1.9.23 ``` **Room** Next AsyncStorage uses [Room persistence library](https://developer.android.com/jetpack/androidx/releases/room) to store data. -Currently, tested version is `2.4.3`. You can specify different version, by adding a flag to `gradle.properties`: +Currently, tested version is `2.6.1`. You can specify different version, by adding a flag to `gradle.properties`: ```groovy -AsyncStorage_next_roomVersion=2.4.3 +AsyncStorage_next_roomVersion=2.6.1 ``` KSP is enabled for symbol processing for the Room library. @@ -76,7 +76,7 @@ KSP version will be selected based on Kotlin version in your project. If you want to use different KSP version, you can set a property in `gradle.properties`: ```groovy -AsyncStorage_next_kspVersion=1.9.20-1.0.14 +AsyncStorage_next_kspVersion=1.9.23-1.0.20 ``` ### Notable changes From b6ebe56fb2148baced2fb8baec55e841c8e8ee15 Mon Sep 17 00:00:00 2001 From: Krzysztof <6444719+krizzu@users.noreply.github.com> Date: Tue, 7 May 2024 15:03:53 +0200 Subject: [PATCH 3/5] bump test-app --- .../example/android/gradle.properties | 2 +- yarn.lock | 54 +++++++++++++++++-- 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/packages/default-storage/example/android/gradle.properties b/packages/default-storage/example/android/gradle.properties index e6d7cf68..4111066d 100644 --- a/packages/default-storage/example/android/gradle.properties +++ b/packages/default-storage/example/android/gradle.properties @@ -50,7 +50,7 @@ newArchEnabled=true #ANDROID_NDK_VERSION=26.1.10909125 # Version of Kotlin to build against. -KOTLIN_VERSION=1.9.20 +KOTLIN_VERSION=1.9.23 # This is an example of how you can change default DB size (6MB) to 10MB #AsyncStorage_db_size_in_MB=10 diff --git a/yarn.lock b/yarn.lock index acda4dec..64e9b4d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10878,7 +10878,7 @@ __metadata: languageName: node linkType: hard -"envinfo@npm:^7.10.0, envinfo@npm:^7.5.0, envinfo@npm:^7.8.1": +"envinfo@npm:^7.10.0": version: 7.13.0 resolution: "envinfo@npm:7.13.0" bin: @@ -10887,6 +10887,15 @@ __metadata: languageName: node linkType: hard +"envinfo@npm:^7.5.0, envinfo@npm:^7.8.1": + version: 7.8.1 + resolution: "envinfo@npm:7.8.1" + bin: + envinfo: dist/cli.js + checksum: 10c0/01efe7fcf55d4b84a146bc638ef89a89a70b610957db64636ac7cc4247d627eeb1c808ed79d3cfbe3d4fed5e8ba3d61db79c1ca1a3fea9f38639561eefd68733 + languageName: node + linkType: hard + "eol@npm:^0.9.1": version: 0.9.1 resolution: "eol@npm:0.9.1" @@ -21149,7 +21158,20 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2": +"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.3.2": + version: 1.22.4 + resolution: "resolve@npm:1.22.4" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/b1adb7885a05e31fc2be19e85e338b8d48d9e442b568d91e9c925990ed1c3bff66683ccea03b9e9893b857ec25dee0f7951a0d0630be49e4e1f5c1150ddc35dc + languageName: node + linkType: hard + +"resolve@npm:^1.22.1": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -21184,7 +21206,20 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.13.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.13.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": + version: 1.22.4 + resolution: "resolve@patch:resolve@npm%3A1.22.4#optional!builtin::version=1.22.4&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/60ca179599acf8b1bb17b850280a7081781b457d235d48197dc893b82d75741f191c5fe2d93e5729292234d0b0d88e9add273df4b9e04755eeed4fd7d23f1c79 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.22.1#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -21674,7 +21709,18 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": + version: 7.6.0 + resolution: "semver@npm:7.6.0" + dependencies: + lru-cache: "npm:^6.0.0" + bin: + semver: bin/semver.js + checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53 + languageName: node + linkType: hard + +"semver@npm:^7.5.1": version: 7.6.2 resolution: "semver@npm:7.6.2" bin: From 1091dcd03b3951048f5f55de0f711c48581babc3 Mon Sep 17 00:00:00 2001 From: Krzysztof Borowy <6444719+krizzu@users.noreply.github.com> Date: Tue, 14 May 2024 10:05:07 +0200 Subject: [PATCH 4/5] bump kotlin --- packages/default-storage/android/config.gradle | 3 ++- packages/website/docs/advanced/Next.md | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/default-storage/android/config.gradle b/packages/default-storage/android/config.gradle index da2388e4..33147eb6 100644 --- a/packages/default-storage/android/config.gradle +++ b/packages/default-storage/android/config.gradle @@ -1,6 +1,6 @@ import java.nio.file.Paths -def DEFAULT_KOTLIN_VERSION = "1.9.23" +def DEFAULT_KOTLIN_VERSION = "1.9.24" def DEFAULT_ROOM_VERSION = "2.6.1" def kotlinVersion = getKotlinVersion(DEFAULT_KOTLIN_VERSION) @@ -54,6 +54,7 @@ String getKspVersion(String kotlinVersion) { } // https://github.com/google/ksp/releases def kspVersions = [ + "1.9.24-1.0.20", "1.9.23-1.0.20", "1.9.22-1.0.17", "1.9.21-1.0.16", diff --git a/packages/website/docs/advanced/Next.md b/packages/website/docs/advanced/Next.md index fbb60a42..fbad5418 100644 --- a/packages/website/docs/advanced/Next.md +++ b/packages/website/docs/advanced/Next.md @@ -47,19 +47,19 @@ AsyncStorage_useNextStorage=true **Kotlin version** -Next storage is tested against Kotlin version `1.9.23`. +Next storage is tested against Kotlin version `1.9.24`. You can specify different version, in one of two ways: - add `kotlinVersion` extension to the `rootProject`: ```groovy -rootProject.ext.kotlinVersion = '1.9.23' +rootProject.ext.kotlinVersion = '1.9.24' ``` - specify `AsyncStorage_kotlinVersion` in `gradle.properties`: ```groovy -AsyncStorage_kotlinVersion=1.9.23 +AsyncStorage_kotlinVersion=1.9.24 ``` **Room** @@ -76,7 +76,7 @@ KSP version will be selected based on Kotlin version in your project. If you want to use different KSP version, you can set a property in `gradle.properties`: ```groovy -AsyncStorage_next_kspVersion=1.9.23-1.0.20 +AsyncStorage_next_kspVersion=1.9.24-1.0.20 ``` ### Notable changes From 13f40cee3c89d93b01149798828e877d6cc73949 Mon Sep 17 00:00:00 2001 From: Krzysztof <6444719+krizzu@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:35:11 +0200 Subject: [PATCH 5/5] dedupe --- .../example/android/gradle.properties | 2 +- yarn.lock | 54 ++----------------- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/packages/default-storage/example/android/gradle.properties b/packages/default-storage/example/android/gradle.properties index 4111066d..8f2be824 100644 --- a/packages/default-storage/example/android/gradle.properties +++ b/packages/default-storage/example/android/gradle.properties @@ -50,7 +50,7 @@ newArchEnabled=true #ANDROID_NDK_VERSION=26.1.10909125 # Version of Kotlin to build against. -KOTLIN_VERSION=1.9.23 +KOTLIN_VERSION=1.9.24 # This is an example of how you can change default DB size (6MB) to 10MB #AsyncStorage_db_size_in_MB=10 diff --git a/yarn.lock b/yarn.lock index 64e9b4d1..acda4dec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10878,7 +10878,7 @@ __metadata: languageName: node linkType: hard -"envinfo@npm:^7.10.0": +"envinfo@npm:^7.10.0, envinfo@npm:^7.5.0, envinfo@npm:^7.8.1": version: 7.13.0 resolution: "envinfo@npm:7.13.0" bin: @@ -10887,15 +10887,6 @@ __metadata: languageName: node linkType: hard -"envinfo@npm:^7.5.0, envinfo@npm:^7.8.1": - version: 7.8.1 - resolution: "envinfo@npm:7.8.1" - bin: - envinfo: dist/cli.js - checksum: 10c0/01efe7fcf55d4b84a146bc638ef89a89a70b610957db64636ac7cc4247d627eeb1c808ed79d3cfbe3d4fed5e8ba3d61db79c1ca1a3fea9f38639561eefd68733 - languageName: node - linkType: hard - "eol@npm:^0.9.1": version: 0.9.1 resolution: "eol@npm:0.9.1" @@ -21158,20 +21149,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.3.2": - version: 1.22.4 - resolution: "resolve@npm:1.22.4" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/b1adb7885a05e31fc2be19e85e338b8d48d9e442b568d91e9c925990ed1c3bff66683ccea03b9e9893b857ec25dee0f7951a0d0630be49e4e1f5c1150ddc35dc - languageName: node - linkType: hard - -"resolve@npm:^1.22.1": +"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -21206,20 +21184,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.13.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": - version: 1.22.4 - resolution: "resolve@patch:resolve@npm%3A1.22.4#optional!builtin::version=1.22.4&hash=c3c19d" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/60ca179599acf8b1bb17b850280a7081781b457d235d48197dc893b82d75741f191c5fe2d93e5729292234d0b0d88e9add273df4b9e04755eeed4fd7d23f1c79 - languageName: node - linkType: hard - -"resolve@patch:resolve@npm%3A^1.22.1#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.13.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -21709,18 +21674,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": - version: 7.6.0 - resolution: "semver@npm:7.6.0" - dependencies: - lru-cache: "npm:^6.0.0" - bin: - semver: bin/semver.js - checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53 - languageName: node - linkType: hard - -"semver@npm:^7.5.1": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.6.2 resolution: "semver@npm:7.6.2" bin: