From 0dd49742505d542b1e831c4af3edf6f1446634b8 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 19 Aug 2020 20:42:40 +0800
Subject: [PATCH 1/2] Add blocking bridge for group.uploadVoice, close #512

---
 .../net/mamoe/mirai/qqandroid/contact/GroupImpl.kt       | 1 -
 .../commonMain/kotlin/net.mamoe.mirai/contact/Group.kt   | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
index fdcb9ae9f..abd815a7c 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
@@ -455,7 +455,6 @@ internal class GroupImpl(
      * @throws EventCancelledException 当发送消息事件被取消
      * @throws OverFileSizeMaxException 当语音文件过大而被服务器拒绝上传时. (最大大小约为 1 MB)
      */
-    @JvmSynthetic
     @MiraiExperimentalAPI
     @SinceMirai("1.2.0")
     override suspend fun uploadVoice(input: InputStream): Voice {
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
index a1ecec8d8..69cbcc9e8 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
@@ -12,6 +12,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
+import net.mamoe.kjbb.JvmBlockingBridge
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.LowLevelAPI
@@ -175,12 +176,14 @@ public abstract class Group : Contact(), CoroutineScope {
     /**
      * 上传一个语音消息以备发送.
      * 请手动关闭输入流
-     * 请使用amr或silk格式
-     * 请注意，这是一个实验性api且随时会被删除
+     * 请使用 amr 或 silk 格式
+     *
+     * @suppress 这是一个实验性 API 且随时会被删除
+     *
      * @throws EventCancelledException 当发送消息事件被取消
      * @throws OverFileSizeMaxException 当语音文件过大而被服务器拒绝上传时. (最大大小约为 1 MB)
      */
-    @JvmSynthetic
+    @JvmBlockingBridge
     @MiraiExperimentalAPI
     @SinceMirai("1.2.0")
     public abstract suspend fun uploadVoice(input: InputStream): Voice

From 5c6aeb826278a6020712a6dd2514aee3d703df4f Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 19 Aug 2020 20:43:43 +0800
Subject: [PATCH 2/2] 1.2.1

---
 CHANGELOG.md                         | 5 +++++
 buildSrc/src/main/kotlin/Versions.kt | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5df16fca2..3f49ee1ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Version 1.x
 
+## `1.2.1`  2020/8/19
+- 修复在 Java 调用 `group.uploadImage` 时编译出错的问题 (#511)
+- 为 `group.uploadVoice` 添加 Java 方法 (需要 [kotlin-jvm-blocking-bridge](https://github.com/mamoe/kotlin-jvm-blocking-bridge)) (#512)
+- 更新 ktor 到 1.4.0
+
 ## `1.2.0`  2020/8/19
 
 ### 新特性
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 973897d83..f0a7dbb5d 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -9,7 +9,7 @@
 
 object Versions {
     object Mirai {
-        const val version = "1.2.0"
+        const val version = "1.2.1"
     }
 
     object Kotlin {
@@ -18,7 +18,7 @@ object Versions {
         const val coroutines = "1.3.9"
         const val atomicFU = "0.14.4"
         const val serialization = "1.0.0-RC"
-        const val ktor = "1.3.2-1.4.0-rc"
+        const val ktor = "1.4.0"
         const val binaryValidator = "0.2.3"
 
         const val io = "0.1.16"