Update Kotlin to 2.0.20

ctripcorp · Sep 2, 2024 · f06e97d · f06e97d
1 parent 1868940
commit f06e97d
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 74 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -63,9 +63,6 @@ jobs:
       - name: Run sqllin-dsl JVM Unit Tests on macOS X64
         run: ./test_dsl_jvm.sh
 
-      - name: Gradle Cache
-        uses: gradle/actions/setup-gradle@v3
-
       - name: AVD Cache
         uses: actions/cache@v4
         id: avd-cache
@@ -83,7 +80,7 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 11698152
+          emulator-build: 12265550
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -96,7 +93,7 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 11698152
+          emulator-build: 12265550
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -134,7 +131,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -194,7 +191,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -225,9 +222,6 @@ jobs:
       - name: Run sqllin-dsl JVM Unit Tests on Linux X64
         run: ./test_dsl_jvm.sh
 
-      - name: Gradle Cache
-        uses: gradle/actions/setup-gradle@v3
-
       - name: AVD Cache
         uses: actions/cache@v4
         id: avd-cache
@@ -245,7 +239,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 11698152
+          emulator-build: 12265550
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -258,7 +252,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 11698152
+          emulator-build: 12265550
           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
@@ -30,7 +30,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -46,9 +46,6 @@ jobs:
       - name: Build sqllin-dsl
         run: ./gradlew :sqllin-dsl:assemble -PonCICD
 
-      - name: Gradle Cache
-        uses: gradle/actions/setup-gradle@v3
-
       - name: Publish to MavenCentral
         run: ./publish_apple_android_jvm.sh
 
@@ -70,7 +67,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -107,7 +104,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache Build Tooling
         uses: actions/cache@v4
@@ -126,8 +123,5 @@ jobs:
       - name: Build sqllin-dsl
         run: ./gradlew :sqllin-dsl:assemble -PonCICD
 
-      - name: Gradle Cache
-        uses: gradle/actions/setup-gradle@v3
-
       - name: Publish to MavenCentral
         run: ./publish_linux_processor.sh
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ local.properties
 /sqllin-dsl/build
 /sqllin-processor/build
 /sample/build
-*.podspec
+*.podspec
+.kotlin
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,24 @@
 
 - Date format: YYYY-MM-dd
 
-## vx.x.x / 2024-xx-xx
+## v1.4.0 / 2024-09-02
+
+### All
+
+* Update `Kotlin`'s version to `2.0.20`
 
 ### sqllin-dsl
 
 * Update `kotlinx.coroutines`'s version to `1.8.1`
-<!--* Update `kotlinx.serialization`'s version to `1.7.1`-->
+* Update `kotlinx.serialization`'s version to `1.7.2`
 
 ### sqllin-driver
 
-* Update the `sqlite-jdbc`'s version to `3.46.0.0`
+* Update the `sqlite-jdbc`'s version to `3.46.1.0`
+
+### sqllin-processor
+
+* Update `KSP`'s version to `2.0.20-1.0.24`
 
 ## v1.3.2 / 2024-06-18
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION=1.3.2
+VERSION=1.4.0
 GROUP=com.ctrip.kotlin
 
 #Maven Publish Information

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,14 @@
 [versions]
 
-kotlin = "1.9.24"
-agp = "8.2.2"
-ksp = "1.9.24-1.0.20"
-serialization = "1.6.3"
+kotlin = "2.0.20"
+agp = "8.5.2"
+ksp = "2.0.20-1.0.24"
+serialization = "1.7.2"
 coroutines = "1.8.1"
-androidx-annotation = "1.8.0"
+androidx-annotation = "1.8.2"
 androidx-test = "1.6.1"
-sqlite-jdbc = "3.46.0.0"
+androidx-test-runner = "1.6.2"
+sqlite-jdbc = "3.46.1.0"
 
 [libraries]
 
@@ -18,13 +19,11 @@ kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutin
 
 androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" }
 androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidx-test" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-runner" }
 androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test" }
 
 sqlite-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite-jdbc" }
 
-
-
 [plugins]
 
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,4 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -9,20 +11,21 @@ plugins {
 
 version = "1.0"
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     androidTarget {
         publishLibraryVariants("release")
     }
     jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
     }
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 
     sourceSets {
         all {
@@ -55,15 +58,11 @@ dependencies {
     add("kspCommonMainMetadata", project(":sqllin-processor"))
 }
 
-afterEvaluate {  // WORKAROUND: both register() and named() fail – https://github.com/gradle/gradle/issues/9331
+afterEvaluate { // WORKAROUND: both register() and named() fail – https://github.com/gradle/gradle/issues/9331
     tasks {
-        withType<KotlinCompile<*>> {
+        withType<KotlinCompilationTask<*>> {
             if (name != "kspCommonMainKotlinMetadata")
                 dependsOn("kspCommonMainKotlinMetadata")
         }
     }
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
 }
diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.konan.target.HostManager
@@ -16,20 +17,16 @@ val VERSION: String by project
 group = GROUP
 version = VERSION
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     explicitApi()
     androidTarget {
         publishLibraryVariants("release")
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
     }
 
     listOf(
@@ -58,12 +55,8 @@ kotlin {
         it.setupNativeConfig()
     }
 
-    targets.configureEach {
-        compilations.configureEach {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
-            }
-        }
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
     sourceSets {

diff --git a/sqllin-dsl/build.gradle.kts b/sqllin-dsl/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.konan.target.HostManager
@@ -18,20 +19,16 @@ val VERSION: String by project
 group = GROUP
 version = VERSION
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     explicitApi()
     androidTarget {
         publishLibraryVariants("release")
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
     }
 
     listOf(
@@ -60,12 +57,8 @@ kotlin {
         it.setupNativeConfig()
     }
 
-    targets.configureEach {
-        compilations.configureEach {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
-            }
-        }
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
     sourceSets {
@@ -137,7 +130,7 @@ fun KotlinNativeTarget.setupNativeConfig() {
 }
 
 dependencies {
-    val sourceSet = listOf(
+    val sourceSets = listOf(
         "kspAndroidAndroidTest",
 
         "kspJvmTest",
@@ -162,7 +155,7 @@ dependencies {
 
         "kspMingwX64Test",
     )
-    sourceSet.forEach {
+    sourceSets.forEach {
         add(it, project(":sqllin-processor"))
     }
 }