From 7faf630454957a37410b196dc2c7948223a571fc Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sun, 12 Dec 2021 14:37:01 +0000
Subject: [PATCH] Update kotlin-jvm-blocking-bridge to 2.0.0-160.2

---
 binary-compatibility-validator/android/build.gradle.kts       | 2 +-
 binary-compatibility-validator/build.gradle.kts               | 2 +-
 build.gradle.kts                                              | 4 ++--
 buildSrc/src/main/kotlin/Versions.kt                          | 2 +-
 gradle.properties                                             | 2 +-
 mirai-console/backend/mirai-console/build.gradle.kts          | 2 +-
 .../backend/mirai-console/src/command/CommandManager.kt       | 2 +-
 .../backend/mirai-console/src/command/CommandSender.kt        | 2 +-
 mirai-console/backend/mirai-console/src/util/ConsoleInput.kt  | 2 +-
 mirai-console/backend/mirai-console/src/util/MessageScope.kt  | 2 +-
 mirai-console/tools/intellij-plugin/build.gradle.kts          | 2 ++
 mirai-core-all/build.gradle.kts                               | 2 +-
 mirai-core-api/build.gradle.kts                               | 2 +-
 mirai-core-api/src/commonMain/kotlin/Bot.kt                   | 2 +-
 mirai-core-api/src/commonMain/kotlin/IMirai.kt                | 2 +-
 mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt   | 2 +-
 .../src/commonMain/kotlin/contact/AudioSupported.kt           | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/Contact.kt       | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/Friend.kt        | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/Group.kt         | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/Member.kt        | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt  | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/Stranger.kt      | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/User.kt          | 2 +-
 .../commonMain/kotlin/contact/announcement/Announcement.kt    | 2 +-
 .../commonMain/kotlin/contact/announcement/Announcements.kt   | 2 +-
 .../kotlin/contact/announcement/OnlineAnnouncement.kt         | 2 +-
 .../src/commonMain/kotlin/contact/file/AbsoluteFile.kt        | 2 +-
 .../src/commonMain/kotlin/contact/file/AbsoluteFileFolder.kt  | 2 +-
 .../src/commonMain/kotlin/contact/file/AbsoluteFolder.kt      | 2 +-
 .../src/commonMain/kotlin/contact/file/RemoteFiles.kt         | 2 +-
 .../src/commonMain/kotlin/contact/roaming/RoamingMessages.kt  | 2 +-
 .../src/commonMain/kotlin/contact/roaming/RoamingSupported.kt | 2 +-
 mirai-core-api/src/commonMain/kotlin/data/RequestEventData.kt | 2 +-
 mirai-core-api/src/commonMain/kotlin/event/events/friend.kt   | 2 +-
 mirai-core-api/src/commonMain/kotlin/event/events/group.kt    | 2 +-
 .../src/commonMain/kotlin/message/MessageReceipt.kt           | 2 +-
 .../src/commonMain/kotlin/message/action/AsyncRecallResult.kt | 2 +-
 mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt  | 2 +-
 .../src/commonMain/kotlin/message/data/FileMessage.kt         | 2 +-
 mirai-core-api/src/commonMain/kotlin/message/data/Image.kt    | 2 +-
 .../src/commonMain/kotlin/message/data/MessageSource.kt       | 2 +-
 .../src/commonMain/kotlin/utils/ExternalResource.kt           | 4 ++--
 mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt      | 2 +-
 .../src/jvmTest/kotlin/event/EventLaunchUndispatchedTest.kt   | 2 +-
 mirai-core-utils/build.gradle.kts                             | 2 +-
 mirai-core/build.gradle.kts                                   | 2 +-
 .../src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt  | 2 +-
 .../commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt | 2 +-
 .../kotlin/notice/processors/FriendNickChangeTest.kt          | 2 +-
 .../commonTest/kotlin/notice/processors/GroupRetrieveTest.kt  | 2 +-
 .../commonTest/kotlin/notice/processors/GroupTransferTest.kt  | 2 +-
 .../kotlin/notice/processors/MemberAdminChangeTest.kt         | 2 +-
 .../src/commonTest/kotlin/notice/processors/MemberJoinTest.kt | 2 +-
 .../src/commonTest/kotlin/notice/processors/MemberQuitTest.kt | 2 +-
 .../commonTest/kotlin/notice/processors/MessageSyncTest.kt    | 2 +-
 .../src/commonTest/kotlin/notice/processors/MessageTest.kt    | 2 +-
 .../src/commonTest/kotlin/notice/processors/MuteTest.kt       | 2 +-
 58 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/binary-compatibility-validator/android/build.gradle.kts b/binary-compatibility-validator/android/build.gradle.kts
