Skip to content

Commit ea4a707

Browse files
committed
Target SLF4J API version 2.x in the log4k-slf4j library
Resolves: #61
1 parent 47aa8d5 commit ea4a707

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/compose/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ kotlin {
4747
}
4848
commonMain.dependencies {
4949
implementation(project(":log4k"))
50+
implementation(project(":log4k-slf4j"))
5051
implementation(compose.runtime)
5152
implementation(compose.foundation)
5253
implementation(compose.material)
@@ -56,6 +57,7 @@ kotlin {
5657
}
5758
desktopMain.dependencies {
5859
implementation(compose.desktop.currentOs)
60+
implementation(libs.slf4j.simple)
5961
}
6062
}
6163
}
@@ -71,11 +73,6 @@ android {
7173
versionCode = 1
7274
versionName = libs.versions.log4k.demo.get()
7375
}
74-
packaging {
75-
resources {
76-
excludes += "/META-INF/{AL2.0,LGPL2.1}"
77-
}
78-
}
7976
buildTypes {
8077
release {
8178
isMinifyEnabled = false

demo/compose/src/desktopMain/kotlin/Main.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import androidx.compose.ui.window.Window
22
import androidx.compose.ui.window.application
3-
import saschpe.log4k.FileLogger
4-
import saschpe.log4k.FileLogger.Limit
5-
import saschpe.log4k.FileLogger.Rotate
63
import saschpe.log4k.Log
4+
import saschpe.log4k.slf4j.SLF4JLogger
75

86
fun main() = application {
9-
Log.loggers += FileLogger(rotate = Rotate.Daily, limit = Limit.Files(max = 5))
7+
Log.loggers.clear()
8+
Log.loggers += SLF4JLogger()
9+
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
1010
Log.debug { "Desktop main" }
1111

1212
Window(

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ kotlin = "2.0.20"
1010
ktlint = "1.3.1"
1111
log4k-demo = "1.0.0"
1212
mockk = "1.13.12"
13+
slf4j = "2.0.16"
1314

1415
[libraries]
1516
androidx-activity-compose = "androidx.activity:activity-compose:1.9.2"
@@ -18,7 +19,8 @@ kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
1819
kotlinx-io = "org.jetbrains.kotlinx:kotlinx-io-core:0.5.4"
1920
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
2021
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
21-
slf4j-api = "org.slf4j:slf4j-api:1.7.36"
22+
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
23+
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
2224

2325
[plugins]
2426
android-application = { id = "com.android.application", version.ref = "gradle-android" }

0 commit comments

Comments
 (0)