Release0.8

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.8
+
+- Update to Kotlin 2.1.0
+- Added: w(TAG, Throwable) for logging exceptions as warnings w/o providing a message
+
 ## 0.7
 
 - Update to Kotlin 2.0.20

build-plugins/src/main/kotlin/root.publication.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 
 allprojects {
     group = "de.halfbit"
-    version = "0.7"
+    version = "0.8"
 }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.7.2"
-kotlin = "2.0.21"
+agp = "8.7.3"
+kotlin = "2.1.0"
 
 android-minSdk = "24"
 android-compileSdk = "34"

logger/build.gradle.kts

@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {

logger/src/appleMain/kotlin/de/halfbit/logger/LogTag.apple.kt

@@ -15,8 +15,14 @@ import platform.Foundation.NSThread
 public fun autoTag(loggableLevel: LoggableLevel = Everything): LogTag =
     namedTag(name = detectTag(), loggableLevel = loggableLevel)
 
+private const val ENABLE_DEBUG_TRACES = false
+
 private fun detectTag(): String {
     val callstack = NSThread.callStackSymbols
+    if (ENABLE_DEBUG_TRACES) {
+        println("===============================")
+        println(callstack.joinToString("\n"))
+    }
     val element = callstack.getOrNull(3)?.toString() ?: throwAutoTagFailed()
     return element.cleanClassName
 }
@@ -30,6 +36,7 @@ private val String.cleanClassName: String
 
         var cleanClassName =
             substring(0, endIndex)
+                .removeSuffix(".<init>")
                 .removeSuffix(".Companion")
 
         if (cleanClassName.endsWith(".\$init_global")) {
@@ -43,6 +50,10 @@ private val String.cleanClassName: String
             cleanClassName = cleanClassName.removePackage()
         }
 
+        if (ENABLE_DEBUG_TRACES) {
+            println("$cleanClassName <<<< $this")
+        }
+
         return cleanClassName
     }
 

logger/src/commonMain/kotlin/de/halfbit/logger/log.kt

@@ -55,6 +55,18 @@ public inline fun w(tag: LogTag, err: Throwable, getMessage: () -> String) {
     }
 }
 
+public fun w(tag: String, err: Throwable) {
+    if (currentLogger.loggableLevel.weight <= Warning.weight) {
+        log(Warning, tag, null, err)
+    }
+}
+
+public fun w(tag: LogTag, err: Throwable) {
+    if (tag.loggableLevel.weight <= Warning.weight) {
+        w(tag.name, err)
+    }
+}
+
 public inline fun e(tag: String, getMessage: () -> String) {
     if (currentLogger.loggableLevel.weight <= Error.weight) {
         log(Error, tag, getMessage(), null)

logger/src/commonTest/kotlin/de/halfbit/logger/LogExceptionsTest.kt

@@ -16,7 +16,7 @@ class LogExceptionsTest {
     private lateinit var memoryRingSink: MemoryRingSink
 
     @Test
-    fun logException() {
+    fun logExceptionAsError() {
         // given
         initializeLogger {
             memoryRingSink = registerMemoryRingSink(LogPrinter.Default)
@@ -41,4 +41,31 @@ class LogExceptionsTest {
 
         }
     }
+
+    @Test
+    fun logExceptionAsWarning() {
+        // given
+        initializeLogger {
+            memoryRingSink = registerMemoryRingSink(LogPrinter.Default)
+            getClockNow = { Instant.parse("2024-06-18T23:40:57.120Z") }
+        }
+
+        // when
+        w(TAG, Exception()) { "Warning message" }
+
+        // then
+        val stackTrace = memoryRingSink.getLogEntries().first().lines()
+        assertTrue(stackTrace.size > 3)
+
+        val actualMessage = stackTrace[0]
+        val expectedMessage = "23:40:57.120 .... LogExceptionsTest W Warning message"
+        assertEquals(expectedMessage, actualMessage)
+
+        val actualException = stackTrace[1]
+        assertTrue("Cannot find exception in: $actualException") {
+            actualException.contains("Exception") ||
+                    actualException.contains("captureStack") // js, wasmJs (firefox)
+
+        }
+    }
 }

sample-apps/composeApp/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {

sample-apps/shared/build.gradle.kts

@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {