From a9dc94051d4d82e5db55065047df9d807ec89f49 Mon Sep 17 00:00:00 2001
From: tursom <tursom@foxmail.com>
Date: Fri, 29 Dec 2023 15:20:18 +0800
Subject: [PATCH] update java version to 21, kotlin version to 1.9.22

---
 build.gradle.kts                         |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 ts-gradle/build.gradle.kts               | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d1d620f..72a51e3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  val kotlinVersion = "1.9.20-RC2"
+  val kotlinVersion = "1.9.22"
   kotlin("jvm") version kotlinVersion
   kotlin("plugin.allopen") version kotlinVersion apply false
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e411586..a595206 100644
--- 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-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ts-gradle/build.gradle.kts b/ts-gradle/build.gradle.kts
index b0bfe18..c629f35 100644
--- a/ts-gradle/build.gradle.kts
+++ b/ts-gradle/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.util.*
 
 plugins {
-  kotlin("jvm") version "1.9.10" apply false
+  kotlin("jvm") version "1.9.22" apply false
   `java-gradle-plugin`
 }
 
@@ -49,21 +49,21 @@ allprojects {
         from(components["java"])
         try {
           artifact(tasks["kotlinSourcesJar"])
-        } catch (e: Exception) {
+        } catch (_: Exception) {
         }
       }
     }
   }
 
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
     kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
     //kotlinOptions.useIR = true
   }
 
   java {
     toolchain {
-      languageVersion.set(JavaLanguageVersion.of(17))
+      languageVersion.set(JavaLanguageVersion.of(21))
     }
   }
 }
@@ -133,4 +133,9 @@ fun registerPublishRepos(repositoryHandler: RepositoryHandler, project: Project)
       println("cannot push to repository $repositoryName")
     }
   }
-}
\ No newline at end of file
+}
+
+val publishTask = tasks.getByName("publish")
+subprojects.forEach {
+  publishTask.dependsOn(it.tasks.getByName("publish").path)
+}