Merge pull request #145 from simple-robot/dev/update-simbot-and-KT

更新simbot到v4.0.0-RC3, Kotlin到2.0.0

Author: ForteScarlet

.github/workflows/publish-release.yml

@@ -50,7 +50,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -x test
@@ -108,7 +108,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.5
-          arguments: clean test publishToSonatype closeAndReleaseStagingRepository
+          arguments: clean test publishToSonatype closeAndReleaseStagingRepositories
         env:
           SIMBOT_IS_SNAPSHOT: true
           SIMBOT_SNAPSHOT_ONLY: true

.github/workflows/publish-snapshot.yml

@@ -58,7 +58,7 @@ jobs:
           arguments: |
             test 
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 

.github/workflows/publish-v4-release.yml.bk

@@ -46,7 +46,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -x test
@@ -99,7 +99,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
         with:
           gradle-version: 8.5
-          arguments: clean test publishToSonatype closeAndReleaseStagingRepository
+          arguments: clean test publishToSonatype closeAndReleaseStagingRepositories
         env:
           SIMBOT_IS_SNAPSHOT: true
           SIMBOT_SNAPSHOT_ONLY: true

.github/workflows/publish-v4-snapshot.yml.bk

@@ -58,7 +58,7 @@ jobs:
           arguments: |
             test 
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 

.gitignore

@@ -151,3 +151,4 @@ gradle-app.setting
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 
+.kotlin

buildSrc/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
     implementation(libs.bundles.dokka)
 
     // see https://github.com/gradle-nexus/publish-plugin
-    implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
+    implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 
     // simbot suspend transform gradle common
     implementation(libs.simbot.gradle)

buildSrc/src/main/kotlin/JvmConfig.kt

@@ -1,18 +1,21 @@
 /*
- * Copyright (c) 2024. ForteScarlet.
+ *     Copyright (c) 2024. ForteScarlet.
  *
- * This file is part of simbot-component-qq-guild.
+ *     This file is part of simbot-component-kook.
  *
- * simbot-component-qq-guild is free software: you can redistribute it and/or modify it under the terms
- * of the GNU Lesser General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ *     simbot-component-kook is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  *
- * simbot-component-qq-guild is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+ *     simbot-component-kook is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *     GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License along with simbot-component-qq-guild.
- * If not, see <https://www.gnu.org/licenses/>.
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with simbot-component-kook,
+ *     If not, see <https://www.gnu.org/licenses/>.
  */
 
 import org.gradle.api.Project
@@ -23,20 +26,22 @@ import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByName
 import org.gradle.kotlin.dsl.withType
 import org.gradle.process.CommandLineArgumentProvider
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 inline fun KotlinJvmTarget.configJava(crossinline block: KotlinJvmTarget.() -> Unit = {}) {
     withJava()
-    compilations.all {
-        kotlinOptions {
-            javaParameters = true
-            freeCompilerArgs = freeCompilerArgs + listOf("-Xjvm-default=all")
-        }
+    compilerOptions {
+        javaParameters = true
+        freeCompilerArgs.addAll(
+            "-Xjvm-default=all"
+        )
     }
 
     testRuns["test"].executionTask.configure {

buildSrc/src/main/kotlin/K2Config.kt

@@ -52,7 +52,7 @@ object P : ProjectDetail() {
     override val homepage: String
         get() = HOMEPAGE
 
-    private val baseVersion = v(4, 0, 0) - v("beta2")
+    private val baseVersion = v(4, 0, 0) - v("beta3")
 
     val snapshotVersion = baseVersion - Version.SNAPSHOT
     override val version = if (isSnapshot()) snapshotVersion else baseVersion

buildSrc/src/main/kotlin/P.kt

@@ -1,18 +1,21 @@
 /*
- * Copyright (c) 2022-2023. ForteScarlet.
+ *     Copyright (c) 2022-2024. ForteScarlet.
  *
- * This file is part of simbot-component-kook.
+ *     This file is part of simbot-component-kook.
  *
- * simbot-component-kook is free software: you can redistribute it and/or modify it under the terms of
- * the GNU Lesser General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ *     simbot-component-kook is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  *
- * simbot-component-kook is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
+ *     simbot-component-kook is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *     GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License along with simbot-component-kook,
- * If not, see <https://www.gnu.org/licenses/>.
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with simbot-component-kook,
+ *     If not, see <https://www.gnu.org/licenses/>.
  */
 
 import love.forte.gradle.common.core.project.setup
@@ -69,10 +72,11 @@ tasks.getByName<Test>("test") {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
+    compilerOptions {
         javaParameters = true
-//        jvmTarget = "1.8"
-        freeCompilerArgs = freeCompilerArgs + listOf("-Xjvm-default=all")
+        freeCompilerArgs.addAll(
+            "-Xjvm-default=all"
+        )
     }
 }
 

buildSrc/src/main/kotlin/simbot-kook-module-conventions.gradle.kts

@@ -1,19 +1,19 @@
 [versions]
-kotlin = "1.9.22"
-kotlinx-coroutines = "1.8.0"
+kotlin = "2.0.0"
+kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.6.3"
-dokka = "1.9.10"
+dokka = "1.9.20"
 openjdk-jmh = "1.37"
 ktor = "2.3.8"
 log4j = "2.23.0"
 # simbot
-simbot = "4.0.0-beta1"
-suspendTransform = "0.6.0"
-gradleCommon = "0.2.0"
+simbot = "4.0.0-RC3"
+suspendTransform = "0.8.0-beta1"
+gradleCommon = "0.4.0"
 # ksp
-ksp = "1.9.22-1.0.18"
+ksp = "2.0.0-1.0.22"
 # https://square.github.io/kotlinpoet/
-kotlinPoet = "1.16.0"
+kotlinPoet = "1.17.0"
 
 [libraries]
 # simbot