Skip to content

Commit eb9550b

Browse files
ForteScarletForteScarlet
committed
更新/补充依赖升级后所需的opt-in相关注解和dumped api
1 parent c012965 commit eb9550b

File tree

29 files changed

+65
-184
lines changed

29 files changed

+65
-184
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
kotlin = "2.1.0"
33
kotlinx-coroutines = "1.9.0"
44
kotlinx-serialization = "1.7.3"
5-
kotlinx-io = "0.6.0"
5+
# kotlinx-io = "0.6.0"
6+
kotlinx-io = { prefer = "0.6.0" }
67
dokka = "1.9.20"
78
ktor = "2.3.12"
89
openjdk-jmh = "1.37"
910
log4j = "2.24.3"
1011
# simbot
11-
simbot = "4.9.0"
12-
suspendTransform = "2.1.0-0.9.4"
12+
simbot = { prefer = "4.11.0" }
13+
suspendTransform = "2.1.0-0.11.0"
1314
gradleCommon = "0.6.0"
1415
# ksp
1516
ksp = "2.1.0-1.0.29"
@@ -112,7 +113,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
112113
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
113114
# binary-compatibility-validator
114115
# https://github.com/Kotlin/binary-compatibility-validator
115-
kotlinxBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
116+
kotlinxBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
116117
suspendTransform = { id = "love.forte.plugin.suspend-transform", version.ref = "suspendTransform" }
117118

