Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use JJProcessor from jarjar-abrams #47

Merged
merged 1 commit into from
May 23, 2024
Merged

Use JJProcessor from jarjar-abrams #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/main/scala/coursier/ShadingPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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) ||
Expand Down
33 changes: 0 additions & 33 deletions src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala
View file
Open in desktop

This file was deleted.

Loading