diff --git a/build.gradle.kts b/build.gradle.kts index 8dd22378..f8efcd47 100644 --- 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 index 1d07bc56..0b1d7b24 100644 --- 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")) - } } \ No newline at end of file diff --git a/mirai-api-http/build.gradle.kts b/mirai-api-http/build.gradle.kts index 3c675f31..ce922137 100644 --- 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 index 613105b7..3710b609 100644 --- 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")