From c6c82fe6d1f77cd0b9c33a4b04c90306056b3623 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sun, 31 Jul 2022 14:08:51 +1000
Subject: [PATCH] Bundle slf4j-nop in detekt-formatting JAR

Fixes #4811
---
 detekt-formatting/build.gradle.kts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/detekt-formatting/build.gradle.kts b/detekt-formatting/build.gradle.kts
index 5b89fc4e045..ca4436569d4 100644
--- a/detekt-formatting/build.gradle.kts
+++ b/detekt-formatting/build.gradle.kts
@@ -2,6 +2,8 @@ plugins {
     id("module")
 }
 
+val extraDepsToPackage: Configuration by configurations.creating
+
 dependencies {
     compileOnly(projects.detektApi)
     implementation(libs.ktlint.rulesetStandard) {
@@ -13,10 +15,11 @@ dependencies {
     implementation(libs.ktlint.rulesetExperimental) {
         exclude(group = "org.jetbrains.kotlin")
     }
-    runtimeOnly(libs.slf4j.nop)
 
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
+
+    extraDepsToPackage(libs.slf4j.nop)
 }
 
 tasks.build { finalizedBy(":detekt-generator:generateDocumentation") }
@@ -25,15 +28,15 @@ val depsToPackage = setOf(
     "org.ec4j.core",
     "com.pinterest.ktlint",
     "io.github.microutils",
-    "org.slf4j",
 )
 
 tasks.jar {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE // allow duplicates
-    dependsOn(configurations.runtimeClasspath)
-    from({
+    dependsOn(configurations.runtimeClasspath, extraDepsToPackage)
+    from(
         configurations.runtimeClasspath.get()
             .filter { dependency -> depsToPackage.any { it in dependency.toString() } }
-            .map { if (it.isDirectory) it else zipTree(it) }
-    })
+            .map { if (it.isDirectory) it else zipTree(it) },
+        extraDepsToPackage.map { zipTree(it) },
+    )
 }