make Logger configurable (DataSaverConfig.logger)

FunnySaltyFish · FunnySaltyFish · commit e9c6576b72bc · 2024-12-01T20:39:44.000+08:00
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -11,17 +11,15 @@ plugins {
 }
 
 kotlin {
-    compilerOptions {
-        freeCompilerArgs.addAll("-Xmulti-platform", "-Xexpect-actual-classes")
-    }
-
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
+    targets.configureEach {
+        compilations.configureEach {
+            compileTaskProvider.get().compilerOptions {
+                freeCompilerArgs.addAll("-Xexpect-actual-classes")
             }
         }
     }
+
+    androidTarget { }
     
     jvm("desktop")
     
diff --git a/data-saver-core/build.gradle.kts b/data-saver-core/build.gradle.kts
@@ -14,13 +14,15 @@ java {
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
+    targets.configureEach {
+        compilations.configureEach {
+            compileTaskProvider.get().compilerOptions {
+                freeCompilerArgs.addAll("-Xexpect-actual-classes")
             }
         }
+    }
 
+    androidTarget {
         publishAllLibraryVariants()
     }
 
diff --git a/data-saver-core/src/androidMain/kotlin/com/funny/data_saver/kmp/Logger.android.kt b/data-saver-core/src/androidMain/kotlin/com/funny/data_saver/kmp/Logger.android.kt
@@ -2,31 +2,31 @@ package com.funny.data_saver.kmp
 
 import android.util.Log as AndroidLog
 
-actual object Logger {
+actual object LoggerImpl: Logger {
     private const val TAG = "DefaultLog"
     // i, d, w, e, v
-    actual fun d(msg: String) { AndroidLog.d(TAG, msg) }
-    actual fun d(tag: String, msg: String) { AndroidLog.d(tag, msg) }
-    actual fun d(tag: String, msg: String, throwable: Throwable) { AndroidLog.d(tag, msg, throwable) }
+    override fun d(msg: String) { AndroidLog.d(TAG, msg) }
+    override fun d(tag: String, msg: String) { AndroidLog.d(tag, msg) }
+    override fun d(tag: String, msg: String, throwable: Throwable) { AndroidLog.d(tag, msg, throwable) }
 
-    actual fun i(msg: String) { AndroidLog.i(TAG, msg) }
-    actual fun i(tag: String, msg: String) { AndroidLog.i(tag, msg) }
-    actual fun i(tag: String, msg: String, throwable: Throwable) { AndroidLog.i(tag, msg, throwable) }
+    override fun i(msg: String) { AndroidLog.i(TAG, msg) }
+    override fun i(tag: String, msg: String) { AndroidLog.i(tag, msg) }
+    override fun i(tag: String, msg: String, throwable: Throwable) { AndroidLog.i(tag, msg, throwable) }
 
-    actual fun w(msg: String) { AndroidLog.w(TAG, msg) }
-    actual fun w(tag: String, msg: String) { AndroidLog.w(tag, msg) }
-    actual fun w(tag: String, msg: String, throwable: Throwable) { AndroidLog.w(tag, msg, throwable) }
+    override fun w(msg: String) { AndroidLog.w(TAG, msg) }
+    override fun w(tag: String, msg: String) { AndroidLog.w(tag, msg) }
+    override fun w(tag: String, msg: String, throwable: Throwable) { AndroidLog.w(tag, msg, throwable) }
 
-    actual fun e(msg: String) { AndroidLog.e(TAG, msg) }
-    actual fun e(tag: String, msg: String) { AndroidLog.e(tag, msg) }
-    actual fun e(tag: String, msg: String, throwable: Throwable) { AndroidLog.e(tag, msg, throwable) }
+    override fun e(msg: String) { AndroidLog.e(TAG, msg) }
+    override fun e(tag: String, msg: String) { AndroidLog.e(tag, msg) }
+    override fun e(tag: String, msg: String, throwable: Throwable) { AndroidLog.e(tag, msg, throwable) }
 
-    actual fun v(msg: String) { AndroidLog.v(TAG, msg) }
-    actual fun v(tag: String, msg: String) { AndroidLog.v(tag, msg) }
-    actual fun v(tag: String, msg: String, throwable: Throwable) { AndroidLog.v(tag, msg, throwable) }
+    override fun v(msg: String) { AndroidLog.v(TAG, msg) }
+    override fun v(tag: String, msg: String) { AndroidLog.v(tag, msg) }
+    override fun v(tag: String, msg: String, throwable: Throwable) { AndroidLog.v(tag, msg, throwable) }
 
     // wtf
-    actual fun wtf(msg: String) { AndroidLog.wtf(TAG, msg) }
-    actual fun wtf(tag: String, msg: String) { AndroidLog.wtf(tag, msg) }
-    actual fun wtf(tag: String, msg: String, throwable: Throwable) { AndroidLog.wtf(tag, msg, throwable) }
+    override fun wtf(msg: String) { AndroidLog.wtf(TAG, msg) }
+    override fun wtf(tag: String, msg: String) { AndroidLog.wtf(tag, msg) }
+    override fun wtf(tag: String, msg: String, throwable: Throwable) { AndroidLog.wtf(tag, msg, throwable) }
 }
diff --git a/data-saver-core/src/commonMain/kotlin/com/funny/data_saver/core/DataSaverConfig.kt b/data-saver-core/src/commonMain/kotlin/com/funny/data_saver/core/DataSaverConfig.kt
@@ -1,10 +1,15 @@
 package com.funny.data_saver.core
 
+import com.funny.data_saver.kmp.Logger
+import com.funny.data_saver.kmp.LoggerImpl
+
 /**
  * Some config that you can set:
  * 1. DEBUG: whether to output some debug info
+ * 2. logger: custom logger
  */
 object DataSaverConfig {
     var DEBUG = true
+    var logger: Logger = LoggerImpl
 }
 
diff --git a/data-saver-core/src/commonMain/kotlin/com/funny/data_saver/kmp/Logger.kt b/data-saver-core/src/commonMain/kotlin/com/funny/data_saver/kmp/Logger.kt
@@ -1,6 +1,8 @@
 package com.funny.data_saver.kmp
 
-expect object Logger {
+import com.funny.data_saver.core.DataSaverConfig
+
+interface Logger {
     fun d(msg: String) : Unit
     fun d(tag: String, msg: String) : Unit
     fun d(tag: String, msg: String, throwable: Throwable) : Unit
@@ -26,4 +28,6 @@ expect object Logger {
     fun wtf(tag: String, msg: String, throwable: Throwable) : Unit
 }
 
-typealias Log = Logger
+expect object LoggerImpl: Logger
+
+val Log get() = DataSaverConfig.logger
diff --git a/data-saver-core/src/desktopMain/kotlin/com/funny/data_saver/kmp/Logger.desktop.kt b/data-saver-core/src/desktopMain/kotlin/com/funny/data_saver/kmp/Logger.desktop.kt
@@ -9,82 +9,82 @@ enum class LogLevel {
     WTF
 }
 
-actual object Logger {
+actual object LoggerImpl: Logger {
     private fun log(level: LogLevel, tag: String = "DefaultLog", msg: String = "", throwable: Throwable? = null) {
         println("[${level.name}] $tag: $msg")
         throwable?.printStackTrace()
     }
 
-    actual fun d(msg: String) {
+    override fun d(msg: String) {
         log(LogLevel.DEBUG, msg = msg)
     }
 
-    actual fun d(tag: String, msg: String) {
+    override fun d(tag: String, msg: String) {
         log(LogLevel.DEBUG, tag, msg)
     }
 
-    actual fun d(tag: String, msg: String, throwable: Throwable) {
+    override fun d(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.DEBUG, tag, msg, throwable)
     }
 
-    actual fun i(msg: String) {
+    override fun i(msg: String) {
         log(LogLevel.INFO, msg = msg)
     }
 
-    actual fun i(tag: String, msg: String) {
+    override fun i(tag: String, msg: String) {
         log(LogLevel.INFO, tag, msg)
     }
 
-    actual fun i(tag: String, msg: String, throwable: Throwable) {
+    override fun i(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.INFO, tag, msg, throwable)
     }
 
-    actual fun e(msg: String) {
+    override fun e(msg: String) {
         log(LogLevel.ERROR, msg = msg)
     }
 
-    actual fun e(tag: String, msg: String) {
+    override fun e(tag: String, msg: String) {
         log(LogLevel.ERROR, tag, msg)
     }
 
-    actual fun e(tag: String, msg: String, throwable: Throwable) {
+    override fun e(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.ERROR, tag, msg, throwable)
     }
 
-    actual fun w(msg: String) {
+    override fun w(msg: String) {
         log(LogLevel.WARNING, msg = msg)
     }
 
-    actual fun w(tag: String, msg: String) {
+    override fun w(tag: String, msg: String) {
         log(LogLevel.WARNING, tag, msg)
     }
 
-    actual fun w(tag: String, msg: String, throwable: Throwable) {
+    override fun w(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.WARNING, tag, msg, throwable)
     }
 
 
-    actual fun wtf(msg: String) {
+    override fun wtf(msg: String) {
         log(LogLevel.WTF, msg = msg)
     }
 
-    actual fun wtf(tag: String, msg: String) {
+    override fun wtf(tag: String, msg: String) {
         log(LogLevel.WTF, tag, msg)
     }
 
-    actual fun wtf(tag: String, msg: String, throwable: Throwable) {
+    override fun wtf(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.WTF, tag, msg, throwable)
     }
 
-    actual fun v(msg: String) {
+    override fun v(msg: String) {
         log(LogLevel.VERBOSE, msg = msg)
     }
 
-    actual fun v(tag: String, msg: String) {
+    override fun v(tag: String, msg: String) {
         log(LogLevel.VERBOSE, tag, msg)
     }
 
-    actual fun v(tag: String, msg: String, throwable: Throwable) {
+    override fun v(tag: String, msg: String, throwable: Throwable) {
         log(LogLevel.VERBOSE, tag, msg, throwable)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,15 @@ plugins {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`kotlin {`
`14`		`- compilerOptions {`
`15`		`- freeCompilerArgs.addAll("-Xmulti-platform", "-Xexpect-actual-classes")`
`16`		`- }`
`17`		`-`
`18`		`- androidTarget {`
`19`		`- compilations.all {`
`20`		`- kotlinOptions {`
`21`		`- jvmTarget = "1.8"`
	`14`	`+ targets.configureEach {`
	`15`	`+ compilations.configureEach {`
	`16`	`+ compileTaskProvider.get().compilerOptions {`
	`17`	`+ freeCompilerArgs.addAll("-Xexpect-actual-classes")`
`22`	`18`	`}`
`23`	`19`	`}`
`24`	`20`	`}`
	`21`	`+`
	`22`	`+ androidTarget { }`
`25`	`23`
`26`	`24`	`jvm("desktop")`
`27`	`25`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,15 @@ java {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`kotlin {`
`17`		`- androidTarget {`
`18`		`- compilations.all {`
`19`		`- kotlinOptions {`
`20`		`- jvmTarget = "1.8"`
	`17`	`+ targets.configureEach {`
	`18`	`+ compilations.configureEach {`
	`19`	`+ compileTaskProvider.get().compilerOptions {`
	`20`	`+ freeCompilerArgs.addAll("-Xexpect-actual-classes")`
`21`	`21`	`}`
`22`	`22`	`}`
	`23`	`+ }`
`23`	`24`
	`25`	`+ androidTarget {`
`24`	`26`	`publishAllLibraryVariants()`
`25`	`27`	`}`
`26`	`28`
Original file line number	Diff line number	Diff line change
`@@ -9,82 +9,82 @@ enum class LogLevel {`
`9`	`9`	`WTF`
`10`	`10`	`}`
`11`	`11`
`12`		`-actual object Logger {`
	`12`	`+actual object LoggerImpl: Logger {`
`13`	`13`	`private fun log(level: LogLevel, tag: String = "DefaultLog", msg: String = "", throwable: Throwable? = null) {`
`14`	`14`	`println("[${level.name}] $tag: $msg")`
`15`	`15`	`throwable?.printStackTrace()`
`16`	`16`	`}`
`17`	`17`
`18`		`- actual fun d(msg: String) {`
	`18`	`+ override fun d(msg: String) {`
`19`	`19`	`log(LogLevel.DEBUG, msg = msg)`
`20`	`20`	`}`
`21`	`21`
`22`		`- actual fun d(tag: String, msg: String) {`
	`22`	`+ override fun d(tag: String, msg: String) {`
`23`	`23`	`log(LogLevel.DEBUG, tag, msg)`
`24`	`24`	`}`
`25`	`25`
`26`		`- actual fun d(tag: String, msg: String, throwable: Throwable) {`
	`26`	`+ override fun d(tag: String, msg: String, throwable: Throwable) {`
`27`	`27`	`log(LogLevel.DEBUG, tag, msg, throwable)`
`28`	`28`	`}`
`29`	`29`
`30`		`- actual fun i(msg: String) {`
	`30`	`+ override fun i(msg: String) {`
`31`	`31`	`log(LogLevel.INFO, msg = msg)`
`32`	`32`	`}`
`33`	`33`
`34`		`- actual fun i(tag: String, msg: String) {`
	`34`	`+ override fun i(tag: String, msg: String) {`
`35`	`35`	`log(LogLevel.INFO, tag, msg)`
`36`	`36`	`}`
`37`	`37`
`38`		`- actual fun i(tag: String, msg: String, throwable: Throwable) {`
	`38`	`+ override fun i(tag: String, msg: String, throwable: Throwable) {`
`39`	`39`	`log(LogLevel.INFO, tag, msg, throwable)`
`40`	`40`	`}`
`41`	`41`
`42`		`- actual fun e(msg: String) {`
	`42`	`+ override fun e(msg: String) {`
`43`	`43`	`log(LogLevel.ERROR, msg = msg)`
`44`	`44`	`}`
`45`	`45`
`46`		`- actual fun e(tag: String, msg: String) {`
	`46`	`+ override fun e(tag: String, msg: String) {`
`47`	`47`	`log(LogLevel.ERROR, tag, msg)`
`48`	`48`	`}`
`49`	`49`
`50`		`- actual fun e(tag: String, msg: String, throwable: Throwable) {`
	`50`	`+ override fun e(tag: String, msg: String, throwable: Throwable) {`
`51`	`51`	`log(LogLevel.ERROR, tag, msg, throwable)`
`52`	`52`	`}`
`53`	`53`
`54`		`- actual fun w(msg: String) {`
	`54`	`+ override fun w(msg: String) {`
`55`	`55`	`log(LogLevel.WARNING, msg = msg)`
`56`	`56`	`}`
`57`	`57`
`58`		`- actual fun w(tag: String, msg: String) {`
	`58`	`+ override fun w(tag: String, msg: String) {`
`59`	`59`	`log(LogLevel.WARNING, tag, msg)`
`60`	`60`	`}`
`61`	`61`
`62`		`- actual fun w(tag: String, msg: String, throwable: Throwable) {`
	`62`	`+ override fun w(tag: String, msg: String, throwable: Throwable) {`
`63`	`63`	`log(LogLevel.WARNING, tag, msg, throwable)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`
`67`		`- actual fun wtf(msg: String) {`
	`67`	`+ override fun wtf(msg: String) {`
`68`	`68`	`log(LogLevel.WTF, msg = msg)`
`69`	`69`	`}`
`70`	`70`
`71`		`- actual fun wtf(tag: String, msg: String) {`
	`71`	`+ override fun wtf(tag: String, msg: String) {`
`72`	`72`	`log(LogLevel.WTF, tag, msg)`
`73`	`73`	`}`
`74`	`74`
`75`		`- actual fun wtf(tag: String, msg: String, throwable: Throwable) {`
	`75`	`+ override fun wtf(tag: String, msg: String, throwable: Throwable) {`
`76`	`76`	`log(LogLevel.WTF, tag, msg, throwable)`
`77`	`77`	`}`
`78`	`78`
`79`		`- actual fun v(msg: String) {`
	`79`	`+ override fun v(msg: String) {`
`80`	`80`	`log(LogLevel.VERBOSE, msg = msg)`
`81`	`81`	`}`
`82`	`82`
`83`		`- actual fun v(tag: String, msg: String) {`
	`83`	`+ override fun v(tag: String, msg: String) {`
`84`	`84`	`log(LogLevel.VERBOSE, tag, msg)`
`85`	`85`	`}`
`86`	`86`
`87`		`- actual fun v(tag: String, msg: String, throwable: Throwable) {`
	`87`	`+ override fun v(tag: String, msg: String, throwable: Throwable) {`
`88`	`88`	`log(LogLevel.VERBOSE, tag, msg, throwable)`
`89`	`89`	`}`
`90`	`90`