Merge pull request #174 from simple-robot/dev/upgrade-kt-and-simbot

更新simbot到4.11.0; 更新编译器插件和部分gradle插件; 更新修复部分版本更新带来的警告

Author: ForteScarlet

buildSrc/src/main/kotlin/P.kt

@@ -38,7 +38,7 @@ object P {
         override val homepage: String get() = HOMEPAGE
 
         const val VERSION = "1.5.0"
-        const val NEXT_VERSION = "1.5.1"
+        const val NEXT_VERSION = "1.6.0"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

gradle/libs.versions.toml

@@ -2,14 +2,15 @@
 kotlin = "2.1.0"
 kotlinx-coroutines = "1.9.0"
 kotlinx-serialization = "1.7.3"
-kotlinx-io = "0.6.0"
+# kotlinx-io = "0.6.0"
+kotlinx-io = { prefer = "0.6.0" }
 dokka = "1.9.20"
 ktor = "2.3.12"
 openjdk-jmh = "1.37"
 log4j = "2.24.3"
 # simbot
-simbot = "4.9.0"
-suspendTransform = "2.1.0-0.9.4"
+simbot = { prefer = "4.11.0" }
+suspendTransform = "2.1.0-0.11.0"
 gradleCommon = "0.6.0"
 # ksp
 ksp = "2.1.0-1.0.29"
@@ -112,7 +113,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 # binary-compatibility-validator
 # https://github.com/Kotlin/binary-compatibility-validator
-kotlinxBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
+kotlinxBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
 suspendTransform = { id = "love.forte.plugin.suspend-transform", version.ref = "suspendTransform" }
 
 [bundles]

simbot-component-onebot-common/build.gradle.kts

@@ -53,7 +53,6 @@ kotlin {
             implementation(libs.simbot.api)
             implementation(libs.simbot.common.annotations)
         }
-        libs
 
         commonTest.dependencies {
             api(libs.simbot.core)

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

@@ -45,7 +45,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/acto
 	public abstract synthetic fun botAsMember (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract synthetic fun delete ([Llove/forte/simbot/ability/DeleteOption;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun getAllHonorInfo (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun getAllHonorInfo$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/actor/OneBotGroup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getAllHonorInfoAsync ()Ljava/util/concurrent/CompletableFuture;
 	public fun getAllHonorInfoBlocking ()Llove/forte/simbot/component/onebot/v11/core/api/GetGroupHonorInfoResult;
 	public fun getAllHonorInfoReserve ()Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
@@ -177,7 +176,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/acto
 	public fun setSpecialTitleReserve (Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
 	public static synthetic fun setSpecialTitleReserve$default (Llove/forte/simbot/component/onebot/v11/core/actor/OneBotMember;Ljava/lang/String;ILjava/lang/Object;)Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
 	public synthetic fun unban (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun unban$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/actor/OneBotMember;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun unbanAsync ()Ljava/util/concurrent/CompletableFuture;
 	public fun unbanBlocking ()V
 	public fun unbanReserve ()Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
@@ -1867,9 +1865,7 @@ public final class love/forte/simbot/component/onebot/v11/core/bot/OneBotBotConf
 
 public abstract interface class love/forte/simbot/component/onebot/v11/core/bot/OneBotBotFriendRelation : love/forte/simbot/bot/ContactRelation {
 	public synthetic fun contact (Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun contact$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBotFriendRelation;Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun contactCount (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun contactCount$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBotFriendRelation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getContact (Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/component/onebot/v11/core/actor/OneBotFriend;
 	public synthetic fun getContact (Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/definition/Contact;
 	public fun getContactAsync (Llove/forte/simbot/common/id/ID;)Ljava/util/concurrent/CompletableFuture;
@@ -1892,7 +1888,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/bot/
 	public fun getMemberReserve (Llove/forte/simbot/common/id/ID;Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
 	public abstract synthetic fun group (Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun groupCount (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun groupCount$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBotGroupRelation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract synthetic fun member (Llove/forte/simbot/common/id/ID;Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -2427,7 +2422,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/even
 	public abstract fun getSourceEvent ()Llove/forte/simbot/component/onebot/v11/event/notice/RawGroupDecreaseEvent;
 	public fun getUserId ()Llove/forte/simbot/common/id/LongID;
 	public synthetic fun member (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun member$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/event/notice/OneBotGroupMemberDecreaseEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class love/forte/simbot/component/onebot/v11/core/event/notice/OneBotGroupMemberIncreaseEvent : love/forte/simbot/component/onebot/v11/core/event/notice/OneBotGroupChangeEvent, love/forte/simbot/event/MemberIncreaseEvent {

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/OneBotEvent.kt

@@ -25,6 +25,7 @@ import love.forte.simbot.component.onebot.v11.core.event.stage.OneBotBotStageEve
 import love.forte.simbot.component.onebot.v11.core.utils.timestamp
 import love.forte.simbot.event.BotEvent
 import love.forte.simbot.event.Event
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 
 /**
  * OneBot11原始事件结构体类型。
@@ -38,6 +39,7 @@ public typealias OBSourceEvent = love.forte.simbot.component.onebot.v11.event.Ra
  * (例如 [OneBotBotStageEvent]) 的父类。
  */
 @OneBotInternalImplementationsOnly
+@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
 public interface OneBotCommonEvent : Event
 
 
@@ -49,6 +51,7 @@ public interface OneBotCommonEvent : Event
  * @author ForteScarlet
  */
 @OneBotInternalImplementationsOnly
+@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
 public interface OneBotEvent : OneBotCommonEvent {
     /**
      * 来自事件JSON的反序列化数据体。
@@ -84,6 +87,7 @@ public interface OneBotEvent : OneBotCommonEvent {
  * OneBot组件事件中的 [BotEvent]。
  */
 @OneBotInternalImplementationsOnly
+@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
 public interface OneBotBotEvent : OneBotEvent, BotEvent {
     override val bot: OneBotBot
 }

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/OneBotUnknownEvent.kt

@@ -21,6 +21,7 @@ import love.forte.simbot.annotations.FragileSimbotAPI
 import love.forte.simbot.common.id.ID
 import love.forte.simbot.common.id.UUID
 import love.forte.simbot.component.onebot.v11.event.UnknownEvent
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 
 
 /**
@@ -33,6 +34,7 @@ import love.forte.simbot.component.onebot.v11.event.UnknownEvent
  * @author ForteScarlet
  */
 @FragileSimbotAPI
+@OptIn(FuzzyEventTypeImplementation::class)
 public data class OneBotUnknownEvent(
     override val sourceEventRaw: String?,
     override val sourceEvent: UnknownEvent

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/OneBotUnsupportedEvent.kt

@@ -21,6 +21,7 @@ import love.forte.simbot.annotations.FragileSimbotAPI
 import love.forte.simbot.common.id.ID
 import love.forte.simbot.common.id.UUID
 import love.forte.simbot.component.onebot.v11.event.UnknownEvent
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 
 /**
  * 一个尚未被支持的事件类型。
@@ -61,6 +62,7 @@ import love.forte.simbot.component.onebot.v11.event.UnknownEvent
  *
  * @author ForteScarlet
  */
+@OptIn(FuzzyEventTypeImplementation::class)
 @FragileSimbotAPI
 public data class OneBotUnsupportedEvent(
     override val sourceEventRaw: String?,

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/internal/meta/OneBotMetaEventImpl.kt

@@ -26,11 +26,13 @@ import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotLifecycleEve
 import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotMetaEvent
 import love.forte.simbot.component.onebot.v11.event.meta.RawHeartbeatEvent
 import love.forte.simbot.component.onebot.v11.event.meta.RawLifecycleEvent
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 
 /**
  * OneBot中的元事件类型。
  * @author ForteScarlet
  */
+@OptIn(FuzzyEventTypeImplementation::class)
 internal abstract class OneBotMetaEventImpl : OneBotMetaEvent {
     override val id: ID = UUID.random()
 }

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/message/OneBotGroupMessageEvent.kt

@@ -25,6 +25,7 @@ import love.forte.simbot.component.onebot.v11.event.message.RawGroupMessageEvent
 import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
 import love.forte.simbot.event.ChatGroupEvent
 import love.forte.simbot.event.ChatGroupMessageEvent
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 import love.forte.simbot.suspendrunner.STP
 
 
@@ -40,6 +41,7 @@ import love.forte.simbot.suspendrunner.STP
  * @author ForteScarlet
  */
 @STP
+@OptIn(FuzzyEventTypeImplementation::class)
 public interface OneBotGroupMessageEvent : OneBotMessageEvent, ChatGroupEvent {
     override val sourceEvent: RawGroupMessageEvent
     override val messageContent: OneBotMessageContent

simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/message/OneBotMessageEvent.kt

@@ -22,6 +22,7 @@ import love.forte.simbot.component.onebot.v11.core.event.OneBotBotEvent
 import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
 import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
 import love.forte.simbot.component.onebot.v11.message.segment.OneBotReply
+import love.forte.simbot.event.FuzzyEventTypeImplementation
 import love.forte.simbot.event.MessageEvent
 import love.forte.simbot.message.Message
 import love.forte.simbot.message.MessageContent
@@ -37,6 +38,7 @@ public typealias OBSourceMessageEvent = love.forte.simbot.component.onebot.v11.e
  *
  * @author ForteScarlet
  */
+@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
 public interface OneBotMessageEvent : OneBotBotEvent, MessageEvent {
     override val bot: OneBotBot
     override val sourceEvent: OBSourceMessageEvent