Merge pull request #39 from qiaoyuang/main

Fix some bugs about Kotlin update
ctripcorp · Aug 12, 2023 · bad20e0 · bad20e0
2 parents 2bd3e3c + 2785fee
commit bad20e0
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,17 +2,24 @@
 
 - Date format: YYYY-MM-dd
 
-## v1.1.1 / 2023-xx-xx
+## v1.1.1 / 2023-08-12
 
-### sqllin-dsl
+### All
 
-* *Breaking Change*: Remove the public API `DBEntity`([#36](https://github.com/ctripcorp/SQLlin/pull/36)), any data classes used in _sqllin-dsl_ don't need to extend `DBEntity` anymore.
+* Update `Kotlin`'s version to `1.9.0`
+
+### sqllin-dsl
 
+* Deprecated the public API `DBEntity`([#36](https://github.com/ctripcorp/SQLlin/pull/36), [#37](https://github.com/ctripcorp/SQLlin/pull/37)), any data classes used in _sqllin-dsl_ don't need to extend `DBEntity` anymore
 
 ### sqllin-driver
 
 * Fix a bug about empty `ByteArray` on native platforms([#30](https://github.com/ctripcorp/SQLlin/pull/30))
 
+### sqllin-processor
+
+* Update `KSP`'s version to `1.9.0-1.0.13`
+
 ## v1.1.0 / 2023-06-06
 
 ### All

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
-VERSION=1.1.0
+VERSION=1.1.1
 GROUP=com.ctrip.kotlin
 
-kotlinVersion=1.8.20
-kspVersion=1.8.20-1.0.11
+kotlinVersion=1.9.0
+kspVersion=1.9.0-1.0.13
 
 #Maven Publish Information
 githubURL=https://github.com/ctripcorp/SQLlin

diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts
@@ -55,7 +55,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
             }
         }
         val androidMain by getting {

diff --git a/sqllin-driver/src/appleMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsApple.kt b/sqllin-driver/src/appleMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsApple.kt
@@ -16,8 +16,10 @@
 
 package com.ctrip.sqllin.driver.platform
 
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
 import platform.Foundation.NSString
 import platform.Foundation.create
 
@@ -26,6 +28,7 @@ import platform.Foundation.create
  * @author yqiao
  */
 
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
 internal actual fun bytesToString(bv: CPointer<ByteVar>): String = NSString.create(uTF8String = bv).toString()
 
 internal actual inline val separatorChar: Char

diff --git a/sqllin-driver/src/linuxMain/kotlin/com/ctrip/sqllin/driver/platform/Lock.kt b/sqllin-driver/src/linuxMain/kotlin/com/ctrip/sqllin/driver/platform/Lock.kt
@@ -17,6 +17,7 @@
 package com.ctrip.sqllin.driver.platform
 
 import kotlinx.cinterop.Arena
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr
 import platform.posix.PTHREAD_MUTEX_RECURSIVE
@@ -37,6 +38,7 @@ import platform.posix.pthread_mutexattr_t
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal actual class Lock actual constructor() {
 
     private val arena = Arena()

diff --git a/sqllin-driver/src/linuxMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsLinux.kt b/sqllin-driver/src/linuxMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsLinux.kt
@@ -2,13 +2,15 @@ package com.ctrip.sqllin.driver.platform
 
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
 
 /**
  * The tools with Linux implementation
  * @author yqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal actual fun bytesToString(bv: CPointer<ByteVar>): String = bv.toKString()
 
 internal actual inline val separatorChar: Char

diff --git a/sqllin-driver/src/linuxTest/kotlin/com/ctrip/sqllin/driver/PlatformLinux.kt b/sqllin-driver/src/linuxTest/kotlin/com/ctrip/sqllin/driver/PlatformLinux.kt
@@ -16,6 +16,7 @@
 
 package com.ctrip.sqllin.driver
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
 import platform.posix.getcwd
 
@@ -24,5 +25,6 @@ import platform.posix.getcwd
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 actual fun getPlatformStringPath(): String =
-    getcwd(null, 0)?.toKString() ?: throw IllegalStateException("The temp path created error")
+    getcwd(null, 0u)?.toKString() ?: throw IllegalStateException("The temp path created error")
diff --git a/sqllin-driver/src/mingwMain/kotlin/com/ctrip/sqllin/driver/platform/Lock.kt b/sqllin-driver/src/mingwMain/kotlin/com/ctrip/sqllin/driver/platform/Lock.kt
@@ -17,6 +17,7 @@
 package com.ctrip.sqllin.driver.platform
 
 import kotlinx.cinterop.Arena
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr
 import platform.posix.PTHREAD_MUTEX_RECURSIVE
@@ -37,6 +38,7 @@ import platform.posix.pthread_mutexattr_tVar
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal actual class Lock actual constructor() {
 
     private val arena = Arena()

diff --git a/sqllin-driver/src/mingwMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsMinGW.kt b/sqllin-driver/src/mingwMain/kotlin/com/ctrip/sqllin/driver/platform/UtilsMinGW.kt
@@ -2,13 +2,15 @@ package com.ctrip.sqllin.driver.platform
 
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKStringFromUtf8
 
 /**
  * The tools with Windows implementation
  * @author yqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal actual fun bytesToString(bv: CPointer<ByteVar>): String = bv.toKStringFromUtf8()
 
 internal actual inline val separatorChar: Char

diff --git a/sqllin-driver/src/mingwTest/kotlin/com/ctrip/sqllin/driver/PlatformMingw.kt b/sqllin-driver/src/mingwTest/kotlin/com/ctrip/sqllin/driver/PlatformMingw.kt
@@ -25,5 +25,6 @@ import platform.posix._wgetcwd
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 actual fun getPlatformStringPath(): String =
     _wgetcwd(null, 0)?.toKString() ?: throw IllegalStateException("Get database path wrong")
diff --git a/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/RealDatabaseConnection.kt b/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/RealDatabaseConnection.kt
@@ -19,8 +19,8 @@ package com.ctrip.sqllin.driver
 import com.ctrip.sqllin.driver.cinterop.NativeDatabase
 import com.ctrip.sqllin.driver.platform.Lock
 import com.ctrip.sqllin.driver.platform.withLock
-import kotlin.native.concurrent.AtomicInt
-import kotlin.native.concurrent.AtomicReference
+import kotlin.concurrent.AtomicInt
+import kotlin.concurrent.AtomicReference
 
 /**
  * Database manager Native actual

diff --git a/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/SQLiteException.kt b/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/SQLiteException.kt
@@ -33,7 +33,7 @@ public class SQLiteResultCode(message: String, resultCode: Int) : SQLiteExceptio
     "$message | error code ${
         kotlin.run { 
             val code = resultCode and 0xff
-            SQLiteErrorType.values().find { it.code == code } 
+            SQLiteErrorType.entries.find { it.code == code } 
         }
     }") {
     internal companion object {

diff --git a/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/cinterop/NativeDatabase.kt b/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/cinterop/NativeDatabase.kt
@@ -33,20 +33,14 @@ import com.ctrip.sqllin.sqlite3.sqlite3_errmsg
 import com.ctrip.sqllin.sqlite3.sqlite3_exec
 import com.ctrip.sqllin.sqlite3.sqlite3_open_v2
 import com.ctrip.sqllin.sqlite3.sqlite3_prepare16_v2
-import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.CPointerVar
-import kotlinx.cinterop.alloc
-import kotlinx.cinterop.memScoped
-import kotlinx.cinterop.ptr
-import kotlinx.cinterop.toKString
-import kotlinx.cinterop.value
-import kotlinx.cinterop.wcstr
+import kotlinx.cinterop.*
 
 /**
  * The native database wrapper for `sqlite3`, interop with SQLite C APIs directly
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal class NativeDatabase private constructor(val dbPointer: CPointer<sqlite3>) {
 
     companion object {

diff --git a/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/cinterop/NativeStatement.kt b/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/cinterop/NativeStatement.kt
@@ -51,19 +51,15 @@ import com.ctrip.sqllin.sqlite3.sqlite3_finalize
 import com.ctrip.sqllin.sqlite3.sqlite3_last_insert_rowid
 import com.ctrip.sqllin.sqlite3.sqlite3_reset
 import com.ctrip.sqllin.sqlite3.sqlite3_step
-import kotlinx.cinterop.ByteVar
-import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.readBytes
-import kotlinx.cinterop.refTo
-import kotlinx.cinterop.reinterpret
-import kotlinx.cinterop.toKString
+import kotlinx.cinterop.*
 import platform.posix.usleep
 
 /**
  * The native statement wrapper for `sqlite3_stmt`, interop with SQLite C APIs directly
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal class NativeStatement(
     private val database: NativeDatabase,
     private val cStatementPointer: CPointer<sqlite3_stmt>,

diff --git a/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/platform/Utils.kt b/sqllin-driver/src/nativeMain/kotlin/com/ctrip/sqllin/driver/platform/Utils.kt
@@ -18,12 +18,14 @@ package com.ctrip.sqllin.driver.platform
 
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
 
 /**
  * The tools with platform-specific implementation
  * @author yqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 internal expect fun bytesToString(bv: CPointer<ByteVar>): String
 
 internal expect val separatorChar: Char
diff --git a/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/Database.kt b/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/Database.kt
@@ -31,7 +31,7 @@ import com.ctrip.sqllin.dsl.sql.statement.TransactionStatementsGroup
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.serializer
-import kotlin.jvm.Volatile
+import kotlin.concurrent.Volatile
 
 /**
  * Database object

diff --git a/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/statement/SelectStatement.kt b/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/statement/SelectStatement.kt
@@ -22,7 +22,7 @@ import com.ctrip.sqllin.dsl.sql.Table
 import com.ctrip.sqllin.dsl.sql.clause.*
 import com.ctrip.sqllin.dsl.sql.compiler.QueryDecoder
 import kotlinx.serialization.DeserializationStrategy
-import kotlin.jvm.Volatile
+import kotlin.concurrent.Volatile
 
 /**
  * Select statement

diff --git a/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/statement/Stack.kt b/sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/statement/Stack.kt
@@ -16,7 +16,7 @@
 
 package com.ctrip.sqllin.dsl.sql.statement
 
-import kotlin.jvm.Volatile
+import kotlin.concurrent.Volatile
 
 /**
  * A sample Stack implementation

diff --git a/sqllin-dsl/src/linuxTest/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt b/sqllin-dsl/src/linuxTest/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt
@@ -16,6 +16,7 @@
 
 package com.ctrip.sqllin.dsl
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
 import platform.posix.getcwd
 
@@ -24,7 +25,8 @@ import platform.posix.getcwd
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 actual fun getPlatformStringPath(): String =
-    getcwd(null, 0)?.toKString() ?: throw IllegalStateException("The temp path created error")
+    getcwd(null, 0u)?.toKString() ?: throw IllegalStateException("The temp path created error")
 
 actual val pathSeparator: Char = '/'
diff --git a/sqllin-dsl/src/mingwTest/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt b/sqllin-dsl/src/mingwTest/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt
@@ -25,6 +25,7 @@ import platform.posix._wgetcwd
  * @author yaqiao
  */
 
+@OptIn(ExperimentalForeignApi::class)
 actual fun getPlatformStringPath(): String =
     _wgetcwd(null, 0)?.toKString() ?: throw IllegalStateException("Get database path wrong")
 

diff --git a/sqllin-processor/src/main/kotlin/com/ctrip/sqllin/processor/ClauseProcessor.kt b/sqllin-processor/src/main/kotlin/com/ctrip/sqllin/processor/ClauseProcessor.kt
@@ -24,7 +24,7 @@ import com.google.devtools.ksp.symbol.*
 import java.io.OutputStreamWriter
 
 /**
- * Generate the clause property for data class that present the database entity
+ * Generate the clause properties for data classes that present the database entity
  * @author yaqiao
  */