Skip to content

Commit

Permalink
Merge pull request #254 from NordicSemiconductor/migration/slf4j
Browse files Browse the repository at this point in the history
SLF4J migrastion
  • Loading branch information
philips77 authored Jul 2, 2024
2 parents aa89ffe + 22c4008 commit 475e40a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ chart = "v3.1.0"
leakcanary = "2.14"
mockk = "1.13.11"
truth = "1.4.3"
slf4j = "1.7.36" # don't update to 2.x, unless the next one is also updated
slf4j-timber = "3.1" # <- this one
slf4j = "2.0.13"
slf4j-timber = "1.1"
robolectric = "4.12.2"
skydovesBallon = "1.6.5"
moshi = "1.15.1"
Expand Down Expand Up @@ -195,7 +195,7 @@ leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", v
slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
slf4j-nop = { group = "org.slf4j", name = "slf4j-nop", version.ref = "slf4j" }
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
slf4j-timber = { group = "com.arcao", name = "slf4j-timber", version.ref = "slf4j-timber" }
slf4j-timber = { group = "uk.kulikov", name = "slf4j2-timber", version.ref = "slf4j-timber" }
test-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
test-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
skydoves-ballon = { group = "com.github.skydoves", name = "balloon-compose", version.ref = "skydovesBallon" }
Expand Down
8 changes: 0 additions & 8 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
"org.jetbrains.kotlin.*"
],
"groupName": "kotlin"
},
{
"matchPackageNames": [
"org.slf4j:slf4j-api",
"org.slf4j:slf4j-nop",
"org.slf4j:slf4j-simple"
],
"enabled": false
}
]
}

0 comments on commit 475e40a

Please sign in to comment.