github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix JVM ABI

Browse Source
This commit is contained in:
Him188 2022-06-04 17:21:45 +01:00
parent 0030fe869c
commit 780bee4836
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
7 changed files with 29 additions and 76 deletions
mirai-core-api
compatibility-validation
android/api
android.api
jvm/api
jvm.api
src
commonMain/kotlin/contact
file
AbsoluteFolder.kt
roaming
RoamingMessages.kt
jvmBaseMain/kotlin
contact
file
AbsoluteFolder.kt
roaming
RoamingMessages.kt
utils
RemoteFile.kt

35
mirai-core-api/compatibility-validation/android/api/android.api
View File

@ -3608,48 +3608,24 @@ public final class net/mamoe/mirai/message/data/Dice$Key : net/mamoe/mirai/messa
public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
public final class net/mamoe/mirai/message/data/EmptyMessageChain : java/util/List, kotlin/jvm/internal/markers/KMappedMarker, net/mamoe/mirai/message/data/MessageChain, net/mamoe/mirai/message/data/MessageChainImpl {
public final class net/mamoe/mirai/message/data/EmptyMessageChain : java/util/List, kotlin/jvm/internal/markers/KMappedMarker, net/mamoe/mirai/message/data/DirectSizeAccess, net/mamoe/mirai/message/data/DirectToStringAccess, net/mamoe/mirai/message/data/MessageChain {
public static final field INSTANCE Lnet/mamoe/mirai/message/data/EmptyMessageChain;
public synthetic fun add (ILjava/lang/Object;)V
public fun add (ILnet/mamoe/mirai/message/data/SingleMessage;)V
public synthetic fun add (Ljava/lang/Object;)Z
public fun add (Lnet/mamoe/mirai/message/data/SingleMessage;)Z
public fun addAll (ILjava/util/Collection;)Z
public fun addAll (Ljava/util/Collection;)Z
public fun clear ()V
public final fun contains (Ljava/lang/Object;)Z
public fun contains (Lnet/mamoe/mirai/message/data/SingleMessage;)Z
public fun containsAll (Ljava/util/Collection;)Z
public fun contentToString ()Ljava/lang/String;
public fun equals (Ljava/lang/Object;)Z
public synthetic fun get (I)Ljava/lang/Object;
public fun get (I)Lnet/mamoe/mirai/message/data/SingleMessage;
public fun getHasConstrainSingle ()Z
public fun getSize ()I
public fun hashCode ()I
public final fun indexOf (Ljava/lang/Object;)I
public fun indexOf (Lnet/mamoe/mirai/message/data/SingleMessage;)I
public fun isEmpty ()Z
public fun iterator ()Ljava/util/Iterator;
public final fun lastIndexOf (Ljava/lang/Object;)I
public fun lastIndexOf (Lnet/mamoe/mirai/message/data/SingleMessage;)I
public fun listIterator ()Ljava/util/ListIterator;
public fun listIterator (I)Ljava/util/ListIterator;
public synthetic fun remove (I)Ljava/lang/Object;
public fun remove (I)Lnet/mamoe/mirai/message/data/SingleMessage;
public fun remove (Ljava/lang/Object;)Z
public fun removeAll (Ljava/util/Collection;)Z
public fun replaceAll (Ljava/util/function/UnaryOperator;)V
public fun retainAll (Ljava/util/Collection;)Z
public fun serializeToMiraiCode ()Ljava/lang/String;
public final fun serializer ()Lkotlinx/serialization/KSerializer;
public synthetic fun set (ILjava/lang/Object;)Ljava/lang/Object;
public fun set (ILnet/mamoe/mirai/message/data/SingleMessage;)Lnet/mamoe/mirai/message/data/SingleMessage;
public final fun size ()I
public fun sort (Ljava/util/Comparator;)V
public fun subList (II)Ljava/util/List;
public fun toArray ()[Ljava/lang/Object;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String;
}
@ -5677,6 +5653,8 @@ public final class net/mamoe/mirai/network/NoStandardInputForCaptchaException :
}
public final class net/mamoe/mirai/network/RetryLaterException : net/mamoe/mirai/network/LoginFailedException {
public synthetic fun <init> (Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun getCause ()Ljava/lang/Throwable;
}
public final class net/mamoe/mirai/network/UnsupportedSliderCaptchaException : net/mamoe/mirai/network/LoginFailedException {
@ -6189,14 +6167,11 @@ public abstract class net/mamoe/mirai/utils/MiraiLoggerPlatformBase : net/mamoe/
public final fun error (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun error0 (Ljava/lang/String;)V
protected abstract fun error0 (Ljava/lang/String;Ljava/lang/Throwable;)V
public final synthetic fun getFollower ()Lnet/mamoe/mirai/utils/MiraiLogger;
public final fun info (Ljava/lang/String;)V
public final fun info (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun info0 (Ljava/lang/String;)V
protected abstract fun info0 (Ljava/lang/String;Ljava/lang/Throwable;)V
public fun isEnabled ()Z
public synthetic fun plus (Lnet/mamoe/mirai/utils/MiraiLogger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public final synthetic fun setFollower (Lnet/mamoe/mirai/utils/MiraiLogger;)V
public final fun verbose (Ljava/lang/String;)V
public final fun verbose (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun verbose0 (Ljava/lang/String;)V
@ -6467,7 +6442,7 @@ public final class net/mamoe/mirai/utils/SingleFileLogger : net/mamoe/mirai/util
public fun error (Ljava/lang/String;)V
public fun error (Ljava/lang/String;Ljava/lang/Throwable;)V
public fun error (Ljava/lang/Throwable;)V
public synthetic fun getFollower ()Lnet/mamoe/mirai/utils/MiraiLogger;
public fun getFollower ()Lnet/mamoe/mirai/utils/MiraiLogger;
public fun getIdentity ()Ljava/lang/String;
public fun info (Ljava/lang/String;)V
public fun info (Ljava/lang/String;Ljava/lang/Throwable;)V
@ -6479,7 +6454,7 @@ public final class net/mamoe/mirai/utils/SingleFileLogger : net/mamoe/mirai/util
public fun isVerboseEnabled ()Z
public fun isWarningEnabled ()Z
public synthetic fun plus (Lnet/mamoe/mirai/utils/MiraiLogger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public synthetic fun setFollower (Lnet/mamoe/mirai/utils/MiraiLogger;)V
public fun setFollower (Lnet/mamoe/mirai/utils/MiraiLogger;)V
public fun verbose (Ljava/lang/String;)V
public fun verbose (Ljava/lang/String;Ljava/lang/Throwable;)V
public fun verbose (Ljava/lang/Throwable;)V

31
mirai-core-api/compatibility-validation/jvm/api/jvm.api
View File

@ -3608,48 +3608,24 @@ public final class net/mamoe/mirai/message/data/Dice$Key : net/mamoe/mirai/messa
public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
public final class net/mamoe/mirai/message/data/EmptyMessageChain : java/util/List, kotlin/jvm/internal/markers/KMappedMarker, net/mamoe/mirai/message/data/MessageChain, net/mamoe/mirai/message/data/MessageChainImpl {
public final class net/mamoe/mirai/message/data/EmptyMessageChain : java/util/List, kotlin/jvm/internal/markers/KMappedMarker, net/mamoe/mirai/message/data/DirectSizeAccess, net/mamoe/mirai/message/data/DirectToStringAccess, net/mamoe/mirai/message/data/MessageChain {
public static final field INSTANCE Lnet/mamoe/mirai/message/data/EmptyMessageChain;
public synthetic fun add (ILjava/lang/Object;)V
public fun add (ILnet/mamoe/mirai/message/data/SingleMessage;)V
public synthetic fun add (Ljava/lang/Object;)Z
public fun add (Lnet/mamoe/mirai/message/data/SingleMessage;)Z
public fun addAll (ILjava/util/Collection;)Z
public fun addAll (Ljava/util/Collection;)Z
public fun clear ()V
public final fun contains (Ljava/lang/Object;)Z
public fun contains (Lnet/mamoe/mirai/message/data/SingleMessage;)Z
public fun containsAll (Ljava/util/Collection;)Z
public fun contentToString ()Ljava/lang/String;
public fun equals (Ljava/lang/Object;)Z
public synthetic fun get (I)Ljava/lang/Object;
public fun get (I)Lnet/mamoe/mirai/message/data/SingleMessage;
public fun getHasConstrainSingle ()Z
public fun getSize ()I
public fun hashCode ()I
public final fun indexOf (Ljava/lang/Object;)I
public fun indexOf (Lnet/mamoe/mirai/message/data/SingleMessage;)I
public fun isEmpty ()Z
public fun iterator ()Ljava/util/Iterator;
public final fun lastIndexOf (Ljava/lang/Object;)I
public fun lastIndexOf (Lnet/mamoe/mirai/message/data/SingleMessage;)I
public fun listIterator ()Ljava/util/ListIterator;
public fun listIterator (I)Ljava/util/ListIterator;
public synthetic fun remove (I)Ljava/lang/Object;
public fun remove (I)Lnet/mamoe/mirai/message/data/SingleMessage;
public fun remove (Ljava/lang/Object;)Z
public fun removeAll (Ljava/util/Collection;)Z
public fun replaceAll (Ljava/util/function/UnaryOperator;)V
public fun retainAll (Ljava/util/Collection;)Z
public fun serializeToMiraiCode ()Ljava/lang/String;
public final fun serializer ()Lkotlinx/serialization/KSerializer;
public synthetic fun set (ILjava/lang/Object;)Ljava/lang/Object;
public fun set (ILnet/mamoe/mirai/message/data/SingleMessage;)Lnet/mamoe/mirai/message/data/SingleMessage;
public final fun size ()I
public fun sort (Ljava/util/Comparator;)V
public fun subList (II)Ljava/util/List;
public fun toArray ()[Ljava/lang/Object;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String;
}
@ -5677,6 +5653,8 @@ public final class net/mamoe/mirai/network/NoStandardInputForCaptchaException :
}
public final class net/mamoe/mirai/network/RetryLaterException : net/mamoe/mirai/network/LoginFailedException {
public synthetic fun <init> (Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun getCause ()Ljava/lang/Throwable;
}
public final class net/mamoe/mirai/network/UnsupportedSliderCaptchaException : net/mamoe/mirai/network/LoginFailedException {
@ -6189,14 +6167,11 @@ public abstract class net/mamoe/mirai/utils/MiraiLoggerPlatformBase : net/mamoe/
public final fun error (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun error0 (Ljava/lang/String;)V
protected abstract fun error0 (Ljava/lang/String;Ljava/lang/Throwable;)V
public final synthetic fun getFollower ()Lnet/mamoe/mirai/utils/MiraiLogger;
public final fun info (Ljava/lang/String;)V
public final fun info (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun info0 (Ljava/lang/String;)V
protected abstract fun info0 (Ljava/lang/String;Ljava/lang/Throwable;)V
public fun isEnabled ()Z
public synthetic fun plus (Lnet/mamoe/mirai/utils/MiraiLogger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public final synthetic fun setFollower (Lnet/mamoe/mirai/utils/MiraiLogger;)V
public final fun verbose (Ljava/lang/String;)V
public final fun verbose (Ljava/lang/String;Ljava/lang/Throwable;)V
protected fun verbose0 (Ljava/lang/String;)V

7
mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFolder.kt
View File

@ -7,18 +7,13 @@
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
@file:JvmBlockingBridge
@file:Suppress("OVERLOADS_INTERFACE")
package net.mamoe.mirai.contact.file
import kotlinx.coroutines.flow.Flow
import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
import net.mamoe.mirai.contact.PermissionDeniedException
import net.mamoe.mirai.utils.ExternalResource
import net.mamoe.mirai.utils.NotStableForInheritance
import net.mamoe.mirai.utils.ProgressionCallback
import kotlin.jvm.JvmOverloads
/**
* 绝对目录标识. 精确表示一个远程目录. 不会受同名文件或目录的影响.
@ -106,7 +101,6 @@ public expect interface AbsoluteFolder : AbsoluteFileFolder {
/**
* 精确获取 [AbsoluteFile.id] 为 [id] 的文件. 在目标文件不存在时返回 `null`. 当 [deep] 为 `true` 时还会深入子目录查找.
*/
@JvmOverloads
public suspend fun resolveFileById(
id: String,
deep: Boolean = false
@ -143,7 +137,6 @@ public expect interface AbsoluteFolder : AbsoluteFileFolder {
*
* @throws PermissionDeniedException 当无管理员权限时抛出 (若群仅允许管理员上传)
*/
@JvmOverloads
public suspend fun uploadNewFile(
filepath: String,
content: ExternalResource,

3
mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingMessages.kt
View File

@ -7,12 +7,9 @@
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
@file:JvmBlockingBridge
package net.mamoe.mirai.contact.roaming
import kotlinx.coroutines.flow.Flow
import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
import net.mamoe.mirai.contact.Friend
import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource

8
mirai-core-api/src/jvmBaseMain/kotlin/contact/file/AbsoluteFolder.kt
View File

@ -131,9 +131,11 @@ public actual interface AbsoluteFolder : AbsoluteFileFolder {
/**
* 精确获取 [AbsoluteFile.id] 为 [id] 的文件. 在目标文件不存在时返回 `null`. 当 [deep] 为 `true` 时还会深入子目录查找.
*/
@Suppress("OVERLOADS_INTERFACE", "ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // Keep JVM ABI
@JvmOverloads
public actual suspend fun resolveFileById(
id: String,
deep: Boolean
deep: Boolean = false
): AbsoluteFile?
/**
@ -187,10 +189,12 @@ public actual interface AbsoluteFolder : AbsoluteFileFolder {
*
* @throws PermissionDeniedException 当无管理员权限时抛出 (若群仅允许管理员上传)
*/
@Suppress("OVERLOADS_INTERFACE", "ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // Keep JVM ABI
@JvmOverloads
public actual suspend fun uploadNewFile(
filepath: String,
content: ExternalResource,
callback: ProgressionCallback<AbsoluteFile, Long>?,
callback: ProgressionCallback<AbsoluteFile, Long>? = null,
): AbsoluteFile
public actual companion object {

9
mirai-core-api/src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt
View File

@ -7,9 +7,12 @@
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
@file:JvmBlockingBridge
package net.mamoe.mirai.contact.roaming
import kotlinx.coroutines.flow.Flow
import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
import net.mamoe.mirai.contact.Friend
import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource
@ -46,10 +49,11 @@ public actual interface RoamingMessages {
* @param timeEnd 结束时间, UTC+8 时间戳, 单位为秒. 可以为 [Long.MAX_VALUE], 即表示到可以获取的最晚的消息为止. 低于 [timeStart] 的值将会被看作是 [timeStart] 的值.
* @param filter 过滤器.
*/
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // Keep JVM ABI
public actual suspend fun getMessagesIn(
timeStart: Long,
timeEnd: Long,
filter: RoamingMessageFilter?
filter: RoamingMessageFilter? = null
): Flow<MessageChain>
/**
@ -68,8 +72,9 @@ public actual interface RoamingMessages {
*
* @param filter 过滤器.
*/
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // Keep JVM ABI
public actual suspend fun getAllMessages(
filter: RoamingMessageFilter?
filter: RoamingMessageFilter? = null
): Flow<MessageChain> = getMessagesIn(0, Long.MAX_VALUE, filter)
/**

12
mirai-core-api/src/jvmBaseMain/kotlin/utils/RemoteFile.kt
View File

@ -228,7 +228,8 @@ public actual interface RemoteFile {
* 获取该目录下的 ID 为 [id] 的文件, 当 [deep] 为 `true` 时还会进入子目录继续寻找这样的文件. 在不存在时返回 `null`.
* @see resolve
*/
public actual suspend fun resolveById(id: String, deep: Boolean): RemoteFile?
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // JVM ABI
public actual suspend fun resolveById(id: String, deep: Boolean = true): RemoteFile?
/**
* 获取该目录或子目录下的 ID 为 [id] 的文件, 在不存在时返回 `null`
@ -462,9 +463,10 @@ public actual interface RemoteFile {
"Use uploadAndSend instead.", ReplaceWith("this.uploadAndSend(resource, callback)"), DeprecationLevel.ERROR
) // deprecated since 2.7-M1
@DeprecatedSinceMirai(warningSince = "2.7", errorSince = "2.10") // left ERROR intentionally
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
public actual suspend fun upload(
resource: ExternalResource,
callback: ProgressionCallback?,
callback: ProgressionCallback? = null,
): FileMessage
/**
@ -590,10 +592,11 @@ public actual interface RemoteFile {
level = DeprecationLevel.ERROR
) // deprecated since 2.7-M1
@DeprecatedSinceMirai(warningSince = "2.7", errorSince = "2.10") // left ERROR intentionally
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
public actual suspend fun FileSupported.uploadFile(
path: String,
resource: ExternalResource,
callback: ProgressionCallback?,
callback: ProgressionCallback? = null,
): FileMessage =
@Suppress("DEPRECATION", "DEPRECATION_ERROR") this.filesRoot.resolve(path).upload(resource, callback)
@ -636,10 +639,11 @@ public actual interface RemoteFile {
level = DeprecationLevel.WARNING
) // deprecated since 2.8.0-RC
@DeprecatedSinceMirai(warningSince = "2.8")
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
public actual suspend fun <C : FileSupported> C.sendFile(
path: String,
resource: ExternalResource,
callback: ProgressionCallback?,
callback: ProgressionCallback? = null,
): MessageReceipt<C> =
@Suppress("DEPRECATION", "DEPRECATION_ERROR")
this.filesRoot.resolve(path).upload(resource, callback).sendTo(this)