Merge pull request #738 from simple-robot/upgrade-kt-190

build: 更新Kotlin到 1.9.10; 优化针对Java的异步桥接函数的内部实现
simple-robot · Aug 30, 2023 · d017031 · d017031
2 parents f2490be + fa224fd
commit d017031
Show file tree

Hide file tree

Showing 14 changed files with 316 additions and 559 deletions.
diff --git a/.github/workflows/kdoc.yml.bk b/.github/workflows/kdoc.yml.bk
@@ -29,7 +29,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: |
             -Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 
             -Porg.gradle.daemon=false

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -36,14 +36,14 @@ jobs:
       - name: Run All Tests
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: clean assemble test
 
       # setup Gradle
       - name: Gradle Publish Release
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: | 
             publishToSonatype
             closeAndReleaseStagingRepository
@@ -81,7 +81,7 @@ jobs:
       - name: Gradle publish snapshot
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: |
             publishToSonatype
             closeAndReleaseStagingRepository
@@ -120,7 +120,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: | 
             dokkaHtmlMultiModule
             --info 

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -46,13 +46,13 @@ jobs:
       - name: Run All Tests
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: assemble allTests
 
       - name: Gradle publish snapshot
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: |
             publishToSonatype
             closeAndReleaseStagingRepository
@@ -88,7 +88,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: |
             dokkaHtmlMultiModule
             --info 

diff --git a/.github/workflows/test-branch.yml b/.github/workflows/test-branch.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Run All Tests
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: 8.3
           arguments: |
             assemble
             build

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -21,9 +21,9 @@ repositories {
     mavenLocal()
 }
 
-val kotlinVersion = "1.8.21"
+val kotlinVersion = "1.9.10"
 val dokkaPluginVersion = "1.8.20"
-val suspendTransformVersion = "0.3.1"
+val suspendTransformVersion = "0.5.0"
 val gradleCommon = "0.1.1"
 val ktor = "2.3.1"
 

diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -85,7 +85,7 @@ sealed class P(override val group: String) : ProjectDetail() {
     val versionWithoutSnapshot: Version
 
     init {
-        val mainVersion = version(3, 2, 0)
+        val mainVersion = version(3, 3, 0)
 
         fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) {
             mainVersion

diff --git a/buildSrc/src/main/kotlin/SuspendTransforms.kt b/buildSrc/src/main/kotlin/SuspendTransforms.kt
@@ -45,7 +45,7 @@ object SuspendTransforms {
      */
     val jvmAsyncTransformer = SuspendTransformConfiguration.jvmAsyncTransformer.copy(
         syntheticFunctionIncludeAnnotations = includeAnnotations,
-        transformFunctionInfo = FunctionInfo("love.forte.simbot.utils", null, "$\$runInAsync1"),
+        transformFunctionInfo = FunctionInfo("love.forte.simbot.utils", null, "$\$runInAsyncNullable"),
         copyAnnotationExcludes = SuspendTransformConfiguration.jvmAsyncTransformer.copyAnnotationExcludes + SuspendTransformConfiguration.jvmAsyncTransformer.markAnnotation.classInfo
     )
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists