From cfce331583010bc566ee369b1e108fbdb57be8c0 Mon Sep 17 00:00:00 2001 From: Vast Gui Date: Thu, 17 Oct 2024 01:07:51 +0800 Subject: [PATCH] =?UTF-8?q?update(log-slf4j):=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=E8=BF=98=E9=9C=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-compose/build.gradle.kts | 2 ++ app-compose/src/main/AndroidManifest.xml | 10 +++---- .../vastgui/appcompose/ui/LoggerActivity.kt | 29 ++++++++++++------- gradle/libs.versions.toml | 3 ++ libraries/log/slf4j/build.gradle.kts | 4 +-- .../log/vastgui/slf4j/Slf4jEventBuilder.kt | 7 ++--- .../com/log/vastgui/slf4j/Slf4jFactory.kt | 7 +++-- .../com/log/vastgui/slf4j/convert/Convert.kt | 5 ++-- .../java/com/log/vastgui/slf4j/SLF4JTest.java | 3 -- 9 files changed, 39 insertions(+), 31 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 448ec639..2235e51e 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -68,6 +68,7 @@ android { compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 + isCoreLibraryDesugaringEnabled = true } kotlinOptions { @@ -93,6 +94,7 @@ android { dependencies { debugImplementation(libs.ui.test.manifest.compose) + coreLibraryDesugaring(libs.desugar.jdk.libs) implementation(libs.activity.compose) implementation(libs.adapter.rxjava3) implementation(libs.coil.compose) diff --git a/app-compose/src/main/AndroidManifest.xml b/app-compose/src/main/AndroidManifest.xml index c1d431a8..7d916336 100644 --- a/app-compose/src/main/AndroidManifest.xml +++ b/app-compose/src/main/AndroidManifest.xml @@ -9,12 +9,12 @@ - - + + - - + + ("release") { groupId = "io.github.sakurajimamaii" artifactId = "log-slf4j" - version = "1.3.7" + version = "1.3.10" afterEvaluate { from(components["java"]) diff --git a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jEventBuilder.kt b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jEventBuilder.kt index 99761a79..ad449c5b 100644 --- a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jEventBuilder.kt +++ b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jEventBuilder.kt @@ -29,14 +29,12 @@ import java.util.function.Supplier // Author: Vast Gui // Email: guihy2019@gmail.com // Date: 2024/10/12 -// Description: -// Documentation: -// Reference: +// Documentation: https://ave.entropy2020.cn/documents/log/log-slf4j/usage/ /** * Slf4j event builder. * - * @since 1.3.8 + * @since 1.3.10 */ internal class Slf4jEventBuilder( private val logcat: LogCat, @@ -91,7 +89,6 @@ internal class Slf4jEventBuilder( override fun setMessage(messageSupplier: Supplier?): LoggingEventBuilder = apply { - @Suppress("NewApi") this.mMessage = messageSupplier?.get() } diff --git a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jFactory.kt b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jFactory.kt index 180067b1..a06b2564 100644 --- a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jFactory.kt +++ b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/Slf4jFactory.kt @@ -34,14 +34,15 @@ import java.util.concurrent.ConcurrentMap * @since 1.3.7 */ @LogExperimental -internal class Slf4jFactory(val logFactory: LogFactory) : ILoggerFactory { +internal class Slf4jFactory(private val logFactory: LogFactory) : ILoggerFactory { /** @since 1.3.7 */ private val logcatMap: ConcurrentMap = ConcurrentHashMap() - @Suppress("NewApi") override fun getLogger(name: String): Logger { - return logcatMap.computeIfAbsent(name, this::createLogger) + val oldValue: Logger? = logcatMap[name] + if (null != oldValue) return oldValue + return createLogger(name).also { logcatMap.putIfAbsent(name, it) } } /** @since 1.3.7 */ diff --git a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/convert/Convert.kt b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/convert/Convert.kt index 279fc312..782d9c79 100644 --- a/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/convert/Convert.kt +++ b/libraries/log/slf4j/src/main/kotlin/com/log/vastgui/slf4j/convert/Convert.kt @@ -23,11 +23,12 @@ import org.slf4j.event.Level // Author: Vast Gui // Email: guihy2019@gmail.com // Date: 2024/10/12 +// Documentation: https://ave.entropy2020.cn/documents/log/log-slf4j/usage/ /** * Convert [Level] to [LogLevel]. * - * @since 1.3.8 + * @since 1.3.10 */ fun convertLevel(level: Level?): LogLevel { return when (level) { @@ -43,7 +44,7 @@ fun convertLevel(level: Level?): LogLevel { /** * Convert [Marker] to [Marker.getName] or [default]. * - * @since 1.3.8 + * @since 1.3.10 */ fun convertMarker(marker: Marker?, default: String): String { if (marker == null) return default diff --git a/libraries/log/slf4j/src/test/java/com/log/vastgui/slf4j/SLF4JTest.java b/libraries/log/slf4j/src/test/java/com/log/vastgui/slf4j/SLF4JTest.java index 66dc9a2b..942491fa 100644 --- a/libraries/log/slf4j/src/test/java/com/log/vastgui/slf4j/SLF4JTest.java +++ b/libraries/log/slf4j/src/test/java/com/log/vastgui/slf4j/SLF4JTest.java @@ -22,9 +22,6 @@ import org.slf4j.Marker; import org.slf4j.MarkerFactory; -import java.util.HashMap; -import java.util.function.Supplier; - public class SLF4JTest { private static final String TAG = "SLF4JTest";