index cd416daae..b6fbebda7 100644
--- a/binary-compatibility-validator/android/build.gradle.kts
+++ b/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"
diff --git a/binary-compatibility-validator/build.gradle.kts b/binary-compatibility-validator/build.gradle.kts
index 61246859e..590c25134 100644
--- a/binary-compatibility-validator/build.gradle.kts
+++ b/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"
diff --git a/build.gradle.kts b/build.gradle.kts
index 0cb695b25..632effbeb 100644
--- a/build.gradle.kts
+++ b/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
             }
         }
 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 8c6fff48d..74008a168 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/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"
diff --git a/gradle.properties b/gradle.properties
index 7b10f90aa..e18c14720 100644
--- a/gradle.properties
+++ b/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
\ No newline at end of file
+systemProp.use.maven.local=true
\ No newline at end of file
diff --git a/mirai-console/backend/mirai-console/build.gradle.kts b/mirai-console/backend/mirai-console/build.gradle.kts
index 8681441f6..069ef4e47 100644
--- a/mirai-console/backend/mirai-console/build.gradle.kts
+++ b/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
diff --git a/mirai-console/backend/mirai-console/src/command/CommandManager.kt b/mirai-console/backend/mirai-console/src/command/CommandManager.kt
index 87a0def1d..47d22ef14 100644
--- a/mirai-console/backend/mirai-console/src/command/CommandManager.kt
+++ b/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
diff --git a/mirai-console/backend/mirai-console/src/command/CommandSender.kt b/mirai-console/backend/mirai-console/src/command/CommandSender.kt
index 4314f0aac..f70bd0321 100644
--- a/mirai-console/backend/mirai-console/src/command/CommandSender.kt
+++ b/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
diff --git a/mirai-console/backend/mirai-console/src/util/ConsoleInput.kt b/mirai-console/backend/mirai-console/src/util/ConsoleInput.kt
index 899f866eb..ef8ed0cce 100644
--- a/mirai-console/backend/mirai-console/src/util/ConsoleInput.kt
+++ b/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
 
diff --git a/mirai-console/backend/mirai-console/src/util/MessageScope.kt b/mirai-console/backend/mirai-console/src/util/MessageScope.kt
index 2194312f3..04f1ea007 100644
--- a/mirai-console/backend/mirai-console/src/util/MessageScope.kt
+++ b/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
diff --git a/mirai-console/tools/intellij-plugin/build.gradle.kts b/mirai-console/tools/intellij-plugin/build.gradle.kts
index f6dedd2b0..ee7b01ccd 100644
--- a/mirai-console/tools/intellij-plugin/build.gradle.kts
+++ b/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"
     }
 }
