Skip to content

Commit fe35a10

Browse files
committed
更新 jetbrains-annotations 并添加部分注解标记;调整几个内部函数;
1 parent eb9550b commit fe35a10

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

buildSrc/src/main/kotlin/P.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object P {
3838
override val homepage: String get() = HOMEPAGE
3939

4040
const val VERSION = "1.5.0"
41-
const val NEXT_VERSION = "1.5.1"
41+
const val NEXT_VERSION = "1.6.0"
4242

4343
override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
4444
override val version = if (isSnapshot()) snapshotVersion else VERSION

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ kotlin {
5353
implementation(libs.simbot.api)
5454
implementation(libs.simbot.common.annotations)
5555
}
56-
libs
5756

5857
commonTest.dependencies {
5958
api(libs.simbot.core)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ kotlin {
6565
implementation(libs.kotlinx.io.core)
6666
api(libs.kotlinx.coroutines.core)
6767
implementation(libs.kotlinx.serialization.json)
68+
implementation(libs.jetbrains.annotations)
6869
}
6970

7071
commonTest.dependencies {
@@ -76,6 +77,7 @@ kotlin {
7677

7778
jvmMain {
7879
dependencies {
80+
compileOnly(libs.jetbrains.annotations)
7981
}
8082
}
8183

simbot-component-onebot-v11/simbot-component-onebot-v11-message/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/message/MessageElementResolvers.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ import love.forte.simbot.common.id.literal
2424
import love.forte.simbot.component.onebot.common.annotations.InternalOneBotAPI
2525
import love.forte.simbot.component.onebot.v11.message.segment.*
2626
import love.forte.simbot.message.*
27-
import love.forte.simbot.resource.*
27+
import love.forte.simbot.resource.Resource
28+
import love.forte.simbot.resource.toResource
29+
import org.jetbrains.annotations.ApiStatus
2830
import kotlin.jvm.JvmName
29-
import kotlin.jvm.JvmSynthetic
3031

3132
/**
3233
* 将事件中接收到的 [OneBotMessageSegment] 解析为 [Message.Element]。
@@ -38,6 +39,7 @@ import kotlin.jvm.JvmSynthetic
3839
* | 其他 | 使用 [toElement] 转化 |
3940
*/
4041
@InternalOneBotAPI
42+
@ApiStatus.Internal // since 1.6.0
4143
public fun OneBotMessageSegment.resolveToMessageElement(): Message.Element {
4244
return when (this) {
4345
is OneBotAt -> if (isAll) AtAll else At(data.qq.ID)
@@ -52,8 +54,9 @@ public fun OneBotMessageSegment.resolveToMessageElement(): Message.Element {
5254
* @see resolveToOneBotSegment
5355
*/
5456
@InternalOneBotAPI
55-
@JvmSynthetic
56-
public suspend fun Message.resolveToOneBotSegmentList(
57+
@ApiStatus.Internal // since 1.6.0
58+
// @JvmSynthetic // since 1.6.0 不再向Java隐藏,且不再挂起
59+
public fun Message.resolveToOneBotSegmentList(
5760
defaultImageAdditionalParams: ((Resource) -> OneBotImage.AdditionalParams?)? = null,
5861
): List<OneBotMessageSegment> {
5962
return when (this) {
@@ -69,8 +72,9 @@ public suspend fun Message.resolveToOneBotSegmentList(
6972
* 将一个 [Message.Element] 转化为用于API请求的 [OneBotMessageSegment]。
7073
*/
7174
@InternalOneBotAPI
72-
@JvmSynthetic
73-
public suspend fun Message.Element.resolveToOneBotSegment(
75+
@ApiStatus.Internal // since 1.6.0
76+
// @JvmSynthetic // since 1.6.0 不再向Java隐藏,且不再挂起
77+
public fun Message.Element.resolveToOneBotSegment(
7478
defaultImageAdditionalParams: ((Resource) -> OneBotImage.AdditionalParams?)? = null,
7579
): OneBotMessageSegment? {
7680
return when (this) {

0 commit comments

Comments
 (0)