Merge pull request #198 from simple-robot/update-simbot-and-stkcp

更新Kotlin到2.1.20; simbot到4.12.0; STKCP到2.1.20-0.12.0; KSP到2.1.20-1.0.32

Author: ForteScarlet

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.0"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.0"
+kotlin = "2.1.20"
 kotlinx-coroutines = "1.9.0"
 kotlinx-serialization = "1.7.3"
 # kotlinx-io = "0.6.0"
@@ -9,11 +9,11 @@ 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"
 # https://mockk.io/
@@ -25,7 +25,6 @@ detekt = "1.23.8"
 # 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"
 }
+
 rootProject.name = "simbot-component-onebot"
 
 include(":internal-processors:include-component-message-elements-processor")

simbot-component-onebot-v11/simbot-component-onebot-v11-core/api/simbot-component-onebot-v11-core.api

@@ -27,7 +27,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.dokka")
-    alias(libs.plugins.suspendTransform)
+    id("love.forte.plugin.suspend-transform")
     alias(libs.plugins.ksp)
 }
 

simbot-component-onebot-v11/simbot-component-onebot-v11-core/build.gradle.kts

@@ -17,9 +17,13 @@
 
 package love.forte.simbot.component.onebot.v11.core.event.messageinteraction
 
+import love.forte.simbot.component.onebot.v11.core.actor.OneBotFriend
+import love.forte.simbot.component.onebot.v11.core.actor.OneBotGroup
+import love.forte.simbot.component.onebot.v11.core.actor.OneBotMember
 import love.forte.simbot.component.onebot.v11.core.bot.OneBotBot
 import love.forte.simbot.component.onebot.v11.core.event.message.*
 import love.forte.simbot.event.*
+import love.forte.simbot.suspendrunner.STP
 
 
 /**
@@ -73,6 +77,9 @@ public interface OneBotMessageEventPostReplyEvent : OneBotMessageEventInteractio
 public interface OneBotGroupMessageEventInteractionEvent :
     OneBotMessageEventInteractionEvent {
     override val content: OneBotGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -86,6 +93,9 @@ public interface OneBotGroupMessageEventPreReplyEvent :
     OneBotGroupMessageEventInteractionEvent,
     OneBotMessageEventPreReplyEvent {
     override val content: OneBotGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -98,6 +108,9 @@ public interface OneBotGroupMessageEventPostReplyEvent :
     OneBotGroupMessageEventInteractionEvent,
     OneBotMessageEventPostReplyEvent {
     override val content: OneBotGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 
@@ -111,6 +124,9 @@ public interface OneBotNormalGroupMessageEventInteractionEvent :
     OneBotGroupMessageEventInteractionEvent,
     ChatGroupMessageEventInteractionEvent {
     override val content: OneBotNormalGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -122,6 +138,9 @@ public interface OneBotNormalGroupMessageEventPreReplyEvent :
     OneBotNormalGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPreReplyEvent {
     override val content: OneBotNormalGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -132,6 +151,9 @@ public interface OneBotNormalGroupMessageEventPostReplyEvent :
     OneBotNormalGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPostReplyEvent {
     override val content: OneBotNormalGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 
@@ -145,6 +167,9 @@ public interface OneBotAnonymousGroupMessageEventInteractionEvent :
     OneBotGroupMessageEventInteractionEvent,
     ChatGroupMessageEventInteractionEvent {
     override val content: OneBotAnonymousGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -156,6 +181,9 @@ public interface OneBotAnonymousGroupMessageEventPreReplyEvent :
     OneBotAnonymousGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPreReplyEvent {
     override val content: OneBotAnonymousGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -166,6 +194,9 @@ public interface OneBotAnonymousGroupMessageEventPostReplyEvent :
     OneBotAnonymousGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPostReplyEvent {
     override val content: OneBotAnonymousGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 
@@ -178,6 +209,9 @@ public interface OneBotAnonymousGroupMessageEventPostReplyEvent :
 public interface OneBotNoticeGroupMessageEventInteractionEvent :
     OneBotGroupMessageEventInteractionEvent {
     override val content: OneBotNoticeGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -189,6 +223,9 @@ public interface OneBotNoticeGroupMessageEventPreReplyEvent :
     OneBotNoticeGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPreReplyEvent {
     override val content: OneBotNoticeGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
 }
 
 /**
@@ -199,6 +236,9 @@ public interface OneBotNoticeGroupMessageEventPostReplyEvent :
     OneBotNoticeGroupMessageEventInteractionEvent,
     OneBotGroupMessageEventPostReplyEvent {
     override val content: OneBotNoticeGroupMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotGroup = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 
@@ -255,6 +295,9 @@ public interface OneBotPrivateMessageEventPostReplyEvent :
 public interface OneBotGroupPrivateMessageEventInteractionEvent :
     OneBotPrivateMessageEventInteractionEvent {
     override val content: OneBotGroupPrivateMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotMember = content.content()
 }
 
 /**
@@ -268,6 +311,9 @@ public interface OneBotGroupPrivateMessageEventPreReplyEvent :
     OneBotGroupPrivateMessageEventInteractionEvent,
     OneBotPrivateMessageEventPreReplyEvent {
     override val content: OneBotGroupPrivateMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotMember = content.content()
 }
 
 /**
@@ -280,6 +326,9 @@ public interface OneBotGroupPrivateMessageEventPostReplyEvent :
     OneBotGroupPrivateMessageEventInteractionEvent,
     OneBotPrivateMessageEventPostReplyEvent {
     override val content: OneBotGroupPrivateMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotMember = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 //endregion
@@ -295,6 +344,9 @@ public interface OneBotGroupPrivateMessageEventPostReplyEvent :
 public interface OneBotFriendMessageEventInteractionEvent :
     OneBotPrivateMessageEventInteractionEvent {
     override val content: OneBotFriendMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotFriend = content.content()
 }
 
 /**
@@ -308,6 +360,9 @@ public interface OneBotFriendMessageEventPreReplyEvent :
     OneBotFriendMessageEventInteractionEvent,
     OneBotPrivateMessageEventPreReplyEvent {
     override val content: OneBotFriendMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotFriend = content.content()
 }
 
 /**
@@ -320,6 +375,9 @@ public interface OneBotFriendMessageEventPostReplyEvent :
     OneBotFriendMessageEventInteractionEvent,
     OneBotPrivateMessageEventPostReplyEvent {
     override val content: OneBotFriendMessageEvent
+
+    @STP
+    override suspend fun target(): OneBotFriend = content.content()
     override val message: OneBotSegmentsInteractionMessage
 }
 //endregion