Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit e608a3d

Browse files
committed
Update excluded dependencies
1 parent dd8a9ef commit e608a3d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,17 @@ internal val IGNORED_DEPENDENCIES_IN_SHADOW = arrayOf(
104104
"net.mamoe:mirai-core-metadata",
105105
"net.mamoe:mirai-core-common",
106106
"net.mamoe:mirai-core-jvm",
107+
"net.mamoe:mirai-core-android",
108+
"net.mamoe:mirai-core-jvmCommon",
109+
"net.mamoe:mirai-core-commonJvm",
107110

108111
"net.mamoe:mirai-core-api", // for future
109112
"net.mamoe:mirai-core-api-metadata",
110113
"net.mamoe:mirai-core-api-common",
111114
"net.mamoe:mirai-core-api-jvm",
115+
"net.mamoe:mirai-core-api-android",
116+
"net.mamoe:mirai-core-api-jvmCommon",
117+
"net.mamoe:mirai-core-api-commonJvm",
112118

113119
"net.mamoe:mirai-core-qqAndroid",
114120
"net.mamoe:mirai-core-qqAndroid-metadata",

tools/gradle-plugin/src/publishing.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ internal data class PluginMetadata(
7676
val artifactId: String,
7777
val version: String,
7878
val description: String?,
79-
val dependencies: List<String>,
80-
val pluginJarSuffix: String
79+
val dependencies: List<String>
8180
)
8281

8382
internal fun String.wrapNameWithPlatform(target: KotlinTarget, isSingleTarget: Boolean): String {
@@ -116,8 +115,7 @@ private fun Project.registerPublishPluginTasks(target: KotlinTarget, isSingleTar
116115
artifactId = mirai.publishing.artifactId ?: project.name,
117116
version = mirai.publishing.version ?: project.version.toString(),
118117
description = mirai.publishing.description ?: project.description,
119-
dependencies = dependencies,
120-
pluginJarSuffix = ".mirai"
118+
dependencies = dependencies
121119
))
122120

123121
logger.info("Generated mirai plugin metadata json: $json")

0 commit comments

Comments
 (0)