Update kotlin-jvm-blocking-bridge to 2.0.0-160.2

binary-compatibility-validator/android/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
     kotlin("plugin.serialization")
 
     id("kotlinx-atomicfu")
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
 }
 
 description = "Mirai API binary compatibility validator"

binary-compatibility-validator/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
     kotlin("plugin.serialization")
 
     id("kotlinx-atomicfu")
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
 }
 
 description = "Mirai API binary compatibility validator"

build.gradle.kts

@@ -40,7 +40,7 @@ plugins {
     kotlin("plugin.serialization") version Versions.kotlinCompiler
     id("org.jetbrains.dokka") version Versions.dokka
 //    id("org.jetbrains.dokka") version Versions.dokka
-    id("net.mamoe.kotlin-jvm-blocking-bridge") version Versions.blockingBridge
+    id("me.him188.kotlin-jvm-blocking-bridge") version Versions.blockingBridge
     id("com.gradle.plugin-publish") version "0.12.0" apply false
 }
 
@@ -92,7 +92,7 @@ allprojects {
 
         runCatching {
             blockingBridge {
-                unitCoercion = net.mamoe.kjbb.compiler.UnitCoercion.COMPATIBILITY
+                unitCoercion = me.him188.kotlin.jvm.blocking.bridge.compiler.UnitCoercion.COMPATIBILITY
             }
         }
 

buildSrc/src/main/kotlin/Versions.kt

@@ -34,7 +34,7 @@ object Versions {
     const val io = "0.1.16"
     const val coroutinesIo = "0.1.16"
 
-    const val blockingBridge = "1.10.6-160.1"
+    const val blockingBridge = "2.0.0-160.2"
 
     const val androidGradlePlugin = "4.1.1"
     const val android = "4.1.1.4"

gradle.properties

@@ -21,4 +21,4 @@ gnsp.disableApplyOnlyOnRootProjectEnforcement=true
 # We may target 15 with Kotlin 1.5 IR
 mirai.android.target.api.level=24
 # Enable if you want to use mavenLocal for both Gradle plugin and project dependencies resolutions.
-systemProp.use.maven.local=false
+systemProp.use.maven.local=true

mirai-console/backend/mirai-console/build.gradle.kts

@@ -17,7 +17,7 @@ plugins {
     kotlin("plugin.serialization")
     id("java")
     `maven-publish`
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
 }
 
 version = Versions.console

mirai-console/backend/mirai-console/src/command/CommandManager.kt

@@ -15,7 +15,7 @@
 
 package net.mamoe.mirai.console.command
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.executeCommand
 import net.mamoe.mirai.console.command.descriptor.ExperimentalCommandDescriptors
 import net.mamoe.mirai.console.command.parse.CommandCall

mirai-console/backend/mirai-console/src/command/CommandSender.kt

@@ -15,7 +15,7 @@
 package net.mamoe.mirai.console.command
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.command.CommandSender.Companion.asCommandSender

mirai-console/backend/mirai-console/src/util/ConsoleInput.kt

@@ -13,7 +13,7 @@
 
 package net.mamoe.mirai.console.util
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.internal.util.ConsoleInputImpl
 

mirai-console/backend/mirai-console/src/util/MessageScope.kt

@@ -17,7 +17,7 @@ package net.mamoe.mirai.console.util
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.fold
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.console.command.CommandSender
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.User

mirai-console/tools/intellij-plugin/build.gradle.kts

@@ -64,6 +64,8 @@ fun File.resolveMkdir(relative: String): File {
 
 kotlin.target.compilations.all {
     kotlinOptions {
+        apiVersion = "1.4"
+        languageVersion = "1.4"
         jvmTarget = "11"
     }
 }

mirai-core-all/build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
     `maven-publish`
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
 }
 
 version = Versions.project

mirai-core-api/build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
 
     //id("kotlinx-atomicfu")
     id("signing")
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
 
     `maven-publish`
 }

mirai-core-api/src/commonMain/kotlin/Bot.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai
 
 import kotlinx.coroutines.*
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.event.EventChannel
 import net.mamoe.mirai.event.events.BotEvent

mirai-core-api/src/commonMain/kotlin/IMirai.kt

@@ -16,7 +16,7 @@ package net.mamoe.mirai
 
 import io.ktor.client.*
 import io.ktor.client.engine.okhttp.*
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.data.UserProfile
 import net.mamoe.mirai.event.Event

mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt

@@ -12,7 +12,7 @@
 package net.mamoe.mirai
 
 import kotlinx.coroutines.Job
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.data.*
 import net.mamoe.mirai.utils.MiraiExperimentalApi

mirai-core-api/src/commonMain/kotlin/contact/AudioSupported.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.contact
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.message.data.Audio
 import net.mamoe.mirai.message.data.OfflineAudio
 import net.mamoe.mirai.utils.ExternalResource

mirai-core-api/src/commonMain/kotlin/contact/Contact.kt

@@ -14,7 +14,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.IMirai
 import net.mamoe.mirai.Mirai

mirai-core-api/src/commonMain/kotlin/contact/Friend.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.roaming.RoamingSupported
 import net.mamoe.mirai.event.events.*

mirai-core-api/src/commonMain/kotlin/contact/Group.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.announcement.Announcements
 import net.mamoe.mirai.event.events.*

mirai-core-api/src/commonMain/kotlin/contact/Member.kt

@@ -12,7 +12,7 @@
 
 package net.mamoe.mirai.contact
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.MessageReceipt

mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.contact
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.MessageReceipt

mirai-core-api/src/commonMain/kotlin/contact/Stranger.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.MessageReceipt

mirai-core-api/src/commonMain/kotlin/contact/User.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.data.UserProfile

mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcement.kt

@@ -12,7 +12,7 @@
 
 package net.mamoe.mirai.contact.announcement
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.contact.announcement.Announcement.Companion.publishAnnouncement

mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt

@@ -14,7 +14,7 @@ package net.mamoe.mirai.contact.announcement
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.toList
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.utils.ExternalResource

mirai-core-api/src/commonMain/kotlin/contact/announcement/OnlineAnnouncement.kt

@@ -12,7 +12,7 @@
 
 package net.mamoe.mirai.contact.announcement
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.NormalMember

mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFile.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact.file
 
 import kotlinx.io.errors.IOException
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.message.data.FileMessage
 import net.mamoe.mirai.utils.NotStableForInheritance

mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFileFolder.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact.file
 
 import kotlinx.io.errors.IOException
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.FileSupported
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.utils.NotStableForInheritance

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

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact.file
 
 import kotlinx.coroutines.flow.Flow
-import net.mamoe.kjbb.JvmBlockingBridge
+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.JavaFriendlyAPI

mirai-core-api/src/commonMain/kotlin/contact/file/RemoteFiles.kt

@@ -13,7 +13,7 @@
 package net.mamoe.mirai.contact.file
 
 import kotlinx.coroutines.flow.Flow
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.FileSupported
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.utils.ExternalResource

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

@@ -12,7 +12,7 @@
 package net.mamoe.mirai.contact.roaming
 
 import kotlinx.coroutines.flow.Flow
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource
 import net.mamoe.mirai.utils.JavaFriendlyAPI

mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingSupported.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.contact.roaming
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.Contact
 
 /**

mirai-core-api/src/commonMain/kotlin/data/RequestEventData.kt

@@ -13,7 +13,7 @@ package net.mamoe.mirai.data
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent

mirai-core-api/src/commonMain/kotlin/event/events/friend.kt

@@ -13,7 +13,7 @@
 
 package net.mamoe.mirai.event.events
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.Friend

mirai-core-api/src/commonMain/kotlin/event/events/group.kt

@@ -16,7 +16,7 @@
 
 package net.mamoe.mirai.event.events
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.*

mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt

@@ -12,7 +12,7 @@
 
 package net.mamoe.mirai.message
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.IMirai
 import net.mamoe.mirai.Mirai

mirai-core-api/src/commonMain/kotlin/message/action/AsyncRecallResult.kt

@@ -12,7 +12,7 @@
 package net.mamoe.mirai.message.action
 
 import kotlinx.coroutines.*
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.message.data.MessageSource
 import net.mamoe.mirai.message.data.MessageSource.Key.recallIn
 import java.util.concurrent.CompletableFuture

mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt

@@ -8,7 +8,7 @@
  */
 package net.mamoe.mirai.message.action
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.*

mirai-core-api/src/commonMain/kotlin/message/data/FileMessage.kt

@@ -16,7 +16,7 @@ package net.mamoe.mirai.message.data
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.FileSupported
 import net.mamoe.mirai.contact.file.AbsoluteFile

mirai-core-api/src/commonMain/kotlin/message/data/Image.kt

@@ -24,7 +24,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.IMirai
 import net.mamoe.mirai.Mirai

mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt

@@ -17,7 +17,7 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.IMirai
 import net.mamoe.mirai.Mirai

mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt

@@ -14,7 +14,7 @@ package net.mamoe.mirai.utils
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.Contact.Companion.sendImage
@@ -602,7 +602,7 @@ public constructor(
 
     public constructor(
         cleanup: ResourceCleanCallback? = null,
-    ): this(null, cleanup)
+    ) : this(null, cleanup)
 
     public fun interface ResourceCleanCallback {
         @Throws(IOException::class)

mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.toList
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.FileSupported
 import net.mamoe.mirai.contact.Group

mirai-core-api/src/jvmTest/kotlin/event/EventLaunchUndispatchedTest.kt

@@ -12,7 +12,7 @@
 package net.mamoe.mirai.event
 
 import kotlinx.coroutines.*
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.internal.event.EVENT_LAUNCH_UNDISPATCHED
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Disabled

mirai-core-utils/build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
     kotlin("plugin.serialization")
 
     id("kotlinx-atomicfu")
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
     `maven-publish`
 }
 

mirai-core/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
     kotlin("multiplatform")
     // id("kotlinx-atomicfu")
     kotlin("plugin.serialization")
-    id("net.mamoe.kotlin-jvm-blocking-bridge")
+    id("me.him188.kotlin-jvm-blocking-bridge")
     `maven-publish`
 }
 

mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.contact.file
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.internal.MockBot
 import net.mamoe.mirai.internal.network.notice.BotAware
 import net.mamoe.mirai.internal.network.protocol.data.proto.GroupFileCommon

mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
 import net.mamoe.mirai.event.events.BotJoinGroupEvent

mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.event.events.FriendNickChangedEvent
 import net.mamoe.mirai.internal.network.protocol.data.jce.MsgInfo
 import net.mamoe.mirai.internal.network.protocol.data.jce.MsgType0x210

mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt

@@ -10,7 +10,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent
 import net.mamoe.mirai.event.events.MemberPermissionChangeEvent

mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt

@@ -10,7 +10,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent
 import net.mamoe.mirai.event.events.MemberPermissionChangeEvent

mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent
 import net.mamoe.mirai.event.events.MemberPermissionChangeEvent

mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.MemberJoinEvent
 import net.mamoe.mirai.event.events.MemberJoinRequestEvent

mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.MemberLeaveEvent
 import org.junit.jupiter.api.Test

mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt

@@ -9,7 +9,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.FriendMessageSyncEvent
 import net.mamoe.mirai.event.events.GroupMessageSyncEvent

mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.FriendMessageEvent
 import net.mamoe.mirai.event.events.GroupMessageEvent

mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt

@@ -11,7 +11,7 @@
 
 package net.mamoe.mirai.internal.notice.processors
 
-import net.mamoe.kjbb.JvmBlockingBridge
+import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.event.events.BotMuteEvent
 import net.mamoe.mirai.event.events.BotUnmuteEvent