Merge pull request #104 from qiaoyuang/main

qiaoyuang · web-flow · commit 3aaedad7ec27 · 2025-04-24T20:58:12.000+01:00
Update version to 1.4.2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -80,7 +80,7 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 12694320
+          emulator-build: 13373845
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -93,7 +93,7 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 12694320
+          emulator-build: 13373845
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -122,7 +122,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -182,7 +182,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -239,7 +239,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 12694320
+          emulator-build: 13373845
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -252,7 +252,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 12694320
+          emulator-build: 13373845
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -95,7 +95,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,25 @@
 # SQLlin Change Log
 
 - Date format: YYYY-MM-dd
-- 
-## v1.4.2 / 2025-xx-xx
+
+## v1.4.2 / 2025-04-23
+
+### All
+
+* Update `Kotlin`'s version to `2.1.20`
+
+### sqllin-dsl
+
+* Update `kotlinx.coroutines`'s version to `1.10.2`
+* Update `kotlinx.serialization`'s version to `1.8.1`
 
 ### sqllin-driver
 
-* Update the `sqlite-jdbc`'s version to `3.49.0.0`
+* Update the `sqlite-jdbc`'s version to `3.49.1.0`
+
+### sqllin-processor
+
+* Update `KSP`'s version to `2.1.20-1.0.32`
 
 ## v1.4.1 / 2025-02-04
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION=1.4.1
+VERSION=1.4.2
 GROUP=com.ctrip.kotlin
 
 #Maven Publish Information
@@ -27,5 +27,5 @@ kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.natvie.increment=true
-#ksp.useKSP2=true
+kotlin.jvm.target.validation.mode=warning
 #kotlin.compiler.execution.strategy=out-of-process
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,15 @@
 [versions]
 
-kotlin = "2.1.10"
-agp = "8.7.3"
-ksp = "2.1.10-1.0.29"
-serialization = "1.8.0"
-coroutines = "1.10.1"
+kotlin = "2.1.20"
+agp = "8.9.2"
+ksp = "2.1.20-1.0.32"
+serialization = "1.8.1"
+coroutines = "1.10.2"
 androidx-annotation = "1.9.1"
 androidx-test = "1.6.1"
 androidx-test-runner = "1.6.2"
-sqlite-jdbc = "3.49.0.0"
+sqlite-jdbc = "3.49.1.0"
+desugar-jdk-libs = "2.1.5"
 
 [libraries]
 
@@ -24,6 +25,8 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "
 
 sqlite-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite-jdbc" }
 
+desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
+
 [plugins]
 
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Mar 08 15:11:46 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 version = "1.0"
 
 kotlin {
+    jvmToolchain(21)
     androidTarget {
         publishLibraryVariants("release")
     }
@@ -47,12 +48,12 @@ android {
         minSdk = 23
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_21
+        isCoreLibraryDesugaringEnabled = true
     }
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
     add("kspCommonMainMetadata", project(":sqllin-processor"))
 }
 
diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts
@@ -20,6 +20,7 @@ version = VERSION
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     explicitApi()
+    jvmToolchain(21)
     androidTarget {
         publishLibraryVariants("release")
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -106,8 +107,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_21
+        isCoreLibraryDesugaringEnabled = true
     }
 }
 
@@ -125,6 +125,10 @@ fun KotlinNativeTarget.setupNativeConfig() {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+}
+
 val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
 }
diff --git a/sqllin-dsl/build.gradle.kts b/sqllin-dsl/build.gradle.kts
@@ -23,6 +23,7 @@ version = VERSION
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     explicitApi()
+    jvmToolchain(21)
     androidTarget {
         publishLibraryVariants("release")
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -171,8 +172,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_21
+        isCoreLibraryDesugaringEnabled = true
     }
 }
 
