Skip to content

Commit 01abf5f

Browse files
qiaoyuangqiaoyuang
committed
Update to Kotlin 2.1.0
1 parent f06e97d commit 01abf5f

15 files changed

Lines changed: 119 additions & 68 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
- name: Validate Gradle Wrapper
2929
uses: gradle/wrapper-validation-action@v3
3030

31-
- name: Set up JDK 17
31+
- name: Set up JDK 21
3232
uses: actions/setup-java@v4
3333
with:
3434
distribution: 'zulu'
35-
java-version: 17
35+
java-version: 21
3636

3737
- name: Setup Gradle
3838
uses: gradle/actions/setup-gradle@v4
@@ -124,11 +124,11 @@ jobs:
124124
- name: Validate Gradle Wrapper
125125
uses: gradle/wrapper-validation-action@v3
126126

127-
- name: Set up JDK 17
127+
- name: Set up JDK 21
128128
uses: actions/setup-java@v4
129129
with:
130130
distribution: 'zulu'
131-
java-version: 17
131+
java-version: 21
132132

133133
- name: Setup Gradle
134134
uses: gradle/actions/setup-gradle@v4
@@ -184,11 +184,11 @@ jobs:
184184
- name: Validate Gradle Wrapper
185185
uses: gradle/wrapper-validation-action@v3
186186

187-
- name: Set up JDK 17
187+
- name: Set up JDK 21
188188
uses: actions/setup-java@v4
189189
with:
190190
distribution: 'zulu'
191-
java-version: 17
191+
java-version: 21
192192

193193
- name: Setup Gradle
194194
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/publish.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- name: Validate Gradle Wrapper
2424
uses: gradle/wrapper-validation-action@v3
2525

26-
- name: Set up JDK 17
26+
- name: Set up JDK 21
2727
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'zulu'
30-
java-version: 17
30+
java-version: 21
3131

3232
- name: Setup Gradle
3333
uses: gradle/actions/setup-gradle@v4
@@ -60,11 +60,11 @@ jobs:
6060
- name: Validate Gradle Wrapper
6161
uses: gradle/wrapper-validation-action@v3
6262

63-
- name: Set up JDK 17
63+
- name: Set up JDK 21
6464
uses: actions/setup-java@v4
6565
with:
6666
distribution: 'zulu'
67-
java-version: 17
67+
java-version: 21
6868

6969
- name: Setup Gradle
7070
uses: gradle/actions/setup-gradle@v4
@@ -97,11 +97,11 @@ jobs:
9797
- name: Validate Gradle Wrapper
9898
uses: gradle/wrapper-validation-action@v3
9999

100-
- name: Set up JDK 17
100+
- name: Set up JDK 21
101101
uses: actions/setup-java@v4
102102
with:
103103
distribution: 'zulu'
104-
java-version: 17
104+
java-version: 21
105105

106106
- name: Setup Gradle
107107
uses: gradle/actions/setup-gradle@v4

‎CHANGELOG.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
- Date format: YYYY-MM-dd
44

5-
## v1.4.0 / 2024-09-02
5+
## v1.4.0 / 2024-12-04
66

77
### All
88

9-
* Update `Kotlin`'s version to `2.0.20`
9+
* Update `Kotlin`'s version to `2.1.00`
1010

1111
### sqllin-dsl
1212

13-
* Update `kotlinx.coroutines`'s version to `1.8.1`
14-
* Update `kotlinx.serialization`'s version to `1.7.2`
13+
* Update `kotlinx.coroutines`'s version to `1.9.0`
14+
* Update `kotlinx.serialization`'s version to `1.7.3`
1515

1616
### sqllin-driver
1717

18-
* Update the `sqlite-jdbc`'s version to `3.46.1.0`
18+
* Update the `sqlite-jdbc`'s version to `3.47.1.0`
1919

2020
### sqllin-processor
2121

22-
* Update `KSP`'s version to `2.0.20-1.0.24`
22+
* Update `KSP`'s version to `2.1.0-1.0.29`
2323

2424
## v1.3.2 / 2024-06-18
2525

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +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
3031
#kotlin.compiler.execution.strategy=out-of-process

