Rollback to slf4j-api v1

DiscordSRV · Nov 16, 2024 · 751ab29 · 751ab29
1 parent 791abc7
commit 751ab29
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -12,8 +12,11 @@ dependencies {
     api(libs.jda) {
         // We don't use audio
         exclude module: 'opus-java'
+        // v2
+        exclude module: 'slf4j-api'
     }
     api(libs.okhttp)
+    api(libs.slf4j.api)
 }
 
 // Relocations are in buildscript/api.gradle

diff --git a/bukkit/paper/build.gradle b/bukkit/paper/build.gradle
@@ -4,7 +4,10 @@ java {
 
 dependencies {
     // Platform
-    compileOnly(libs.paperapi)
+    compileOnly(libs.paperapi) {
+        // v2
+        exclude module: 'slf4j-api'
+    }
 
     // Adventure (runtime downloaded by :bukkit)
     compileOnly(libs.adventure.platform.bukkit)

diff --git a/settings.gradle b/settings.gradle
@@ -116,7 +116,10 @@ dependencyResolutionManagement {
             library('essentialsx', 'net.essentialsx', 'EssentialsX').version('2.20.1')
 
             // Logging
-            library('slf4j-api', 'org.slf4j', 'slf4j-api').version('1.7.36')
+            library('slf4j-api', 'org.slf4j', 'slf4j-api').version {
+                prefer '1.7.36'
+                reject '[2,)' // Uses ServiceLoader
+            }
             library('log4j-core', 'org.apache.logging.log4j', 'log4j-core').version('2.0-beta9')
 
             // Adventure

diff --git a/velocity/build.gradle b/velocity/build.gradle
@@ -43,9 +43,14 @@ dependencies {
     implementation project(':common')
 
     // Platform
-    annotationProcessor(libs.velocity)
+    annotationProcessor(libs.velocity) {
+        // v2
+        exclude module: 'slf4j-api'
+    }
     compileOnly(libs.velocity) {
         exclude module: 'caffeine'
+        // v2
+        exclude module: 'slf4j-api'
     }
 
     // DependencyDownload
@@ -54,6 +59,6 @@ dependencies {
 
 tasks {
     runVelocity {
-        velocityVersion("3.1.2-SNAPSHOT")
+        velocityVersion(libs.velocity.get().version)
     }
 }