Switch logging from Log4j to Slf4j

Also bump a couple of dependencies
DenWav · Oct 24, 2021 · 79f9186 · 79f9186
1 parent 41c538b
commit 79f9186
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,15 @@
 [versions]
-junit = "5.7.1"
-errorprone = "2.6.0"
-asm = "9.1"
+junit = "5.8.1"
+errorprone = "2.9.0"
+asm = "9.2"
+slf4j = "1.7.32"
 log4j = "2.14.1"
 
 [libraries]
 # Deps
-annotations = "org.jetbrains:annotations:20.1.0"
-log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
+annotations = "org.jetbrains:annotations:22.0.0"
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-log4j2-impl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 
 asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }

diff --git a/.../hypo-asm-hydrate/src/main/java/dev/denwav/hypo/asm/hydrate/SuperConstructorHydrator.java b/.../hypo-asm-hydrate/src/main/java/dev/denwav/hypo/asm/hydrate/SuperConstructorHydrator.java
@@ -35,8 +35,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -51,6 +49,8 @@
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.TypeInsnNode;
 import org.objectweb.asm.tree.VarInsnNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link HydrationProvider} for determining the target of {@code this()} and {@code super()} constructor calls, as well
@@ -62,7 +62,7 @@
  */
 public class SuperConstructorHydrator implements HydrationProvider<AsmConstructorData> {
 
-    private static final Logger logger = LogManager.getLogger(SuperConstructorHydrator.class);
+    private static final Logger logger = LoggerFactory.getLogger(SuperConstructorHydrator.class);
 
     private SuperConstructorHydrator() {}
 

diff --git a/hypo-model/build.gradle.kts b/hypo-model/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
     compileOnlyApi(libs.annotations)
-    api(libs.log4j.api)
+    api(libs.slf4j.api)
 }
 
 tasks.jar {

diff --git a/hypo-test/build.gradle.kts b/hypo-test/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
     api(libs.lorenzTiny)
     api(libs.asm.commons)
     api(libs.log4j.core)
+    api(libs.slf4j.log4j2.impl)
 
     api(libs.junit.api)
     runtimeOnly(libs.junit.runtime)