From 7c0650e2df6385b419489f4e6748d2dc019bfa22 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 13 Apr 2023 10:31:50 +0600 Subject: [PATCH 1/4] start 1.1.1 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fb18a7..d7aab1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 1.1.1 + ## 1.1.0 * `Kotlin`: `1.8.20` diff --git a/gradle.properties b/gradle.properties index fa2f84b..5231daa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m # Project data group=dev.inmo -version=1.1.0 -android_code_version=19 +version=1.1.1 +android_code_version=20 From dc50977c9a0c921665d8e09d17eeedc4ceae438e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 13 Apr 2023 10:33:13 +0600 Subject: [PATCH 2/4] KSLog factory fix --- CHANGELOG.md | 2 ++ src/commonMain/kotlin/KSLog.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7aab1d..b2d7939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 1.1.1 +* Rollback `KSLog` with `String` arg factory to use `DefaultKSLog` + ## 1.1.0 * `Kotlin`: `1.8.20` diff --git a/src/commonMain/kotlin/KSLog.kt b/src/commonMain/kotlin/KSLog.kt index 2629e5c..987b01b 100644 --- a/src/commonMain/kotlin/KSLog.kt +++ b/src/commonMain/kotlin/KSLog.kt @@ -68,7 +68,7 @@ internal val printlnLogging: (level: LogLevel, tag: String, message: Any, throwa fun KSLog( defaultTag: String, -): KSLog = TagLogger(defaultTag) +): KSLog = DefaultKSLog(defaultTag) fun KSLog( defaultTag: String, From 604ef1b3470b852f303836989003ba39012b7a1e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 13 Apr 2023 10:52:05 +0600 Subject: [PATCH 3/4] add wasm support --- build.gradle | 12 ++++++++++++ gradle/libs.versions.toml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4fb6698..c3e70ea 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,11 @@ kotlin { linuxArm64() linuxArm32Hfp() linuxX64() + wasm { + browser() + nodejs() + d8() + } wasm32() mingwX64() mingwX86() @@ -60,6 +65,13 @@ kotlin { implementation libs.kotlin } } + commonTest { + dependencies { + implementation libs.kotlin.test.common + implementation libs.kotlin.test.annotations.common + implementation libs.kotlin.test.junit + } + } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 563ef2b..e265d10 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ kotlin-gradle-plugin = "7.3.1" dokka = "1.8.10" -dexcount = "3.1.0" +dexcount = "4.0.0" junit_version = "4.12" test_ext_junit_version = "1.1.3" espresso_core = "3.4.0" From 2a36f64b51ea324fff9038564b5fad7e1b7668c9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 13 Apr 2023 10:57:55 +0600 Subject: [PATCH 4/4] add actual defaultLogging in wasm --- src/wasmMain/kotlin/defaultLogging.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/wasmMain/kotlin/defaultLogging.kt diff --git a/src/wasmMain/kotlin/defaultLogging.kt b/src/wasmMain/kotlin/defaultLogging.kt new file mode 100644 index 0000000..295deef --- /dev/null +++ b/src/wasmMain/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