Repository navigation
Commit f1d3f82
committed
Drop vendored Logger/LoggerFactory wrapper; use SLF4J + Logback directly
The OSInfo resync from xerial/sqlite-jdbc brought a same-package
Logger / LoggerFactory pair that re-implemented a tiny SLF4J facade.
For this project that wrapper is dead weight: depending on slf4j-api
directly and shipping logback-classic at runtime scope gives the same
behaviour with no hand-maintained code.
Changes:
- Delete src/main/java/net/ladenthin/llama/Logger.java
- Delete src/main/java/net/ladenthin/llama/LoggerFactory.java
- OSInfo.java: import org.slf4j.Logger / org.slf4j.LoggerFactory
directly. Drop the Supplier<String> lazy form at the two
LogHolder.logger call sites in getHardwareName() and
resolveArmArchType() (both messages are constant strings, so eager
construction is free). Header comment lists this as a third
documented deviation from the upstream sqlite-jdbc file.
- pom.xml: slf4j-api 2.0.18 -> non-optional (compile). Add
logback-classic 1.5.32 at runtime scope as the default binding.
AndroidSignatureIgnore.java is kept as-is — it is a marker annotation,
not a logging shim, and removing it would add a 4th deviation from
upstream for no gain.
Verified:
- mvn clean compile: BUILD SUCCESS
- mvn test -Dtest=OSInfoTest,LlamaLoaderTest: 37/37 pass
- mvn dependency:tree: slf4j-api:compile, logback-classic:runtime,
logback-core:runtime (transitive). No duplicate binding.
- reuse lint: 138/138 files compliant with REUSE 3.3.1 parent 65c6256 commit f1d3f82
4 files changed
Lines changed: 18 additions & 149 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
77 | | - | |
| 76 | + | |
78 | 77 | | |
79 | 78 | | |
80 | 79 | | |
81 | 80 | | |
82 | | - | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
83 | 89 | | |
84 | 90 | | |
85 | 91 | | |
| |||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
30 | 34 | | |
31 | 35 | | |
32 | 36 | | |
| |||
65 | 69 | | |
66 | 70 | | |
67 | 71 | | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
68 | 75 | | |
69 | 76 | | |
70 | 77 | | |
| |||
212 | 219 | | |
213 | 220 | | |
214 | 221 | | |
215 | | - | |
| 222 | + | |
216 | 223 | | |
217 | 224 | | |
218 | 225 | | |
| |||
280 | 287 | | |
281 | 288 | | |
282 | 289 | | |
283 | | - | |
284 | | - | |
| 290 | + | |
285 | 291 | | |
286 | 292 | | |
287 | 293 | | |
| |||
0 commit comments