From c12e55dbc1d3442c52ff603671d838a3da20de23 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Thu, 28 Dec 2023 21:32:05 +0800
Subject: [PATCH] chore: merge and update to java 21

---
 .idea/compiler.xml                           |  2 +-
 build.gradle.kts                             | 14 +-------------
 sweetproperty-gradle-plugin/build.gradle.kts | 13 ++++++++++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 64ba158..2f7fe79 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,4 @@
 plugins {
     autowire(libs.plugins.kotlin.jvm) apply false
-}
-
-allprojects {
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = "17"
-            freeCompilerArgs = listOf(
-                "-Xno-param-assertions",
-                "-Xno-call-assertions",
-                "-Xno-receiver-assertions"
-            )
-        }
-    }
+    autowire(libs.plugins.maven.publish) apply false
 }
\ No newline at end of file
diff --git a/sweetproperty-gradle-plugin/build.gradle.kts b/sweetproperty-gradle-plugin/build.gradle.kts
index b0ea42d..b90981b 100644
--- a/sweetproperty-gradle-plugin/build.gradle.kts
+++ b/sweetproperty-gradle-plugin/build.gradle.kts
@@ -8,14 +8,21 @@ group = property.project.groupName
 version = property.project.version
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     withSourcesJar()
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
     sourceSets.all { languageSettings { languageVersion = "2.0" } }
+    compilerOptions {
+        freeCompilerArgs = listOf(
+            "-Xno-param-assertions",
+            "-Xno-call-assertions",
+            "-Xno-receiver-assertions"
+        )
+    }
 }
 
 dependencies {