Merge pull request #199 from simple-robot/dev/main

Release: v1.7.0

Author: ForteScarlet

.run/simbot-component-onebot [publishToMavenLocal].run.xml

@@ -9,7 +9,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--info" />
+      <option name="scriptParameters" value="-i --warning-mode all" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -26,4 +26,4 @@
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>

build.gradle.kts

@@ -18,8 +18,8 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.core.repository.Repositories
-import love.forte.plugin.suspendtrans.gradle.SuspendTransformGradleExtension
-import love.forte.simbot.gradle.suspendtransforms.addSimbotJvmTransformers
+import love.forte.plugin.suspendtrans.gradle.SuspendTransformPluginExtension
+import love.forte.simbot.gradle.suspendtransforms.addSimbotJvmTransforms
 import util.isCi
 
 plugins {
@@ -29,20 +29,12 @@ plugins {
     `simbot-onebot-changelog-generator`
     alias(libs.plugins.detekt)
     alias(libs.plugins.kotlinxBinaryCompatibilityValidator)
-    alias(libs.plugins.suspendTransform) apply false
+    id("love.forte.plugin.suspend-transform") apply false
+    // alias(libs.plugins.suspendTransform) apply false
 }
 
 setup(P.ComponentOneBot)
 
-buildscript {
-    dependencies {
-        // suspend-transform-gradle = { module = "love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle", version.ref = "suspendTransform" }
-        classpath(libs.simbot.gradle)
-        // classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:4.9.0")
-    }
-}
-
-
 logger.info("=== Current version: {} ===", version)
 
 allprojects {
@@ -62,11 +54,11 @@ allprojects {
 subprojects {
     afterEvaluate {
         if (plugins.hasPlugin(libs.plugins.suspendTransform.get().pluginId)) {
-            extensions.configure<SuspendTransformGradleExtension>("suspendTransform") {
+            extensions.configure<SuspendTransformPluginExtension>("suspendTransformPlugin") {
                 includeRuntime = false
                 includeAnnotation = false
 
-                addSimbotJvmTransformers()
+                addSimbotJvmTransforms()
             }
         }
     }

buildSrc/build.gradle.kts

@@ -37,10 +37,10 @@ dependencies {
     implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 
     // simbot suspend transform gradle common
-    // compileOnly(libs.simbot.gradle)
+    implementation(libs.simbot.gradle)
 
     // suspend transform
-    // implementation(libs.suspend.transform.gradle)
+    implementation(libs.suspend.transform.gradle)
 
     // gradle common
     implementation(libs.bundles.gradle.common)

buildSrc/src/main/kotlin/P.kt

@@ -37,8 +37,8 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
-        const val VERSION = "1.6.1"
-        const val NEXT_VERSION = "1.6.2"
+        const val VERSION = "1.7.0"
+        const val NEXT_VERSION = "1.7.1"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

gradle/libs.versions.toml

@@ -1,31 +1,30 @@
 [versions]
-kotlin = "2.1.0"
+kotlin = "2.1.20"
 kotlinx-coroutines = "1.9.0"
 kotlinx-serialization = "1.7.3"
-# kotlinx-io = "0.6.0"
+# kotlinx-io = "0.7.0"
 kotlinx-io = { prefer = "0.6.0" }
 dokka = "2.0.0"
 ktor = "2.3.12"
 openjdk-jmh = "1.37"
 log4j = "2.24.3"
 # simbot
-simbot = { prefer = "4.11.0" }
-suspendTransform = "2.1.0-0.11.0"
+simbot = { prefer = "4.12.0" }
+suspendTransform = "2.1.20-0.12.0"
 gradleCommon = "0.6.0"
 # ksp
-ksp = "2.1.0-1.0.29"
+ksp = "2.1.20-1.0.32"
 # https://square.github.io/kotlinpoet/
-kotlinPoet = "2.0.0"
+kotlinPoet = "2.1.0"
 # https://mockk.io/
-mockk = "1.13.16"
+mockk = "1.14.0"
 # https://detekt.dev/docs/intro
 detekt = "1.23.8"
 
 [libraries]
 # simbot
 simbot-api = { group = "love.forte.simbot", name = "simbot-api", version.ref = "simbot" }
 simbot-core = { group = "love.forte.simbot", name = "simbot-core", version.ref = "simbot" }
-simbot-spring = { group = "love.forte.simbot", name = "simbot-core-spring-boot-starter", version.ref = "simbot" }
 simbot-logger = { group = "love.forte.simbot.logger", name = "simbot-logger", version.ref = "simbot" }
 simbot-logger-slf4jimpl = { group = "love.forte.simbot.logger", name = "simbot-logger-slf4j2-impl", version.ref = "simbot" }
 simbot-common-apidefinition = { group = "love.forte.simbot.common", name = "simbot-common-apidefinition", version.ref = "simbot" }

settings.gradle.kts

@@ -14,10 +14,18 @@
  * You should have received a copy of the GNU Lesser General Public License along with simbot-component-onebot.
  * If not, see <https://www.gnu.org/licenses/>.
  */
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        mavenLocal()
+    }
+}
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
 }
+
 rootProject.name = "simbot-component-onebot"
 
 include(":internal-processors:include-component-message-elements-processor")