nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: convert Log from expect/actual to filtered wrapper over PlatformLog

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
davotoula
2026-03-28 01:10:52 +01:00
parent 65bc617222
commit 25b2cb42d0
5 changed files with 23 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/utils/Log.android.kt
-61
View File
@@ -1,61 +0,0 @@
/*
* Copyright (c) 2025 Vitor Pamplona
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
* Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package com.vitorpamplona.quartz.utils
actual object Log {
actual fun w(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
android.util.Log.w(tag, message, throwable)
} else {
android.util.Log.w(tag, message)
}
}
actual fun e(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
android.util.Log.e(tag, message, throwable)
} else {
android.util.Log.e(tag, message)
}
}
actual fun d(
tag: String,
message: String,
) {
android.util.Log.d(tag, message)
}
actual fun i(
tag: String,
message: String,
) {
android.util.Log.i(tag, message)
}
}
quartz/src/appleMain/kotlin/com/vitorpamplona/quartz/utils/Log.apple.kt
-63
View File
@@ -1,63 +0,0 @@
/*
* Copyright (c) 2025 Vitor Pamplona
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
* Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package com.vitorpamplona.quartz.utils
import platform.Foundation.NSLog
actual object Log {
actual fun w(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
NSLog("WARN: [$tag] $message. Throwable: $throwable CAUSE ${throwable.cause}")
} else {
NSLog("WARN: [$tag] $message")
}
}
actual fun e(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
NSLog("ERROR: [$tag] $message. Throwable: $throwable CAUSE ${throwable.cause}")
} else {
NSLog("ERROR: [$tag] $message")
}
}
actual fun d(
tag: String,
message: String,
) {
NSLog("DEBUG: [$tag] $message")
}
actual fun i(
tag: String,
message: String,
) {
NSLog("INFO: [$tag] $message")
}
}
quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/PlatformLog.ios.kt → quartz/src/appleMain/kotlin/com/vitorpamplona/quartz/utils/PlatformLog.apple.kt
View File
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/Log.kt
+23 -13
View File
@@ -20,26 +20,36 @@
*/
package com.vitorpamplona.quartz.utils
expect object Log {
object Log {
@Volatile var minLevel: LogLevel = LogLevel.DEBUG
fun d(
tag: String,
message: String,
) {
if (minLevel <= LogLevel.DEBUG) PlatformLog.d(tag, message)
}
fun i(
tag: String,
message: String,
) {
if (minLevel <= LogLevel.INFO) PlatformLog.i(tag, message)
}
fun w(
tag: String,
message: String,
throwable: Throwable? = null,
)
) {
if (minLevel <= LogLevel.WARN) PlatformLog.w(tag, message, throwable)
}
fun e(
tag: String,
message: String,
throwable: Throwable? = null,
)
fun d(
tag: String,
message: String,
)
fun i(
tag: String,
message: String,
)
) {
if (minLevel <= LogLevel.ERROR) PlatformLog.e(tag, message, throwable)
}
}
quartz/src/jvmMain/kotlin/com/vitorpamplona/quartz/utils/Log.jvm.kt
-69
View File
@@ -1,69 +0,0 @@
/*
* Copyright (c) 2025 Vitor Pamplona
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
* Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package com.vitorpamplona.quartz.utils
import java.time.LocalTime
import java.time.format.DateTimeFormatter
actual object Log {
// Define a formatter for the desired output format (e.g., HH:mm:ss)
val formatter: DateTimeFormatter? = DateTimeFormatter.ofPattern("HH:mm:ss.SSS")
fun time() = LocalTime.now().format(formatter)
actual fun w(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
println("${time()} WARN : [$tag] $message. Throwable: ${throwable.message}")
} else {
println("${time()} WARN : [$tag] $message")
}
}
actual fun e(
tag: String,
message: String,
throwable: Throwable?,
) {
if (throwable != null) {
println("${time()} ERROR: [$tag] $message. Throwable: ${throwable.message}")
} else {
println("${time()} ERROR: [$tag] $message")
}
}
actual fun d(
tag: String,
message: String,
) {
println("${time()} DEBUG: [$tag] $message")
}
actual fun i(
tag: String,
message: String,
) {
println("${time()} INFO : [$tag] $message")
}
}