Skip to content

Commit b61d6c8

Browse files
committed
Fix the native unit tests
1 parent 01abf5f commit b61d6c8

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ kotlin.code.style=official
2727
kotlin.mpp.stability.nowarn=true
2828
kotlin.mpp.enableCInteropCommonization=true
2929
kotlin.natvie.increment=true
30-
ksp.useKSP2=true
30+
#ksp.useKSP2=true
3131
#kotlin.compiler.execution.strategy=out-of-process

sqllin-dsl/doc/getting-start-cn.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id("com.google.devtools.ksp")
1515
}
1616

17-
val sqllinVersion = "1.3.1"
17+
val sqllinVersion = "1.4.0"
1818

1919
kotlin {
2020
// ......
@@ -28,10 +28,10 @@ kotlin {
2828
implementation("com.ctrip.kotlin:sqllin-driver:$sqllinVersion")
2929

3030
// The sqllin-dsl serialization and deserialization depends on kotlinx-serialization
31-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
31+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3")
3232

3333
// Since 1.2.2, sqllin-dsl depends on kotlinx.coroutines
34-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
34+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
3535
}
3636
}
3737
// ......

sqllin-dsl/doc/getting-start.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
id("com.google.devtools.ksp")
1717
}
1818

19-
val sqllinVersion = "1.3.1"
19+
val sqllinVersion = "1.4.0"
2020

2121
kotlin {
2222
// ......
@@ -30,10 +30,10 @@ kotlin {
3030
implementation("com.ctrip.kotlin:sqllin-driver:$sqllinVersion")
3131

3232
// The sqllin-dsl serialization and deserialization depends on kotlinx-serialization
33-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3")
33+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3")
3434

3535
// Since 1.2.2, sqllin-dsl depends on kotlinx.coroutines
36-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
36+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
3737
}
3838
}
3939
// ......

sqllin-dsl/src/appleTest/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt renamed to sqllin-dsl/src/appleMain/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import platform.Foundation.NSUserDomainMask
2727
*/
2828

2929
@OptIn(UnsafeNumber::class)
30-
actual fun getPlatformStringPath(): String =
30+
internal actual fun getPlatformStringPath(): String =
3131
(NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true).firstOrNull() as? String ?: "")
3232

33-
actual val pathSeparator: Char = '/'
33+
// actual val pathSeparator: Char = '/'

sqllin-dsl/src/linuxTest/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt renamed to sqllin-dsl/src/linuxMain/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import platform.posix.getcwd
2626
*/
2727

2828
@OptIn(ExperimentalForeignApi::class)
29-
actual fun getPlatformStringPath(): String =
29+
internal actual fun getPlatformStringPath(): String =
3030
getcwd(null, 0u)?.toKString() ?: throw IllegalStateException("The temp path created error")
3131

32-
actual val pathSeparator: Char = '/'
32+
// actual val pathSeparator: Char = '/'

sqllin-dsl/src/mingwTest/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt renamed to sqllin-dsl/src/mingwMain/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import platform.posix._wgetcwd
2626
*/
2727

2828
@OptIn(ExperimentalForeignApi::class)
29-
actual fun getPlatformStringPath(): String =
29+
internal actual fun getPlatformStringPath(): String =
3030
_wgetcwd(null, 0)?.toKString() ?: throw IllegalStateException("Get database path wrong")
3131

32-
actual val pathSeparator: Char = '\\'
32+
// actual val pathSeparator: Char = '\\'

sqllin-dsl/src/nativeTestCode/kotlin/com/ctrip/sqllin/dsl/Platform.kt renamed to sqllin-dsl/src/nativeMain/kotlin/com/ctrip/sqllin/dsl/Platform.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ package com.ctrip.sqllin.dsl
2424
/**
2525
* Get the DatabasePath
2626
*/
27-
expect fun getPlatformStringPath(): String
27+
internal expect fun getPlatformStringPath(): String
2828

2929
/**
3030
* Get the file path separator, '\' in Windows, '/' in others
3131
*/
32-
expect val pathSeparator: Char
32+
// expect val pathSeparator: Char

0 commit comments

Comments
 (0)