Merge pull request #47 from williamyaoh/master

Use JJProcessor from jarjar-abrams
coursier · May 23, 2024 · f6473d6 · f6473d6
2 parents db53aeb + 87f6876
commit f6473d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 37 deletions.
diff --git a/src/main/scala/coursier/ShadingPlugin.scala b/src/main/scala/coursier/ShadingPlugin.scala
@@ -4,8 +4,8 @@ import java.io.File
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.util.zip.ZipFile
-
 import com.eed3si9n.jarjar.Rule
+import com.eed3si9n.jarjar.misplaced.MisplacedClassProcessorFactory
 import com.eed3si9n.jarjar.util.CoursierJarProcessor
 import sbt._
 import sbt.Keys._
@@ -215,9 +215,8 @@ object ShadingPlugin extends AutoPlugin {
       val dest = orig.getParentFile / s"${orig.getName.stripSuffix(".jar")}-shading.jar"
       if (!dest.exists() || dest.lastModified() < orig.lastModified()) {
         import com.eed3si9n.jarjar.JJProcessor
-        import com.eed3si9n.jarjar.util.StandaloneJarProcessor
-        val processor = JJProcessor(rules, verbose, false)
-        CoursierJarProcessor.run((orig +: shadedJars0).toArray, dest, processor.proc, true)
+        val processor = new JJProcessor(rules, verbose, false, MisplacedClassProcessorFactory.Strategy.FATAL.toString)
+        CoursierJarProcessor.run((orig +: shadedJars0).toArray, dest, processor, true)
       }
       def isValid(entry: String): Boolean = 
         validEntries.contains(entry) || 

diff --git a/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala b/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala