Merge pull request #7 from InsanusMokrassar/0.1.1

0.1.1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.1
+
+* Changes in `JVM` levels
+* Fixes in TagLogger
+
 ## 0.1.0
 
 * All the platform specific logged factories has been renamed

gradle.properties

@@ -9,5 +9,5 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.1.0
-android_code_version=4
+version=0.1.1
+android_code_version=5

src/commonMain/kotlin/KSLog.kt

@@ -2,12 +2,12 @@ package dev.inmo.kslog.common
 
 
 enum class LogLevel {
+    DEBUG,
     VERBOSE,
     INFO,
     WARNING,
     ERROR,
     ASSERT,
-    DEBUG
 }
 
 interface KSLog {
@@ -65,7 +65,7 @@ fun KSLog(
 
 fun KSLog(
     defaultTag: String,
-    minLoggingLevel: LogLevel = LogLevel.VERBOSE
+    minLoggingLevel: LogLevel = LogLevel.values().first()
 ): KSLog = KSLog (defaultTag) { l, _, _, _ ->
     minLoggingLevel.ordinal <= l.ordinal
 }

src/commonMain/kotlin/TagLogger.kt

@@ -5,6 +5,6 @@ import kotlin.jvm.JvmInline
 @JvmInline
 value class TagLogger(val tag: String) : KSLog {
     override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) {
-        KSLog.performLog(level, tag ?: tag, message, throwable)
+        KSLog.performLog(level, tag ?: this.tag, message, throwable)
     }
 }

src/jsMain/kotlin/ActualLogger.kt

@@ -11,12 +11,12 @@ fun KSJSLog(
         arrayOf(text, e)
     } ?: arrayOf(text)
     when (l) {
+        LogLevel.DEBUG -> console.log(*args)
         LogLevel.VERBOSE,
         LogLevel.INFO -> console.info(*args)
         LogLevel.WARNING -> console.warn(*args)
         LogLevel.ERROR,
         LogLevel.ASSERT -> console.error(*args)
-        LogLevel.DEBUG -> console.log(*args)
     }
 }
 
@@ -42,7 +42,7 @@ fun KSJSLog(
 fun KSJSLog(
     defaultTag: String,
     messageFormatter: MessageFormatter = defaultMessageFormatter,
-    minLoggingLevel: LogLevel = LogLevel.VERBOSE
+    minLoggingLevel: LogLevel = LogLevel.values().first()
 ): KSLog = KSJSLog (defaultTag, messageFormatter) { l, _, _, _ ->
     minLoggingLevel.ordinal <= l.ordinal
 }

src/jvmMain/kotlin/ActualLogger.kt

@@ -12,12 +12,12 @@ fun KSJVMLog(
     val text = messageFormatter(l,t ?: defaultTag,m,e)
     logger.log(
         when(l) {
-            LogLevel.VERBOSE -> Level.FINEST
+            LogLevel.DEBUG -> Level.FINEST
+            LogLevel.VERBOSE -> Level.FINE
             LogLevel.INFO -> Level.INFO
             LogLevel.WARNING -> Level.WARNING
             LogLevel.ERROR -> Level.SEVERE
-            LogLevel.ASSERT -> Level.OFF
-            LogLevel.DEBUG -> Level.ALL
+            LogLevel.ASSERT -> Level.SEVERE
         },
         text,
         e
@@ -49,7 +49,7 @@ fun KSJVMLog(
     defaultTag: String,
     logger: java.util.logging.Logger,
     messageFormatter: MessageFormatter = defaultMessageFormatter,
-    minLoggingLevel: LogLevel = LogLevel.VERBOSE
+    minLoggingLevel: LogLevel = LogLevel.values().first()
 ): KSLog = KSJVMLog (defaultTag, logger, messageFormatter) { l, _, _, _ ->
     minLoggingLevel.ordinal <= l.ordinal
 }

src/main/kotlin/ActualLogger.kt

@@ -9,12 +9,12 @@ fun KSAndroidLog(
     if (!filter(l, t ?: defaultTag, m, e)) return@KSLog
     val tag = t ?: defaultTag
     when(l) {
+        LogLevel.DEBUG -> Log.d(tag, m, e)
         LogLevel.VERBOSE -> Log.v(tag, m, e)
         LogLevel.INFO -> Log.i(tag, m, e)
         LogLevel.WARNING -> Log.w(tag, m, e)
         LogLevel.ERROR -> Log.e(tag, m, e)
         LogLevel.ASSERT -> Log.wtf(tag, m, e)
-        LogLevel.DEBUG -> Log.d(tag, m, e)
     }
 }