github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-04 14:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update excluded dependencies

Browse Source
This commit is contained in:
Him188 2020-12-01 11:19:23 +08:00
parent dd8a9efd4c
commit e608a3dbbc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/gradle-plugin/src/IGNORED_DEPENDENCIES_IN_SHADOW.kt
View File

@ -104,11 +104,17 @@ internal val IGNORED_DEPENDENCIES_IN_SHADOW = arrayOf(
"net.mamoe:mirai-core-metadata", "net.mamoe:mirai-core-metadata",
"net.mamoe:mirai-core-common", "net.mamoe:mirai-core-common",
"net.mamoe:mirai-core-jvm", "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", // for future
"net.mamoe:mirai-core-api-metadata", "net.mamoe:mirai-core-api-metadata",
"net.mamoe:mirai-core-api-common", "net.mamoe:mirai-core-api-common",
"net.mamoe:mirai-core-api-jvm", "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",
"net.mamoe:mirai-core-qqAndroid-metadata", "net.mamoe:mirai-core-qqAndroid-metadata",

6
tools/gradle-plugin/src/publishing.kt
View File

@ -76,8 +76,7 @@ internal data class PluginMetadata(
val artifactId: String, val artifactId: String,
val version: String, val version: String,
val description: String?, val description: String?,
val dependencies: List<String>, val dependencies: List<String>
val pluginJarSuffix: String
) )
internal fun String.wrapNameWithPlatform(target: KotlinTarget, isSingleTarget: Boolean): 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, artifactId = mirai.publishing.artifactId ?: project.name,
version = mirai.publishing.version ?: project.version.toString(), version = mirai.publishing.version ?: project.version.toString(),
description = mirai.publishing.description ?: project.description, description = mirai.publishing.description ?: project.description,
dependencies = dependencies, dependencies = dependencies
pluginJarSuffix = ".mirai"
)) ))
logger.info("Generated mirai plugin metadata json: $json") logger.info("Generated mirai plugin metadata json: $json")