Jelajahi Sumber

Update kotlin and dependencies

ryoii 4 tahun lalu
induk
melakukan
b1a003f3c2

+ 2 - 3
gradle.properties

@@ -9,6 +9,5 @@ kotlin.parallel.tasks.in.project=true
 httpVersion=2.0.2
 
 # kotlin
-kotlinVersion=1.4.30
-serializationVersion=1.1.0
-ktorVersion=1.5.1
+kotlinVersion=1.5.10
+ktorVersion=1.5.4

+ 6 - 2
mirai-api-http/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
-    id("net.mamoe.mirai-console") version "2.6.4"
+    id("net.mamoe.mirai-console") version "2.7-M1"
 }
 
 val ktorVersion: String by rootProject.extra
@@ -90,4 +90,8 @@ tasks {
     compileTestKotlin {
         kotlinOptions.jvmTarget = "1.8"
     }
-}
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile::class.java) {
+    kotlinOptions.freeCompilerArgs += "-XXLanguage:-JvmIrEnabledByDefault"
+}

+ 10 - 0
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/http/dto/parameters.kt

@@ -0,0 +1,10 @@
+package net.mamoe.mirai.api.http.adapter.http.dto
+
+import kotlinx.serialization.Serializable
+import net.mamoe.mirai.api.http.adapter.http.session.HttpAuthedSession
+import net.mamoe.mirai.api.http.adapter.internal.dto.AuthedDTO
+
+@Serializable
+internal class CountDTO(val count: Int = 10) : AuthedDTO() {
+    val unreadQueue get() = (session as HttpAuthedSession).unreadQueue
+}

+ 1 - 9
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/http/router/message.kt

@@ -4,6 +4,7 @@ import io.ktor.application.*
 import io.ktor.http.content.*
 import io.ktor.routing.*
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.api.http.adapter.http.dto.CountDTO
 import net.mamoe.mirai.api.http.adapter.http.session.HttpAuthedSession
 import net.mamoe.mirai.api.http.adapter.internal.action.*
 import net.mamoe.mirai.api.http.adapter.internal.consts.Paths
@@ -19,15 +20,6 @@ import net.mamoe.mirai.utils.MiraiExperimentalApi
  */
 @OptIn(MiraiExperimentalApi::class)
 internal fun Application.messageRouter() = routing {
-
-    /**
-     * 计数数据传输对象
-     */
-    @Serializable
-    class CountDTO(val count: Int = 10) : AuthedDTO() {
-        val unreadQueue get() = (session as HttpAuthedSession).unreadQueue
-    }
-
     /**
      * 获取未读消息剩余消息数量
      */