add native platforms support

0.5.1

CHANGELOG.md

@@ -1,7 +1,34 @@
 # Changelog
 
+## 0.5.2
+
+* Add support of next platform:
+  * Linux ARM x64
+  * Linux ARM x32 HFP
+  * Linux x64
+  * WASM x32
+  * MinGW x64
+  * MinGW x86
+
+## 0.5.1
+
+* New property `defaultMessageFormatterWithErrorPrint` for messages format with errors
+
+## 0.5.0
+
+* `Kotlin`: `1.7.10`
+
+## 0.4.2
+
+* Add `setDefaultKSLog` and `addDefaultKSLog`
+* Add `plus` operation for two `KSLog` instances to call them both on each log performing
+* Add `KSLog` factory for simple creation of `CallbackKSLog`
+* Add `MessageFormatter` factory
+
 ## 0.4.1
 
+* Fixes in resolution ambiguity for functions with messages
+
 ## 0.4.0
 
 **THIS UPDATE CONTAINS BREAKING CHANGES**

build.gradle

@@ -47,6 +47,12 @@ kotlin {
     android {
         publishAllLibraryVariants()
     }
+    linuxArm64()
+    linuxArm32Hfp()
+    linuxX64()
+    wasm32()
+    mingwX64()
+    mingwX86()
 
     sourceSets {
         commonMain {

gradle.properties

@@ -5,9 +5,10 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx196m
 
 # Project data
 
 group=dev.inmo
-version=0.4.1
-android_code_version=11
+version=0.5.2
+android_code_version=15

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 
-kotlin = "1.6.21"
-kotlin-gradle-plugin = "7.0.4"
+kotlin = "1.7.10"
+kotlin-gradle-plugin = "7.2.2"
 
 dexcount = "3.1.0"
 junit_version = "4.12"
-test_ext_junit_version = "1.1.2"
-espresso_core = "3.3.0"
+test_ext_junit_version = "1.1.3"
+espresso_core = "3.4.0"
 
 android-minSdk = "21"
 android-compileSdk = "32"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/commonMain/kotlin/CallbackKSLog.kt

@@ -7,3 +7,7 @@ class CallbackKSLog(
 ) : KSLog {
     override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
 }
+
+fun KSLog(
+    performLogCallback: SimpleKSLogCallback
+) = CallbackKSLog(performLogCallback)

src/commonMain/kotlin/KSLog.kt

@@ -1,6 +1,7 @@
 package dev.inmo.kslog.common
 
 import dev.inmo.kslog.common.filter.filtered
+import dev.inmo.kslog.common.utils.plus
 
 
 enum class LogLevel {
@@ -61,6 +62,9 @@ interface KSLog {
 operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
 
 internal expect val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+internal val printlnLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
+    println(defaultMessageFormatter(l, t, m, e))
+}
 
 fun KSLog(
     defaultTag: String,
@@ -110,3 +114,6 @@ fun KSLog(
 ).filtered { l, _, _ ->
     minLoggingLevel.ordinal <= l.ordinal
 }
+
+fun setDefaultKSLog(newDefault: KSLog) { KSLog.default = newDefault }
+fun addDefaultKSLog(newDefault: KSLog) { KSLog.default = KSLog.default + newDefault }

src/commonMain/kotlin/KSLogTypealiases.kt

@@ -1,6 +1,8 @@
 package dev.inmo.kslog.common
 
-typealias MessageFormatter = (l: LogLevel, t: String, m: Any, Throwable?) -> String
+typealias MessageFormatter = (l: LogLevel, t: String?, m: Any, Throwable?) -> String
+@Suppress("NOTHING_TO_INLINE")
+inline fun MessageFormatter(noinline formatter: MessageFormatter) = formatter
 typealias MessageFilter = (l: LogLevel, t: String?, Throwable?) -> Boolean
-val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] $t - $m" }
-
+val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] ${t ?.let { "$it " } ?: ""}- $m" }
+val defaultMessageFormatterWithErrorPrint: MessageFormatter = { l, t, m, e -> "[$l] ${t ?.let { "$it " } ?: ""}- $m${e ?.let { ": ${it.stackTraceToString()}" } ?: ""}" }

src/commonMain/kotlin/utils/Combination.kt

@@ -0,0 +1,15 @@
+package dev.inmo.kslog.common.utils
+
+import dev.inmo.kslog.common.CallbackKSLog
+import dev.inmo.kslog.common.KSLog
+
+infix operator fun KSLog.plus(other: KSLog) = CallbackKSLog { l, t, m, e ->
+    val resultOfFirst = runCatching {
+        this@plus.performLog(l, t, m, e)
+    }
+    val resultOfSecond = runCatching {
+        other.performLog(l, t, m, e)
+    }
+    resultOfFirst.onFailure { throw it }
+    resultOfSecond.onFailure { throw it }
+}

src/linuxArm32HfpMain/kotlin/DefaultLoggingActual.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging

src/linuxArm64Main/kotlin/defaultLogging.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging

src/linuxX64Main/kotlin/defaultLogging.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging

src/mingwX64Main/kotlin/defaultLogging.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging

src/mingwX86Main/kotlin/defaultLogging.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging

src/wasm32Main/kotlin/defaultLogging.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
+    get() = printlnLogging