diff --git a/mirai-core-all/build.gradle.kts b/mirai-core-all/build.gradle.kts
index 08485b129..35ae7470d 100644
--- a/mirai-core-all/build.gradle.kts
+++ b/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
diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts
index 49ea51b91..ad5d22fbf 100644
--- a/mirai-core-api/build.gradle.kts
+++ b/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`
 }
diff --git a/mirai-core-api/src/commonMain/kotlin/Bot.kt b/mirai-core-api/src/commonMain/kotlin/Bot.kt
index 14b207393..e65f80e6f 100644
--- a/mirai-core-api/src/commonMain/kotlin/Bot.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/IMirai.kt b/mirai-core-api/src/commonMain/kotlin/IMirai.kt
index a8b283f6d..109d5e6e0 100644
--- a/mirai-core-api/src/commonMain/kotlin/IMirai.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt b/mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt
index 8f5e6289f..36f5983fb 100644
--- a/mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/AudioSupported.kt b/mirai-core-api/src/commonMain/kotlin/contact/AudioSupported.kt
index 77138f320..296468cc0 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/AudioSupported.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt b/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt
index e3424cc1d..a28a863b7 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt b/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt
index 37dacdea1..a02f410b1 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt
+++ b/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.*
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Group.kt b/mirai-core-api/src/commonMain/kotlin/contact/Group.kt
index 5e621963a..81766be76 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/Group.kt
+++ b/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.*
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Member.kt b/mirai-core-api/src/commonMain/kotlin/contact/Member.kt
index e8b5d0cab..caa6f1f10 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/Member.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt b/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt
index 18570a85e..156f6f768 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Stranger.kt b/mirai-core-api/src/commonMain/kotlin/contact/Stranger.kt
index 357307be3..3fc4af6e0 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/Stranger.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/User.kt b/mirai-core-api/src/commonMain/kotlin/contact/User.kt
index 5c4243398..dbbacb21c 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/User.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcement.kt b/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcement.kt
index a8a93e146..e8cab2df5 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcement.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt b/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt
index 5dc9ab3c1..f5b16281b 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/announcement/OnlineAnnouncement.kt b/mirai-core-api/src/commonMain/kotlin/contact/announcement/OnlineAnnouncement.kt
index d330ae833..0df92e350 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/announcement/OnlineAnnouncement.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFile.kt b/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFile.kt
index 50bb566b1..bdab71479 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFile.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFileFolder.kt b/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFileFolder.kt
index 71d1f2991..22628abf0 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFileFolder.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFolder.kt b/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFolder.kt
index aa441e742..e05ab314e 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/file/AbsoluteFolder.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/file/RemoteFiles.kt b/mirai-core-api/src/commonMain/kotlin/contact/file/RemoteFiles.kt
index 67a93b33f..f1215b27c 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/file/RemoteFiles.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingMessages.kt b/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingMessages.kt
index 1a96f2666..159d9ac11 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingMessages.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingSupported.kt b/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingSupported.kt
index a9cb8341c..dc3f07ac6 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/roaming/RoamingSupported.kt
+++ b/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
 
 /**
diff --git a/mirai-core-api/src/commonMain/kotlin/data/RequestEventData.kt b/mirai-core-api/src/commonMain/kotlin/data/RequestEventData.kt
index 517ef364f..03136a132 100644
--- a/mirai-core-api/src/commonMain/kotlin/data/RequestEventData.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt b/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
index f8b9e9e59..83642967d 100644
--- a/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/event/events/group.kt b/mirai-core-api/src/commonMain/kotlin/event/events/group.kt
index 064a50051..624d69398 100644
--- a/mirai-core-api/src/commonMain/kotlin/event/events/group.kt
+++ b/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.*
diff --git a/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt b/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt
index 311738ef3..528a99e35 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/message/action/AsyncRecallResult.kt b/mirai-core-api/src/commonMain/kotlin/message/action/AsyncRecallResult.kt
index 598baa16d..1a44c0fd9 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/action/AsyncRecallResult.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt b/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
index 869010e32..29731e547 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
+++ b/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.*
diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/FileMessage.kt b/mirai-core-api/src/commonMain/kotlin/message/data/FileMessage.kt
index a42bd0b7b..ab511b4aa 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/data/FileMessage.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/Image.kt b/mirai-core-api/src/commonMain/kotlin/message/data/Image.kt
index 08017cb35..0e2ce382d 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/data/Image.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt b/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
index 4e266980d..3975292fc 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
+++ b/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
diff --git a/mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt b/mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt
index b4b701b66..52d92fef0 100644
--- a/mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt
+++ b/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)
diff --git a/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt b/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt
index 39114f386..fed1056a5 100644
--- a/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt
+++ b/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
diff --git a/mirai-core-api/src/jvmTest/kotlin/event/EventLaunchUndispatchedTest.kt b/mirai-core-api/src/jvmTest/kotlin/event/EventLaunchUndispatchedTest.kt
index ad1bfe5a5..46d54ffdf 100644
--- a/mirai-core-api/src/jvmTest/kotlin/event/EventLaunchUndispatchedTest.kt
+++ b/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
diff --git a/mirai-core-utils/build.gradle.kts b/mirai-core-utils/build.gradle.kts
index a081cb504..c26c54c6a 100644
--- a/mirai-core-utils/build.gradle.kts
+++ b/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`
 }
 
diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts
index f733c44a7..ab76907c5 100644
--- a/mirai-core/build.gradle.kts
+++ b/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`
 }
 
diff --git a/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt b/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt
index b69cc9a7d..f28676b4e 100644
--- a/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt
index c27531cd3..21f7da63a 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt
index 1779d2095..1dd32d7dc 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt
index 3ea8a4777..6479a089c 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt
index 095b5693a..dec19f7a3 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt
index 7b49d3747..3e3d5a1e7 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt
index f1e4b5046..a9dc858a2 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt
index a12609d87..8359c959d 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt
index 9d5fcc496..820863d76 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt
index 857cc577b..a2aa2d1b4 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt
+++ b/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
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt
index 618cf5452..b8d480f53 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt
+++ b/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