From e608a3dbbc17367af52451ec32244c8e1ef5f770 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 1 Dec 2020 11:19:23 +0800
Subject: [PATCH] Update excluded dependencies

---
 tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt | 6 ++++++
 tools/gradle-plugin/src/publishing.kt                     | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt b/tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt
index ddc9951d9..bfb70ca94 100644
--- a/tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt
+++ b/tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt
@@ -104,11 +104,17 @@ internal val IGNORED_DEPENDENCIES_IN_SHADOW = arrayOf(
     "net.mamoe:mirai-core-metadata",
     "net.mamoe:mirai-core-common",
     "net.mamoe:mirai-core-jvm",
+    "net.mamoe:mirai-core-android",
+    "net.mamoe:mirai-core-jvmCommon",
+    "net.mamoe:mirai-core-commonJvm",
 
     "net.mamoe:mirai-core-api", // for future
     "net.mamoe:mirai-core-api-metadata",
     "net.mamoe:mirai-core-api-common",
     "net.mamoe:mirai-core-api-jvm",
+    "net.mamoe:mirai-core-api-android",
+    "net.mamoe:mirai-core-api-jvmCommon",
+    "net.mamoe:mirai-core-api-commonJvm",
 
     "net.mamoe:mirai-core-qqAndroid",
     "net.mamoe:mirai-core-qqAndroid-metadata",
diff --git a/tools/gradle-plugin/src/publishing.kt b/tools/gradle-plugin/src/publishing.kt
index f899af944..39482d1d7 100644
--- a/tools/gradle-plugin/src/publishing.kt
+++ b/tools/gradle-plugin/src/publishing.kt
@@ -76,8 +76,7 @@ internal data class PluginMetadata(
     val artifactId: String,
     val version: String,
     val description: String?,
-    val dependencies: List<String>,
-    val pluginJarSuffix: String
+    val dependencies: List<String>
 )
 
 internal fun String.wrapNameWithPlatform(target: KotlinTarget, isSingleTarget: Boolean): String {
@@ -116,8 +115,7 @@ private fun Project.registerPublishPluginTasks(target: KotlinTarget, isSingleTar
                     artifactId = mirai.publishing.artifactId ?: project.name,
                     version = mirai.publishing.version ?: project.version.toString(),
                     description = mirai.publishing.description ?: project.description,
-                    dependencies = dependencies,
-                    pluginJarSuffix = ".mirai"
+                    dependencies = dependencies
                 ))
 
                 logger.info("Generated mirai plugin metadata json: $json")