From a5c3e9f5bae14b5d1a5e8bb3bb2f8d8be8cb88ee Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 4 Mar 2020 09:01:34 +0800
Subject: [PATCH] Misc improvements
---
gradle.properties | 5 +----
mirai-core-qqandroid/build.gradle.kts | 2 +-
.../mirai/qqandroid/network/protocol/packet/PacketFactory.kt | 1 +
mirai-core/build.gradle.kts | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 9dcf67f1e..80f77ed6f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,4 @@ coroutinesVersion=1.3.3
atomicFuVersion=0.14.1
coroutinesIoVersion=0.1.16
# utility
-ktorVersion=1.3.1
-klockVersion=1.7.0
-# gradle plugin
-protobufJavaVersion=3.10.0
\ No newline at end of file
+ktorVersion=1.3.1
\ No newline at end of file
diff --git a/mirai-core-qqandroid/build.gradle.kts b/mirai-core-qqandroid/build.gradle.kts
index 1d6016d6f..84cd2dea5 100644
--- a/mirai-core-qqandroid/build.gradle.kts
+++ b/mirai-core-qqandroid/build.gradle.kts
@@ -13,7 +13,7 @@ val atomicFuVersion: String by rootProject.ext
val coroutinesVersion: String by rootProject.ext
val coroutinesIoVersion: String by rootProject.ext
-val klockVersion: String by rootProject.ext
+
val ktorVersion: String by rootProject.ext
val serializationVersion: String by rootProject.ext
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
index 782c638c9..63bcd2947 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
@@ -343,6 +343,7 @@ internal object KnownPacketFactories {
ssoSequenceId: Int,
consumer: PacketConsumer<T>
) {
+ @Suppress("DuplicatedCode")
check(readByte().toInt() == 2)
this.discardExact(2) // 27 + 2 + body.size
this.discardExact(2) // const, =8001
diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts
index 91f806813..09dde5fb6 100644
--- a/mirai-core/build.gradle.kts
+++ b/mirai-core/build.gradle.kts
@@ -13,7 +13,7 @@ val atomicFuVersion: String by rootProject.ext
val coroutinesVersion: String by rootProject.ext
val coroutinesIoVersion: String by rootProject.ext
-val klockVersion: String by rootProject.ext
+
val ktorVersion: String by rootProject.ext
val serializationVersion: String by rootProject.ext