@@ -189,6 +189,7 @@ fun KotlinNativeTarget.setupNativeConfig() {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
     val sourceSets = listOf(
         "kspAndroidAndroidTest",
 
diff --git a/sqllin-dsl/doc/concurrency-safety-cn.md b/sqllin-dsl/doc/concurrency-safety-cn.md
@@ -1,15 +1,15 @@
 # 并发安全
 
 在 `1.2.2` 版本之前， _sqllin-dsl_ 无法保证并发安全。如果你想在不同的线程中共享同一个 `Database`
-对象，这可能会导致不可预测的结果。所以最佳的方式是：当你想要操作你的数据库时，创建一个 `Database`
-对象，当你结束的你的操作时，立即关闭它。
+实例，这可能会导致不可预测的结果。所以最佳的方式是：当你想要操作数据库时，创建一个 `Database`
+实例，而当你结束操作时立即关闭它。
 
-但是这非常不方便，我们总是必须频繁地创建数据库连接并关闭它，这是一种对资源的浪费。举例来说，
+但是这非常不方便，我们总是必须频繁地创建数据库连接并关闭，是一种对资源的浪费。举例来说，
 如果我们正在开发一款 Android app，并且在单个页面中（Activity/Fragment），我们希望我们可以持有一个
-`Database` 对象，当我们想要在后台线程（或协程）中操作数据库时，直接使用它，并在某些生命周期函数内关闭它
+`Database` 实例，当我们想要在后台线程（或协程）中操作数据库时直接使用它，并在某些生命周期函数内将它关闭
 （`onDestroy`、`onStop` 等等）。
 
-这种情况下，当我们在不同线程（或协程）中共享 `Database` 对象时，我们应该确保并发安全。所以，从 `1.2.2`
+这种情况下，当我们在不同线程（或协程）中共享 `Database` 实例时，我们应该确保并发安全。所以，从 `1.2.2`
 版本开始，我们可以使用新 API `Database#suspendedScope` 来代替旧的 `database {}` 用法。比如说，如果我们有如下旧代码：
 
 ```kotlin
@@ -26,7 +26,7 @@ fun sample() {
     }
 }
 ```
-我们使用新 API `Database#suspendedScope` 来代替旧的 `database {}` 后，将会是这样：
+我们使用新 API `Database#suspendedScope` 来代替旧 `database {}` 后，将会是这样：
 
 ```kotlin
 fun sample() {
@@ -42,8 +42,8 @@ fun sample() {
     }
 }
 ```
-`suspendedScope` 是一个挂起函数。在 `suspendedScope` 内部，所有的操作都是原子性的。这意味着：如果你共享了同一个
-`Database` 对象到不同的协程中，它可以保证后执行的 `suspendedScope` 会等待先执行的 `suspendedScope` 执行完成。
+`suspendedScope` 是一个挂起函数。在 `suspendedScope` 内部所有的操作都是原子性的。这意味着：如果你共享了同一个
+`Database` 实例到不同的协程中，它可以保证后执行的 `suspendedScope` 会等待先执行的 `suspendedScope` 执行完成。
 
 ## 接下来
 
diff --git a/sqllin-dsl/doc/concurrency-safety.md b/sqllin-dsl/doc/concurrency-safety.md
@@ -1,19 +1,19 @@
 # Concurrency Safety
 
 Before the version `1.2.2`, _sqllin-dsl_ can't ensure the concurrency safety. If
-you want to share a `Database` object between different threads, that would lead to
+you want to share a `Database` instance between different threads, that would lead to
 unpredictable consequences. So, the best way is when you want to operate your
-database, create a `Database` object, and when you finish your operating, close it immediately.
+database, create a `Database` instance, and when you finish your operating, close it immediately.
 
 But, that's very inconvenient, we always have to create a database connection and
 close it frequently, this is a waste of resources. For example, if we are developing
 an Android app, and in a single page (Activity/Fragment), we hope we can keep a
-`Database` object, when we want to operate the database in background threads (or
+`Database` instance, when we want to operate the database in background threads (or
 coroutines), just use it, and, close it in certain lifecycle
 functions (`onDestroy`, `onStop`, etc.).
 
 At that time, we should make sure the concurrency safety that we share the `Database`
-object between different threads (or coroutines). So, start with the version `1.2.2`, we can
+instance between different threads (or coroutines). So, start with the version `1.2.2`, we can
 use the new API `Database#suspendedScope` to replace the usage of `database {}`. For
 example, if we have some old code:
 
@@ -49,7 +49,7 @@ fun sample() {
 ```
 
 The `suspendedScope` is a suspend function. Inside the `suspendedScope`, the all operations are
-atomic. That means: If you share the same `Database` object between two coroutines, it can ensure the
+atomic. That means: If you share the same `Database` instance between two coroutines, it can ensure the
 `suspendedScope` executing later will wait for the one executing earlier to finish.
 
 ## Next Step
diff --git a/sqllin-dsl/doc/getting-start-cn.md b/sqllin-dsl/doc/getting-start-cn.md
@@ -14,7 +14,7 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-val sqllinVersion = "1.4.1"
+val sqllinVersion = "1.4.2"
 
 kotlin {
     // ......
diff --git a/sqllin-dsl/doc/getting-start.md b/sqllin-dsl/doc/getting-start.md
@@ -16,7 +16,7 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-val sqllinVersion = "1.4.1"
+val sqllinVersion = "1.4.2"
 
 kotlin {
     // ......
@@ -30,10 +30,10 @@ kotlin {
                 implementation("com.ctrip.kotlin:sqllin-driver:$sqllinVersion")
                 
                 // The sqllin-dsl serialization and deserialization depends on kotlinx-serialization
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1")
 
                 // Since 1.2.2, sqllin-dsl depends on kotlinx.coroutines
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
             }
         }
         // ......

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ plugins {`
`11`	`11`	`version = "1.0"`
`12`	`12`
`13`	`13`	`kotlin {`
	`14`	`+ jvmToolchain(21)`
`14`	`15`	`androidTarget {`
`15`	`16`	`publishLibraryVariants("release")`
`16`	`17`	`}`
`@@ -47,12 +48,12 @@ android {`
`47`	`48`	`minSdk = 23`
`48`	`49`	`}`
`49`	`50`	`compileOptions {`
`50`		`- sourceCompatibility = JavaVersion.VERSION_11`
`51`		`- targetCompatibility = JavaVersion.VERSION_21`
	`51`	`+ isCoreLibraryDesugaringEnabled = true`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`dependencies {`
	`56`	`+ coreLibraryDesugaring(libs.desugar.jdk.libs)`
`56`	`57`	`add("kspCommonMainMetadata", project(":sqllin-processor"))`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ version = VERSION`
`20`	`20`	`@OptIn(ExperimentalKotlinGradlePluginApi::class)`
`21`	`21`	`kotlin {`
`22`	`22`	`explicitApi()`
	`23`	`+ jvmToolchain(21)`
`23`	`24`	`androidTarget {`
`24`	`25`	`publishLibraryVariants("release")`
`25`	`26`	`instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)`
`@@ -106,8 +107,7 @@ android {`
`106`	`107`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`107`	`108`	`}`
`108`	`109`	`compileOptions {`
`109`		`- sourceCompatibility = JavaVersion.VERSION_11`
`110`		`- targetCompatibility = JavaVersion.VERSION_21`
	`110`	`+ isCoreLibraryDesugaringEnabled = true`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`@@ -125,6 +125,10 @@ fun KotlinNativeTarget.setupNativeConfig() {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
	`128`	`+dependencies {`
	`129`	`+ coreLibraryDesugaring(libs.desugar.jdk.libs)`
	`130`	`+}`
	`131`	`+`
`128`	`132`	`val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {`
`129`	`133`	`archiveClassifier.set("javadoc")`
`130`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ version = VERSION`
`23`	`23`	`@OptIn(ExperimentalKotlinGradlePluginApi::class)`
`24`	`24`	`kotlin {`
`25`	`25`	`explicitApi()`
	`26`	`+ jvmToolchain(21)`
`26`	`27`	`androidTarget {`
`27`	`28`	`publishLibraryVariants("release")`
`28`	`29`	`instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)`
`@@ -171,8 +172,7 @@ android {`
`171`	`172`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`172`	`173`	`}`
`173`	`174`	`compileOptions {`
`174`		`- sourceCompatibility = JavaVersion.VERSION_11`
`175`		`- targetCompatibility = JavaVersion.VERSION_21`
	`175`	`+ isCoreLibraryDesugaringEnabled = true`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`@@ -189,6 +189,7 @@ fun KotlinNativeTarget.setupNativeConfig() {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`dependencies {`
	`192`	`+ coreLibraryDesugaring(libs.desugar.jdk.libs)`
`192`	`193`	`val sourceSets = listOf(`
`193`	`194`	`"kspAndroidAndroidTest",`
`194`	`195`