Add iOS target and apply ktfmt

Author: JavierSegoviaCordoba

.editorconfig

@@ -3,7 +3,7 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 100
 indent_size = 4
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 ij_java_names_count_to_use_import_on_demand = 9999
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Added
 
+- Add iOS target
+
 ### Changed
 
 - Rename `mokoki` subproject to `mokoki-core`

gradle.properties

@@ -27,8 +27,8 @@ pomSmcDeveloperConnection=scm:git:[email protected]:JavierSegoviaCordoba/mokoki.git
 android.useAndroidX=true
 kotlin.code.style=official
 kotlin.js.compiler=both
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.native.enableDependencyPropagation=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2048m

mokoki-core/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     `android-library`
     `javiersc-kotlin-multiplatform`
     `javiersc-publish-kotlin-multiplatform`
+    `javiersc-code-formatter`
 }
 
 android {
@@ -21,6 +22,8 @@ kotlin {
 
     jvm()
 
+    ios()
+
     sourceSets {
         commonMain
 
@@ -29,5 +32,7 @@ kotlin {
         }
 
         named("jvmMain")
+
+        named("iosMain")
     }
 }

mokoki-core/src/androidMain/kotlin/internal/LoggerNames.kt

@@ -1,23 +1,31 @@
 package com.javiersc.mokoki.internal
 
-internal actual val fileName get() = "file ${stackTrace?.fileName ?: "Unknown"}"
+internal actual val fileName
+    get() = "file ${stackTrace?.fileName ?: "Unknown"}"
 
-internal actual val className get() = "class ${stackTrace?.className?.split(".")?.lastOrNull() ?: "Unknown"}"
+internal actual val className
+    get() = "class ${stackTrace?.className?.split(".")?.lastOrNull() ?: "Unknown"}"
 
-internal actual val methodName get() = "fun ${stackTrace?.methodName ?: "Unknown"}"
+internal actual val methodName
+    get() = "fun ${stackTrace?.methodName ?: "Unknown"}"
 
-internal actual val lineNumber get() = "line ${stackTrace?.lineNumber ?: "Unknown"}"
+internal actual val lineNumber
+    get() = "line ${stackTrace?.lineNumber ?: "Unknown"}"
 
-internal actual val fileLink get() = "(${stackTrace?.fileName}:${stackTrace?.lineNumber})"
+internal actual val fileLink
+    get() = "(${stackTrace?.fileName}:${stackTrace?.lineNumber})"
 
 @Suppress("TooGenericExceptionCaught")
 private val stackTrace: StackTraceElement?
-    get() = try {
-        val trace = Thread.currentThread().stackTrace
-        val index = trace.indexOfLast { traceElement ->
-            Regex("^(com.javiersc.*mokoki.*Mokoki.*)$").matches(traceElement.className)
+    get() =
+        try {
+            val trace = Thread.currentThread().stackTrace
+            val index =
+                trace.indexOfLast { traceElement ->
+                    Regex("^(Mokoki.kt)$").matches(traceElement.fileName ?: "") &&
+                        Regex("^(com.javiersc.mokoki.Mokoki)$").matches(traceElement.className)
+                }
+            trace[index + 1]
+        } catch (throwable: Throwable) {
+            null
         }
-        trace[index + 1]
-    } catch (throwable: Throwable) {
-        null
-    }

mokoki-core/src/commonMain/kotlin/Color.kt

@@ -10,7 +10,6 @@ public enum class LoggerForegroundColor(public val value: String) {
     Purple("\u001B[35m"),
     Cyan("\u001B[36m"),
     White("\u001B[37m"),
-
     BrightBlack("\u001B[90m"),
     BrightRed("\u001B[91m"),
     BrightGreen("\u001B[92m"),

mokoki-core/src/commonMain/kotlin/Mokoki.kt

@@ -4,8 +4,6 @@ package com.javiersc.mokoki
 
 import kotlin.native.concurrent.ThreadLocal
 
-// balok, sekac, mokoki, injira, hakisto,
-
 @ThreadLocal
 public object Mokoki {
 
@@ -24,7 +22,7 @@ public object Mokoki {
     public fun v(tag: String = MokokiName, message: String): Unit = logger.v(tag, message)
 
     public fun v(tag: String = MokokiName, throwable: Throwable): Unit =
-            logger.v(tag, throwable.stackTraceToString())
+        logger.v(tag, throwable.stackTraceToString())
 
     public fun v(message: String): Unit = logger.v(MokokiName, message)
 
@@ -33,7 +31,7 @@ public object Mokoki {
     public fun d(tag: String = MokokiName, message: String): Unit = logger.d(tag, message)
 
     public fun d(tag: String = MokokiName, throwable: Throwable): Unit =
-            logger.d(tag, throwable.stackTraceToString())
+        logger.d(tag, throwable.stackTraceToString())
 
     public fun d(message: String): Unit = logger.d(MokokiName, message)
 
@@ -42,15 +40,15 @@ public object Mokoki {
     public fun i(tag: String = MokokiName, message: String): Unit = logger.i(tag, message)
 
     public fun i(tag: String = MokokiName, throwable: Throwable): Unit =
-            logger.i(tag, throwable.stackTraceToString())
+        logger.i(tag, throwable.stackTraceToString())
 
     public fun i(message: String): Unit = logger.i(MokokiName, message)
     public fun i(throwable: Throwable): Unit = logger.i(MokokiName, throwable.stackTraceToString())
 
     public fun w(tag: String = MokokiName, message: String): Unit = logger.w(tag, message)
 
     public fun w(tag: String = MokokiName, throwable: Throwable): Unit =
-            logger.w(tag, throwable.stackTraceToString())
+        logger.w(tag, throwable.stackTraceToString())
 
     public fun w(message: String): Unit = logger.w(MokokiName, message)
 
@@ -59,7 +57,7 @@ public object Mokoki {
     public fun e(tag: String = MokokiName, message: String): Unit = logger.e(tag, message)
 
     public fun e(tag: String = MokokiName, throwable: Throwable): Unit =
-            logger.e(tag, throwable.stackTraceToString())
+        logger.e(tag, throwable.stackTraceToString())
 
     public fun e(message: String): Unit = logger.e(MokokiName, message)
 

mokoki-core/src/iosMain/kotlin/MokokiLogger.kt

@@ -0,0 +1,29 @@
+package com.javiersc.mokoki
+
+import com.javiersc.mokoki.internal.Level
+import com.javiersc.mokoki.internal.buildMokokiMessage
+
+public actual class MokokiLogger {
+
+    public actual var isEnabled: Boolean = true
+
+    public actual fun v(tag: String, message: String) {
+        buildMokokiMessage(tag, message, Level.Verbose).forEach { println(it) }
+    }
+
+    public actual fun d(tag: String, message: String) {
+        TODO()
+    }
+
+    public actual fun i(tag: String, message: String) {
+        TODO()
+    }
+
+    public actual fun w(tag: String, message: String) {
+        TODO()
+    }
+
+    public actual fun e(tag: String, message: String) {
+        TODO()
+    }
+}

mokoki-core/src/iosMain/kotlin/internal/LoggerNames.kt

@@ -0,0 +1,72 @@
+package com.javiersc.mokoki.internal
+
+import platform.Foundation.NSThread
+
+internal actual val fileName
+    get() = "file ${stackTrace?.fileName ?: "Unknown"}"
+
+internal actual val className
+    get() = "class ${
+        stackTrace?.className?.split(".")?.lastOrNull() ?: "Unknown"
+    }"
+
+internal actual val methodName
+    get() = "fun ${stackTrace?.methodName ?: "Unknown"}"
+
+internal actual val lineNumber
+    get() = "line Unknown"
+
+internal actual val fileLink
+    get() = "(${stackTrace?.fileName}:${stackTrace?.lineNumber})"
+
+private data class StackTraceElement(
+    val fileName: String,
+    val className: String?,
+    val methodName: String?,
+    val lineNumber: String?,
+)
+
+@Suppress("TooGenericExceptionCaught")
+private val stackTrace: StackTraceElement?
+    get() =
+        try {
+            val lines: List<String?> = NSThread.callStackSymbols.map { it?.toString() }
+            val index = 6
+            val fileName =
+                if (lines[index]
+                        ?.replaceAfter("#", "")
+                        ?.replace("#", "")
+                        ?.replaceBeforeLast(".", "")
+                        ?.replace(".", "")
+                        ?.first()
+                        ?.isUpperCase() == true
+                ) {
+                    lines[index]
+                        ?.replaceAfter("#", "")
+                        ?.replace("#", "")
+                        ?.replaceBeforeLast(".", "")
+                        ?.replace(".", "")
+                } else {
+                    lines[index + 1]
+                        ?.replaceBefore("$", "")
+                        ?.replaceFirst("$", "")
+                        ?.replaceAfter("$", "")
+                        ?.replace("$", "")
+                }
+
+            val methodName =
+                lines[index]
+                    ?.replaceBefore("#", "")
+                    ?.replace("#", "")
+                    ?.replaceAfter("(", "")
+                    ?.replace("(", "")
+
+            StackTraceElement(
+                fileName = fileName?.let { "$it.kt" } ?: "Unknown",
+                className = fileName ?: "Unknown",
+                methodName = methodName,
+                lineNumber = "1"
+            )
+        } catch (throwable: Throwable) {
+            throw throwable
+        }

mokoki-core/src/iosTest/kotlin/MokokiTryTest.kt

@@ -0,0 +1,28 @@
+package com.javiersc.example.test
+
+import com.javiersc.mokoki.Mokoki
+import com.javiersc.mokoki.extensions.logV
+import kotlin.test.Test
+
+class MokokiTry {
+
+    @Test
+    fun hello() {
+        hi()
+    }
+
+    @Test
+    fun hello2() {
+        SomeObject.greeting()
+    }
+}
+
+fun hi() {
+    Mokoki.v("Hello")
+}
+
+object SomeObject {
+    fun greeting() {
+        logV("Hello")
+    }
+}