Merge pull request #97 from ColaGom/refact-ios-null-safety

Refact DebugAntilog null-safety for ios
AAkira · Apr 6, 2022 · 910917c · 910917c
2 parents 6e40914 + bfa5a8d
commit 910917c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/napier/build.gradle.kts b/napier/build.gradle.kts
@@ -158,7 +158,7 @@ kotlin {
                 val macosArm64Main by getting {
                     dependsOn(darwinMain)
                 }
-                val macosArm64Text by getting {
+                val macosArm64Test by getting {
                     dependsOn(darwinTest)
                 }
                 val iosSimulatorArm64Main by getting {

diff --git a/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt b/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt
@@ -56,13 +56,12 @@ actual class DebugAntilog(
 
     // find stack trace
     private fun performTag(tag: String): String {
-        val thread = NSThread.callStackSymbols
+        val symbols = NSThread.callStackSymbols
+        if (symbols.size <= CALL_STACK_INDEX) return tag
 
-        return if (thread.size >= CALL_STACK_INDEX) {
-            createStackElementTag(thread[CALL_STACK_INDEX] as String)
-        } else {
-            tag
-        }
+        return (symbols[CALL_STACK_INDEX] as? String)?.let {
+            createStackElementTag(it)
+        } ?: tag
     }
 
     internal fun createStackElementTag(string: String): String {