Merge pull request #398 from sbt/wip/jarjarabrams

switch to jar jar abrams 0.1.0

build.sbt

@@ -1,20 +1,16 @@
-lazy val commonSettings: Seq[Setting[_]] = Seq(
-  version in ThisBuild := "0.14.11-SNAPSHOT",
-  organization in ThisBuild := "com.eed3si9n"
-)
+ThisBuild / version := "0.14.11-SNAPSHOT"
+ThisBuild / organization := "com.eed3si9n"
 
-lazy val root = (project in file(".")).
-  // enablePlugins(GitVersioning).
-  settings(commonSettings: _*).
-  settings(
-    sbtPlugin := true,
+lazy val root = (project in file("."))
+  .enablePlugins(SbtPlugin)
+  .settings(
     name := "sbt-assembly",
     description := "sbt plugin to create a single fat jar",
     licenses := Seq("MIT License" -> url("https://github.com/sbt/sbt-assembly/blob/master/LICENSE")),
     scalacOptions := Seq("-deprecation", "-unchecked", "-Dscalac.patmat.analysisBudget=1024", "-Xfuture"),
     libraryDependencies ++= Seq(
       "org.scalactic" %% "scalactic" % "3.0.8",
-      "org.pantsbuild" % "jarjar" % "1.7.2",
+      "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "0.1.0",
       "org.scalatest" %% "scalatest" % "3.1.1" % Test,
     ),
     crossSbtVersions := Seq("0.13.18", "1.2.8"), // https://github.com/sbt/sbt/issues/5049

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.6
+sbt.version=1.3.12

src/main/scala/sbtassembly/Assembly.scala

@@ -2,11 +2,13 @@ package sbtassembly
 
 import sbt._
 import Keys._
+import Path.relativeTo
 import java.security.MessageDigest
 import java.io.{IOException, File}
 import scala.collection.mutable
 import Def.Initialize
 import PluginCompat._
+import com.eed3si9n.jarjarabrams._
 
 object Assembly {
   import AssemblyPlugin.autoImport.{ Assembly => _, _ }
@@ -217,15 +219,21 @@ object Assembly {
         dest.mkdir()
         IO.copyDirectory(dir.data, dest)
         if (dirRules.nonEmpty) {
-          Shader.shadeDirectory(dirRules, dest, log, ao.level)
+          val mappings = ((dest ** (-DirectoryFilter)).get  pair relativeTo(dest)) map {
+            case (k, v) => k.toPath -> v
+          }
+          Shader.shadeDirectory(dirRules, dest.toPath, mappings, ao.level == Level.Debug)
         }
         dest
       }
     val jarDirs =
       (for(jar <- libsFiltered.par) yield {
         val jarName = jar.data.asFile.getName
         val jarRules = shadeRules
-          .filter(r => (r.isApplicableToAll || jar.metadata.get(moduleID.key).exists(r.isApplicableTo)))
+          .filter(r => (r.isApplicableToAll ||
+            jar.metadata.get(moduleID.key)
+              .map(m => ModuleCoordinate(m.organization, m.name, m.revision))
+              .exists(r.isApplicableTo)))
         val hash = sha1name(jar.data) + "_" + sha1content(jar.data) + "_" + sha1rules(jarRules)
         val jarNamePath = tempDir / (hash + ".jarName")
         val dest = tempDir / hash
@@ -238,7 +246,10 @@ object Assembly {
           AssemblyUtils.unzip(jar.data, dest, log)
           IO.delete(ao.excludedFiles(Seq(dest)))
           if (jarRules.nonEmpty) {
-            Shader.shadeDirectory(jarRules, dest, log, ao.level)
+            val mappings = ((dest ** (-DirectoryFilter)).get pair relativeTo(dest)) map {
+              case (k, v) => k.toPath -> v
+            }
+            Shader.shadeDirectory(dirRules, dest.toPath, mappings, ao.level == Level.Debug)
           }
 
           // Write the jarNamePath at the end to minimise the chance of having a

src/main/scala/sbtassembly/AssemblyKeys.scala

@@ -2,6 +2,7 @@ package sbtassembly
 
 import sbt._
 import Keys._
+import com.eed3si9n.jarjarabrams
 
 trait AssemblyKeys {
   lazy val assembly                  = taskKey[File]("Builds a deployable fat jar.")
@@ -37,7 +38,7 @@ trait AssemblyKeys {
   @deprecated("Use assemblyMergeStrategy", "0.12.0")
   lazy val mergeStrategy             = assemblyMergeStrategy
 
-  lazy val assemblyShadeRules        = settingKey[Seq[ShadeRule]]("shading rules backed by jarjar")
+  lazy val assemblyShadeRules        = settingKey[Seq[jarjarabrams.ShadeRule]]("shading rules backed by jarjar")
 }
 object AssemblyKeys extends AssemblyKeys
 

src/main/scala/sbtassembly/AssemblyPlugin.scala

@@ -2,6 +2,7 @@ package sbtassembly
 
 import sbt._
 import Keys._
+import com.eed3si9n.jarjarabrams
 
 object AssemblyPlugin extends sbt.AutoPlugin {
   override def requires = plugins.JvmPlugin
@@ -12,7 +13,12 @@ object AssemblyPlugin extends sbt.AutoPlugin {
     val MergeStrategy = sbtassembly.MergeStrategy
     val PathList = sbtassembly.PathList
     val baseAssemblySettings = AssemblyPlugin.baseAssemblySettings
-    val ShadeRule = sbtassembly.ShadeRule
+    val ShadeRule = com.eed3si9n.jarjarabrams.ShadeRule
+    implicit class RichShadePattern(pattern: jarjarabrams.ShadePattern) {
+      def inLibrary(moduleId: ModuleID*): jarjarabrams.ShadeRule =
+        pattern.inModuleCoordinates(moduleId.toVector
+          .map(m => jarjarabrams.ModuleCoordinate(m.organization, m.name, m.revision)): _*)
+    }
   }
   import autoImport.{ Assembly => _, baseAssemblySettings => _, _ }
 
@@ -151,6 +157,6 @@ case class AssemblyOption(assemblyDirectory: File,
   appendContentHash: Boolean = false,
   prependShellScript: Option[Seq[String]] = None,
   maxHashLength: Option[Int] = None,
-  shadeRules: Seq[ShadeRule] = Seq(),
+  shadeRules: Seq[jarjarabrams.ShadeRule] = Seq(),
   scalaVersion: String = "",
   level: Level.Value)