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

[core/logging] Bind slf4j to 2.x; Bump log4j to 2.19.0

Browse Source
This commit is contained in:
Karlatemp 2022-11-11 13:35:34 +08:00 committed by Him188
parent 6c295723db
commit 1844d19602
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/Versions.kt
View File

@ -61,7 +61,7 @@ object Versions {
const val logback = "1.2.5" const val logback = "1.2.5"
const val slf4j = "2.0.3" const val slf4j = "2.0.3"
const val log4j = "2.17.2" const val log4j = "2.19.0"
const val asm = "9.4" const val asm = "9.4"
const val difflib = "1.3.0" const val difflib = "1.3.0"
const val netty = "4.1.63.Final" const val netty = "4.1.63.Final"
@ -230,7 +230,7 @@ const val `slf4j-simple` = "org.slf4j:slf4j-simple:" + Versions.slf4j
const val `log4j-api` = "org.apache.logging.log4j:log4j-api:" + Versions.log4j const val `log4j-api` = "org.apache.logging.log4j:log4j-api:" + Versions.log4j
const val `log4j-core` = "org.apache.logging.log4j:log4j-core:" + Versions.log4j const val `log4j-core` = "org.apache.logging.log4j:log4j-core:" + Versions.log4j
const val `log4j-slf4j-impl` = "org.apache.logging.log4j:log4j-slf4j-impl:" + Versions.log4j const val `log4j-slf4j2-impl` = "org.apache.logging.log4j:log4j-slf4j2-impl:" + Versions.log4j
const val `log4j-to-slf4j` = "org.apache.logging.log4j:log4j-to-slf4j:" + Versions.log4j const val `log4j-to-slf4j` = "org.apache.logging.log4j:log4j-to-slf4j:" + Versions.log4j
val ATTRIBUTE_MIRAI_TARGET_PLATFORM: Attribute<String> = Attribute.of("mirai.target.platform", String::class.java) val ATTRIBUTE_MIRAI_TARGET_PLATFORM: Attribute<String> = Attribute.of("mirai.target.platform", String::class.java)

2
logging/mirai-logging-log4j2/build.gradle.kts
View File

@ -26,7 +26,7 @@ dependencies {
api(project(":mirai-core-api")) api(project(":mirai-core-api"))
api(`log4j-api`) api(`log4j-api`)
api(`log4j-core`) api(`log4j-core`)
api(`log4j-slf4j-impl`) api(`log4j-slf4j2-impl`)
testImplementation(`slf4j-api`) testImplementation(`slf4j-api`)

2
logging/mirai-logging-slf4j-logback/build.gradle.kts
View File

@ -26,7 +26,7 @@ dependencies {
api(project(":mirai-core-api")) api(project(":mirai-core-api"))
api(project(":mirai-logging-slf4j")) // mirai -> slf4j api(project(":mirai-logging-slf4j")) // mirai -> slf4j
implementation(project(":mirai-logging-log4j2")) { implementation(project(":mirai-logging-log4j2")) {
exclude("org.apache.logging.log4j", "log4j-slf4j-impl") exclude("org.apache.logging.log4j", "log4j-slf4j2-impl")
} // mirai -> log4j2 } // mirai -> log4j2
api(`slf4j-api`) api(`slf4j-api`)
api(`logback-classic`) api(`logback-classic`)

2
logging/mirai-logging-slf4j/build.gradle.kts
View File

@ -25,7 +25,7 @@ kotlin {
dependencies { dependencies {
api(project(":mirai-core-api")) api(project(":mirai-core-api"))
implementation(project(":mirai-logging-log4j2")) { implementation(project(":mirai-logging-log4j2")) {
exclude("org.apache.logging.log4j", "log4j-slf4j-impl") exclude("org.apache.logging.log4j", "log4j-slf4j2-impl")
} // mirai -> log4j2 } // mirai -> log4j2
implementation(`log4j-to-slf4j`) // log4j2 -> slf4j implementation(`log4j-to-slf4j`) // log4j2 -> slf4j
api(`slf4j-api`) api(`slf4j-api`)