118119
[bundles]

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/acto
4545
public abstract synthetic fun botAsMember (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
4646
public abstract synthetic fun delete ([Llove/forte/simbot/ability/DeleteOption;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
4747
public synthetic fun getAllHonorInfo (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
48-
public static synthetic fun getAllHonorInfo$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/actor/OneBotGroup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
4948
public fun getAllHonorInfoAsync ()Ljava/util/concurrent/CompletableFuture;
5049
public fun getAllHonorInfoBlocking ()Llove/forte/simbot/component/onebot/v11/core/api/GetGroupHonorInfoResult;
5150
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
177176
public fun setSpecialTitleReserve (Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
178177
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;
179178
public synthetic fun unban (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
180-
public static synthetic fun unban$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/actor/OneBotMember;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
181179
public fun unbanAsync ()Ljava/util/concurrent/CompletableFuture;
182180
public fun unbanBlocking ()V
183181
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
18671865

18681866
public abstract interface class love/forte/simbot/component/onebot/v11/core/bot/OneBotBotFriendRelation : love/forte/simbot/bot/ContactRelation {
18691867
public synthetic fun contact (Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1870-
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;
18711868
public synthetic fun contactCount (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1872-
public static synthetic fun contactCount$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBotFriendRelation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
18731869
public fun getContact (Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/component/onebot/v11/core/actor/OneBotFriend;
18741870
public synthetic fun getContact (Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/definition/Contact;
18751871
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/
18921888
public fun getMemberReserve (Llove/forte/simbot/common/id/ID;Llove/forte/simbot/common/id/ID;)Llove/forte/simbot/suspendrunner/reserve/SuspendReserve;
18931889
public abstract synthetic fun group (Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
18941890
public synthetic fun groupCount (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1895-
public static synthetic fun groupCount$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBotGroupRelation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
18961891
public abstract synthetic fun member (Llove/forte/simbot/common/id/ID;Llove/forte/simbot/common/id/ID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
18971892
}
18981893

@@ -2427,7 +2422,6 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/even
24272422
public abstract fun getSourceEvent ()Llove/forte/simbot/component/onebot/v11/event/notice/RawGroupDecreaseEvent;
24282423
public fun getUserId ()Llove/forte/simbot/common/id/LongID;
24292424
public synthetic fun member (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2430-
public static synthetic fun member$suspendImpl (Llove/forte/simbot/component/onebot/v11/core/event/notice/OneBotGroupMemberDecreaseEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
24312425
}
24322426

24332427
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‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import love.forte.simbot.component.onebot.v11.core.event.stage.OneBotBotStageEve
2525
import love.forte.simbot.component.onebot.v11.core.utils.timestamp
2626
import love.forte.simbot.event.BotEvent
2727
import love.forte.simbot.event.Event
28+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2829

2930
/**
3031
* OneBot11原始事件结构体类型。
@@ -38,6 +39,7 @@ public typealias OBSourceEvent = love.forte.simbot.component.onebot.v11.event.Ra
3839
* (例如 [OneBotBotStageEvent]) 的父类。
3940
*/
4041
@OneBotInternalImplementationsOnly
42+
@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
4143
public interface OneBotCommonEvent : Event
4244

4345

@@ -49,6 +51,7 @@ public interface OneBotCommonEvent : Event
4951
* @author ForteScarlet
5052
*/
5153
@OneBotInternalImplementationsOnly
54+
@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
5255
public interface OneBotEvent : OneBotCommonEvent {
5356
/**
5457
* 来自事件JSON的反序列化数据体。
@@ -84,6 +87,7 @@ public interface OneBotEvent : OneBotCommonEvent {
8487
* OneBot组件事件中的 [BotEvent]。
8588
*/
8689
@OneBotInternalImplementationsOnly
90+
@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
8791
public interface OneBotBotEvent : OneBotEvent, BotEvent {
8892
override val bot: OneBotBot
8993
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import love.forte.simbot.annotations.FragileSimbotAPI
2121
import love.forte.simbot.common.id.ID
2222
import love.forte.simbot.common.id.UUID
2323
import love.forte.simbot.component.onebot.v11.event.UnknownEvent
24+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2425

2526

2627
/**
@@ -33,6 +34,7 @@ import love.forte.simbot.component.onebot.v11.event.UnknownEvent
3334
* @author ForteScarlet
3435
*/
3536
@FragileSimbotAPI
37+
@OptIn(FuzzyEventTypeImplementation::class)
3638
public data class OneBotUnknownEvent(
3739
override val sourceEventRaw: String?,
3840
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‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import love.forte.simbot.annotations.FragileSimbotAPI
2121
import love.forte.simbot.common.id.ID
2222
import love.forte.simbot.common.id.UUID
2323
import love.forte.simbot.component.onebot.v11.event.UnknownEvent
24+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2425

2526
/**
2627
* 一个尚未被支持的事件类型。
@@ -61,6 +62,7 @@ import love.forte.simbot.component.onebot.v11.event.UnknownEvent
6162
*
6263
* @author ForteScarlet
6364
*/
65+
@OptIn(FuzzyEventTypeImplementation::class)
6466
@FragileSimbotAPI
6567
public data class OneBotUnsupportedEvent(
6668
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‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotLifecycleEve
2626
import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotMetaEvent
2727
import love.forte.simbot.component.onebot.v11.event.meta.RawHeartbeatEvent
2828
import love.forte.simbot.component.onebot.v11.event.meta.RawLifecycleEvent
29+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2930

3031
/**
3132
* OneBot中的元事件类型。
3233
* @author ForteScarlet
3334
*/
35+
@OptIn(FuzzyEventTypeImplementation::class)
3436
internal abstract class OneBotMetaEventImpl : OneBotMetaEvent {
3537
override val id: ID = UUID.random()
3638
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import love.forte.simbot.component.onebot.v11.event.message.RawGroupMessageEvent
2525
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
2626
import love.forte.simbot.event.ChatGroupEvent
2727
import love.forte.simbot.event.ChatGroupMessageEvent
28+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2829
import love.forte.simbot.suspendrunner.STP
2930

3031

@@ -40,6 +41,7 @@ import love.forte.simbot.suspendrunner.STP
4041
* @author ForteScarlet
4142
*/
4243
@STP
44+
@OptIn(FuzzyEventTypeImplementation::class)
4345
public interface OneBotGroupMessageEvent : OneBotMessageEvent, ChatGroupEvent {
4446
override val sourceEvent: RawGroupMessageEvent
4547
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‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import love.forte.simbot.component.onebot.v11.core.event.OneBotBotEvent
2222
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
2323
import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
2424
import love.forte.simbot.component.onebot.v11.message.segment.OneBotReply
25+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2526
import love.forte.simbot.event.MessageEvent
2627
import love.forte.simbot.message.Message
2728
import love.forte.simbot.message.MessageContent
@@ -37,6 +38,7 @@ public typealias OBSourceMessageEvent = love.forte.simbot.component.onebot.v11.e
3738
*
3839
* @author ForteScarlet
3940
*/
41+
@SubclassOptInRequired(FuzzyEventTypeImplementation::class)
4042
public interface OneBotMessageEvent : OneBotBotEvent, MessageEvent {
4143
override val bot: OneBotBot
4244
override val sourceEvent: OBSourceMessageEvent

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import love.forte.simbot.component.onebot.v11.core.actor.OneBotMember
2323
import love.forte.simbot.component.onebot.v11.event.message.RawPrivateMessageEvent
2424
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
2525
import love.forte.simbot.event.ContactMessageEvent
26+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2627
import love.forte.simbot.event.MemberMessageEvent
2728
import love.forte.simbot.suspendrunner.STP
2829

@@ -36,6 +37,7 @@ import love.forte.simbot.suspendrunner.STP
3637
*
3738
* @author ForteScarlet
3839
*/
40+
@OptIn(FuzzyEventTypeImplementation::class)
3941
public interface OneBotPrivateMessageEvent : OneBotMessageEvent {
4042
override val sourceEvent: RawPrivateMessageEvent
4143
override val messageContent: OneBotMessageContent

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package love.forte.simbot.component.onebot.v11.core.event.meta
2020
import love.forte.simbot.component.onebot.v11.common.api.StatusResult
2121
import love.forte.simbot.component.onebot.v11.event.meta.RawHeartbeatEvent
2222
import love.forte.simbot.component.onebot.v11.event.meta.RawMetaEvent
23+
import love.forte.simbot.event.FuzzyEventTypeImplementation
2324
import kotlin.time.Duration
2425
import kotlin.time.Duration.Companion.milliseconds
2526

@@ -31,6 +32,7 @@ import kotlin.time.Duration.Companion.milliseconds
3132
*
3233
* @author ForteScarlet
3334
*/
35+
@OptIn(FuzzyEventTypeImplementation::class)
3436
public interface OneBotHeartbeatEvent : OneBotMetaEvent {
3537
override val sourceEvent: RawHeartbeatEvent
3638

0 commit comments

Comments
 (0)