Merge pull request #71 from qiaoyuang/main

Update version to 1.2.4
ctripcorp · Jan 5, 2024 · ad41ad1 · ad41ad1
2 parents c717f68 + da33d22
commit ad41ad1
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 - Date format: YYYY-MM-dd
 
+## v1.2.4 / 2024-01-05
+
+### All
+
+* Update `Kotlin`'s version to `1.9.22`
+
+### sqllin-dsl
+
+* Update `kotlinx.serialization`'s version to `1.6.2`
+
+### sqllin-processor
+
+* Update `KSP`'s version to `1.9.22-1.0.16`
+
 ## v1.2.3 / 2023-11-28
 
 ### All
@@ -77,7 +91,7 @@ a runtime exception. Thanks for [@nbransby](https://github.com/nbransby).
 
 * Add the new JVM target
 * **Breaking change**: Remove the public property: `DatabaseConnection#closed`
-* The Android (<= 9) target supports to set the `journalMode` and `synchronousMode` now
+* The Android (< 9) target supports to set the `journalMode` and `synchronousMode` now
 
 ## v1.1.1 / 2023-08-12
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         val kotlinVersion: String by project
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.android.tools.build:gradle:8.1.4")
+        classpath("com.android.tools.build:gradle:8.2.1")
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,11 @@
-VERSION=1.2.3
+VERSION=1.2.4
 GROUP=com.ctrip.kotlin
 
-kotlinVersion=1.9.21
-kspVersion=1.9.21-1.0.15
+kotlinVersion=1.9.22
+kspVersion=1.9.22-1.0.16
+serializationVersion=1.6.2
 coroutinesVersion=1.7.3
+androidxAnnotationVersion=1.7.1
 
 #Maven Publish Information
 githubURL=https://github.com/ctripcorp/SQLlin

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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -32,7 +32,8 @@ kotlin {
             kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
             dependencies {
                 implementation(project(":sqllin-dsl"))
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
+                val serializationVersion: String by project
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:${serializationVersion}")
                 val coroutinesVersion: String by project
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             }

diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts
@@ -81,7 +81,8 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("androidx.annotation:annotation:1.7.0")
+                val androidxAnnotationVersion: String by project
+                implementation("androidx.annotation:annotation:${androidxAnnotationVersion}")
             }
         }
         val androidInstrumentedTest by getting {
@@ -94,7 +95,7 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
-                implementation("org.xerial:sqlite-jdbc:3.43.0.0")
+                implementation("org.xerial:sqlite-jdbc:3.44.1.0")
             }
         }
     }

diff --git a/sqllin-dsl/build.gradle.kts b/sqllin-dsl/build.gradle.kts
@@ -77,7 +77,8 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":sqllin-driver"))
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
+                val serializationVersion: String by project
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:${serializationVersion}")
                 val coroutinesVersion: String by project
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             }
@@ -87,11 +88,6 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val androidMain by getting {
-            dependencies {
-                implementation("androidx.annotation:annotation:1.7.0")
-            }
-        }
         val androidInstrumentedTest by getting {
             dependencies {
                 implementation("androidx.test:core:1.5.0")

diff --git a/sqllin-processor/build.gradle.kts b/sqllin-processor/build.gradle.kts
@@ -41,7 +41,7 @@ publishing {
         artifactId = "sqllin-processor"
         setArtifacts(
             listOf(
-                "$buildDir/libs/sqllin-processor-$version.jar",
+                "${layout.buildDirectory}/libs/sqllin-processor-$version.jar",
                 javadocJar, sourceJar,
             )
         )