From 121b51982c9fd3f29c08d01d5c24b3c34f05ed97 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 19 Aug 2020 20:36:57 +0800
Subject: [PATCH] 1.2.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5df16fca2..54d6617b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Version 1.x
 
+## `1.2.1`  2020/8/19
+- 修复在 Java 调用 `group.uploadImage` 时编译出错的问题 (#511)
+- 更新 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"