[build] Use modified shadow plugin to fix ASM mapping issues. Close #2230.

This commit is contained in:
Him188 2022-09-20 18:45:20 +08:00
parent bf362f9d75
commit 00db1fe187
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
3 changed files with 12 additions and 9 deletions

View File

@ -16,6 +16,7 @@ repositories {
google()
mavenCentral()
gradlePluginPortal()
maven("https://repo.mirai.mamoe.net/keep") // for modified shadow plugin
}
kotlin {
@ -49,7 +50,9 @@ dependencies {
// compileOnly(kotlin("gradle-plugin-api", "1.3.72")) // Gradle's Kotlin is 1.3.72
api("com.github.jengelman.gradle.plugins", "shadow", version("shadow"))
// api("com.github.jengelman.gradle.plugins", "shadow", version("shadow"))
api("com.github.johnrengelman", "shadow", version("shadow"))
api("org.jetbrains.kotlin", "kotlin-gradle-plugin", version("kotlinCompiler"))
// api("org.jetbrains.kotlin", "kotlin-compiler-embeddable", version("kotlinCompiler"))
// api(ktor("client-okhttp", "1.4.3"))

View File

@ -1,10 +1,10 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
* Copyright 2019-2022 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
@file:Suppress(
@ -85,9 +85,9 @@ inline fun Project.configurePublishing(
archiveClassifier.set("all")
manifest.inheritFrom(tasks.getByName<Jar>("jar").manifest)
from(project.sourceSets["main"].output)
configurations = mutableListOf(
project.configurations.findByName("runtimeClasspath") ?: project.configurations["runtime"]
)
configurations =
listOfNotNull(project.configurations.findByName("runtimeClasspath") ?: project.configurations["runtime"])
exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "module-info.class")
}

View File

@ -46,7 +46,7 @@ object Versions {
const val androidGradlePlugin = "4.1.1"
const val android = "4.1.1.4"
const val shadow = "6.1.0"
const val shadow = "7.1.3-mirai-modified-SNAPSHOT"
const val logback = "1.2.5"
const val slf4j = "1.7.32"