Merge remote-tracking branch 'origin/master' into ci

# Conflicts: # mirai-api-http-spi/build.gradle.kts
project-mirai · Feb 11, 2023 · 6285e63 · 6285e63
2 parents 556bf78 + a0157c4
commit 6285e63
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,10 +36,6 @@ allprojects {
     }
 }
 
-subprojects {
-    plugins.apply("net.mamoe.mirai-console")
-}
-
 nexusStaging {
     packageGroup = "net.mamoe" // from Sonatype accounts, do not change
     username = mavenCentralPublish.credentials?.sonatypeUsername

diff --git a/mirai-api-http-spi/build.gradle.kts b/mirai-api-http-spi/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
     id("kotlinx-atomicfu")
+    id("net.mamoe.mirai-console")
     id("me.him188.maven-central-publish")
 }
 
@@ -26,6 +27,7 @@ tasks {
 }
 
 tasks.register("buildSpi", Jar::class) {
+    dependsOn("jar")
     doLast {
         val jarTask = tasks.getByName("jar", Jar::class)
         val buildPluginFile = jarTask.archiveFile.get().asFile
@@ -42,7 +44,4 @@ mavenCentralPublish {
     githubProject("project-mirai", "mirai-api-http-spi")
     licenseFromGitHubProject("licenseAgplv3", "master")
     developer("Mamoe Technologies")
-    publication {
-        artifact(tasks.getByName("buildSpi"))
-    }
 }
diff --git a/mirai-api-http/build.gradle.kts b/mirai-api-http/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
     id("kotlinx-atomicfu")
+    id("net.mamoe.mirai-console")
     id("me.him188.maven-central-publish")
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,5 +10,5 @@ pluginManagement {
 
 rootProject.name = "mirai-api-http"
 
+include(":mirai-api-http-spi")
 include(":mirai-api-http")
-include("mirai-api-http-spi")