Merge branch 'master' into dev

Author: ryoii

.github/workflows/publish.yml

@@ -33,9 +33,9 @@ jobs:
         env:
           PUBLICATION_CREDENTIALS: ${{ secrets.PUBLICATION_CREDENTIALS }}
 
-      - name: Gradle closeRepository
-        run: >
-          ./gradlew mirai-api-http:closeRepository --info --stacktrace --scan
-        env:
-          PUBLICATION_CREDENTIALS: ${{ secrets.PUBLICATION_CREDENTIALS }}
+#      - name: Gradle closeRepository
+#        run: >
+#          ./gradlew mirai-api-http:closeRepository --info --stacktrace --scan
+#        env:
+#          PUBLICATION_CREDENTIALS: ${{ secrets.PUBLICATION_CREDENTIALS }}
 

.github/workflows/release.yml

@@ -58,5 +58,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./mirai-api-http/build/ci/mirai-api-http.jar
-          asset_name: mirai-api-http-${{ steps.tag.outputs.tag }}.mirai.jar
+          asset_name: mirai-api-http-${{ steps.tag.outputs.tag }}.mirai2.jar
           asset_content_type: application/zip

CHANGELOG.md

@@ -1,5 +1,18 @@
 # 更新日志
 
+
+## \[2.5.1\] - 2022-5-15
+
+### 修复
+
++ 修复获取文件接口没有返回目录的信息 (#571)
+
+### 变更
+
++ 各种原因，`2.5.1`, 包括 `2.5.0` 仅支持 core `2.11`
+
+
+
 ## \[2.5.0\] - 2022-2-17
 
 ### 修复

gradle.properties

@@ -5,7 +5,7 @@ kotlin.incremental.multiplatform=true
 org.gradle.parallel=true
 
 # build
-httpVersion=2.5.0
+httpVersion=2.5.1
 
 # kotlin
 kotlinVersion=1.6.0

mirai-api-http/build.gradle.kts

@@ -1,3 +1,5 @@
+import net.mamoe.mirai.console.gradle.BuildMiraiPluginV2
+
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
@@ -49,7 +51,7 @@ description = "Mirai HTTP API plugin"
 tasks.register("buildCiJar", Jar::class) {
     dependsOn("buildPlugin")
     doLast {
-        val buildPluginTask = tasks.getByName("buildPlugin", Jar::class)
+        val buildPluginTask = tasks.getByName("buildPlugin", BuildMiraiPluginV2::class)
         val buildPluginFile = buildPluginTask.archiveFile.get().asFile
         project.buildDir.resolve("ci").also {
             it.mkdirs()

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/HttpApiPluginBase.kt

@@ -24,7 +24,7 @@ import java.io.File
  * 主要职责为读取配置文件 [MainSetting] 和 启动具体实现 [MahPluginImpl]
  */
 object HttpApiPluginBase : KotlinPlugin(
-    JvmPluginDescription(id = "net.mamoe.mirai-api-http", version = "2.5.0") {
+    JvmPluginDescription(id = "net.mamoe.mirai-api-http", version = "2.5.1") {
         author("ryoii")
         info("Mirai HTTP API Server Plugin")
     }