‎gradle/libs.versions.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
22

3-
kotlin = "2.0.20"
4-
agp = "8.5.2"
5-
ksp = "2.0.20-1.0.24"
6-
serialization = "1.7.2"
7-
coroutines = "1.8.1"
8-
androidx-annotation = "1.8.2"
3+
kotlin = "2.1.0"
4+
agp = "8.7.3"
5+
ksp = "2.1.0-1.0.29"
6+
serialization = "1.7.3"
7+
coroutines = "1.9.0"
8+
androidx-annotation = "1.9.1"
99
androidx-test = "1.6.1"
1010
androidx-test-runner = "1.6.2"
11-
sqlite-jdbc = "3.46.1.0"
11+
sqlite-jdbc = "3.47.1.0"
1212

1313
[libraries]
1414

‎sample/build.gradle.kts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
21
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
43

@@ -11,7 +10,6 @@ plugins {
1110

1211
version = "1.0"
1312

14-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
1513
kotlin {
1614
androidTarget {
1715
publishLibraryVariants("release")
@@ -31,7 +29,7 @@ kotlin {
3129
all {
3230
languageSettings.optIn("kotlin.RequiresOptIn")
3331
}
34-
val commonMain by getting {
32+
commonMain {
3533
kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
3634
dependencies {
3735
implementation(project(":sqllin-dsl"))
@@ -44,13 +42,13 @@ kotlin {
4442

4543
android {
4644
namespace = "com.ctrip.sqllin.sample"
47-
compileSdk = 34
45+
compileSdk = 35
4846
defaultConfig {
4947
minSdk = 23
5048
}
5149
compileOptions {
5250
sourceCompatibility = JavaVersion.VERSION_11
53-
targetCompatibility = JavaVersion.VERSION_17
51+
targetCompatibility = JavaVersion.VERSION_21
5452
}
5553
}
5654

‎sqllin-driver/build.gradle.kts‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,20 @@ kotlin {
6565
optIn("kotlin.RequiresOptIn")
6666
}
6767
}
68-
val commonTest by getting {
69-
dependencies {
70-
implementation(kotlin("test"))
71-
implementation(libs.kotlinx.coroutines)
72-
}
68+
commonTest.dependencies {
69+
implementation(kotlin("test"))
70+
implementation(libs.kotlinx.coroutines)
7371
}
74-
val androidMain by getting {
75-
dependencies {
76-
implementation(libs.androidx.annotation)
77-
}
72+
androidMain.dependencies {
73+
implementation(libs.androidx.annotation)
7874
}
79-
val androidInstrumentedTest by getting {
80-
dependencies {
81-
implementation(libs.androidx.test.core)
82-
implementation(libs.androidx.test.runner)
83-
implementation(libs.androidx.test.rules)
84-
}
75+
androidInstrumentedTest.dependencies {
76+
implementation(libs.androidx.test.core)
77+
implementation(libs.androidx.test.runner)
78+
implementation(libs.androidx.test.rules)
8579
}
86-
87-
val jvmMain by getting {
88-
dependencies {
89-
implementation(libs.sqlite.jdbc)
90-
}
80+
jvmMain.dependencies {
81+
implementation(libs.sqlite.jdbc)
9182
}
9283
}
9384
}
@@ -109,14 +100,14 @@ gradle.taskGraph.whenReady {
109100

110101
android {
111102
namespace = "com.ctrip.sqllin.driver"
112-
compileSdk = 34
103+
compileSdk = 35
113104
defaultConfig {
114105
minSdk = 23
115106
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
116107
}
117108
compileOptions {
118109
sourceCompatibility = JavaVersion.VERSION_11
119-
targetCompatibility = JavaVersion.VERSION_17
110+
targetCompatibility = JavaVersion.VERSION_21
120111
}
121112
}
122113

‎sqllin-dsl/build.gradle.kts‎

Lines changed: 74 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
22
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
34
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
45
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
56
import org.jetbrains.kotlin.konan.target.HostManager
@@ -67,28 +68,86 @@ kotlin {
6768
optIn("kotlin.RequiresOptIn")
6869
}
6970
}
70-
val commonMain by getting {
71-
dependencies {
72-
api(project(":sqllin-driver"))
73-
implementation(libs.kotlinx.serialization)
74-
implementation(libs.kotlinx.coroutines)
75-
}
71+
commonMain.dependencies {
72+
api(project(":sqllin-driver"))
73+
implementation(libs.kotlinx.serialization)
74+
implementation(libs.kotlinx.coroutines)
7675
}
77-
val commonTest by getting {
78-
dependencies {
79-
implementation(kotlin("test"))
80-
}
76+
commonTest.dependencies {
77+
implementation(kotlin("test"))
8178
}
82-
val androidInstrumentedTest by getting {
79+
androidInstrumentedTest {
80+
setCommonTestDir()
8381
dependencies {
8482
implementation(libs.androidx.test.core)
8583
implementation(libs.androidx.test.runner)
8684
implementation(libs.androidx.test.rules)
8785
}
8886
}
87+
jvmTest {
88+
setCommonTestDir()
89+
}
90+
91+
iosX64Test {
92+
setNativeTestDir()
93+
}
94+
iosArm64Test {
95+
setNativeTestDir()
96+
}
97+
iosSimulatorArm64Test {
98+
setNativeTestDir()
99+
}
100+
101+
102+
macosX64Test {
103+
setNativeTestDir()
104+
}
105+
macosArm64Test {
106+
setNativeTestDir()
107+
}
108+
109+
watchosX64Test {
110+
setNativeTestDir()
111+
}
112+
watchosArm32Test {
113+
setNativeTestDir()
114+
}
115+
watchosArm64Test {
116+
setNativeTestDir()
117+
}
118+
watchosDeviceArm64Test {
119+
setNativeTestDir()
120+
}
121+
watchosSimulatorArm64Test {
122+
setNativeTestDir()
123+
}
124+
125+
tvosX64Test {
126+
setNativeTestDir()
127+
}
128+
tvosArm64Test {
129+
setNativeTestDir()
130+
}
131+
tvosSimulatorArm64Test {
132+
setNativeTestDir()
133+
}
134+
135+
linuxX64Test {
136+
setNativeTestDir()
137+
}
138+
linuxArm64Test {
139+
setNativeTestDir()
140+
}
141+
142+
mingwX64Test {
143+
setNativeTestDir()
144+
}
89145
}
90146
}
91147

148+
fun KotlinSourceSet.setCommonTestDir(vararg path: String) = kotlin.srcDirs("src/commonTestCode/kotlin", path)
149+
fun KotlinSourceSet.setNativeTestDir() = setCommonTestDir("src/nativeTestCode/kotlin")
150+
92151
gradle.taskGraph.whenReady {
93152
if (!project.hasProperty("onCICD"))
94153
return@whenReady
@@ -106,14 +165,14 @@ gradle.taskGraph.whenReady {
106165

107166
android {
108167
namespace = "com.ctrip.sqllin.dsl"
109-
compileSdk = 34
168+
compileSdk = 35
110169
defaultConfig {
111170
minSdk = 23
112171
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
113172
}
114173
compileOptions {
115174
sourceCompatibility = JavaVersion.VERSION_11
116-
targetCompatibility = JavaVersion.VERSION_17
175+
targetCompatibility = JavaVersion.VERSION_21
117176
}
118177
}
119178

@@ -145,13 +204,15 @@ dependencies {
145204
"kspWatchosX64Test",
146205
"kspWatchosArm32Test",
147206
"kspWatchosArm64Test",
207+
"kspWatchosDeviceArm64Test",
148208
"kspWatchosSimulatorArm64Test",
149209

150210
"kspTvosX64Test",
151211
"kspTvosArm64Test",
152212
"kspTvosSimulatorArm64Test",
153213

154214
"kspLinuxX64Test",
215+
"kspLinuxArm64Test",
155216

156217
"kspMingwX64Test",
157218
)

sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt renamed to sqllin-dsl/src/commonTestCode/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt

File renamed without changes.

sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/Entities.kt renamed to sqllin-dsl/src/commonTestCode/kotlin/com/ctrip/sqllin/dsl/Entities.kt

File renamed without changes.

0 commit comments

Comments
 (0)