From 9694d320834bb7332fc8407005310a75a9ee7a66 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 11 May 2020 22:41:08 +0200 Subject: [PATCH 1/2] Remove sbt-shading sources It now lives at https://github.com/coursier/sbt-shading. --- .travis.yml | 1 - appveyor.yml | 2 +- build.sbt | 20 +- .../jarjar/util/CoursierJarProcessor.java | 74 ------ .../src/main/scala/coursier/Shading.scala | 212 ------------------ .../main/scala/coursier/ShadingPlugin.scala | 164 -------------- .../org/pantsbuild/jarjar/JJProcessor.scala | 33 --- .../cross-project-shading/build.sbt | 20 -- .../cross-project-shading/coursier | Bin 11832 -> 0 bytes .../jvm/src/main/scala/Main.scala | 21 -- .../cross-project-shading/project/plugins.sbt | 13 -- .../shared/src/main/scala/Foo.scala | 16 -- .../sbt-shading/cross-project-shading/test | 10 - .../exclude-dependencies/build.sbt | 17 -- .../sbt-shading/exclude-dependencies/coursier | Bin 11832 -> 0 bytes .../exclude-dependencies/project/plugins.sbt | 11 - .../src/main/scala/Main.scala | 44 ---- .../sbt-shading/exclude-dependencies/test | 9 - .../sbt-shading/shade-namespace/build.sbt | 31 --- .../sbt-shading/shade-namespace/coursier | Bin 11832 -> 0 bytes .../shade-namespace/project/plugins.sbt | 11 - .../shade-namespace/src/main/scala/Main.scala | 27 --- .../sbt-test/sbt-shading/shade-namespace/test | 10 - .../sbt-test/sbt-shading/shading/build.sbt | 13 -- .../src/sbt-test/sbt-shading/shading/coursier | Bin 11832 -> 0 bytes .../sbt-shading/shading/project/plugins.sbt | 11 - .../shading/src/main/scala/Main.scala | 27 --- .../src/sbt-test/sbt-shading/shading/test | 9 - .../sbt-shading/transitive-shading/build.sbt | 14 -- .../sbt-shading/transitive-shading/coursier | Bin 11832 -> 0 bytes .../transitive-shading/project/plugins.sbt | 11 - .../src/main/scala/Main.scala | 27 --- .../sbt-shading/transitive-shading/test | 9 - 33 files changed, 2 insertions(+), 865 deletions(-) delete mode 100644 modules/sbt-shading/src/main/java/org/pantsbuild/jarjar/util/CoursierJarProcessor.java delete mode 100644 modules/sbt-shading/src/main/scala/coursier/Shading.scala delete mode 100644 modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala delete mode 100644 modules/sbt-shading/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt delete mode 100755 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/coursier delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt delete mode 100755 modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/coursier delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/src/main/scala/Main.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/test delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt delete mode 100755 modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shading/build.sbt delete mode 100755 modules/sbt-shading/src/sbt-test/sbt-shading/shading/coursier delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shading/src/main/scala/Main.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/shading/test delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/build.sbt delete mode 100755 modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/coursier delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/src/main/scala/Main.scala delete mode 100644 modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/test diff --git a/.travis.yml b/.travis.yml index efef3f55e..3afc29de5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ jobs: include: - env: SBT_COURSIER=1 TEST_GROUP=1 - env: SBT_COURSIER=1 TEST_GROUP=2 - - env: SBT_SHADING=1 - env: SBT_PGP_COURSIER=1 - env: LM_COURSIER=1 TEST_GROUP=1 - env: LM_COURSIER=1 TEST_GROUP=2 diff --git a/appveyor.yml b/appveyor.yml index 4a29190cd..5b5c15d3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ build_script: - cmd: .\metadata\coursier fetch io.get-coursier:http-server_2.12:1.0.0 - ps: Start-Job -filepath .\metadata\scripts\start-it-auth-server.ps1 -ArgumentList $pwd\metadata, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD test_script: - - sbt ++2.12.7 "sbt-lm-coursier/scripted shared-2/simple" sbt-coursier/scripted sbt-shading/scripted + - sbt ++2.12.7 "sbt-lm-coursier/scripted shared-2/simple" sbt-coursier/scripted branches: only: - master diff --git a/build.sbt b/build.sbt index c89eb8155..db3673bad 100644 --- a/build.sbt +++ b/build.sbt @@ -145,23 +145,6 @@ lazy val `sbt-pgp-coursier` = project } ) -lazy val `sbt-shading` = project - .in(file("modules/sbt-shading")) - .enablePlugins(ScriptedPlugin) - .disablePlugins(MimaPlugin) - .dependsOn(`sbt-coursier`) - .settings( - plugin, - libraryDependencies += ("ch.epfl.scala" % "jarjar" % "1.7.2-patched") - .exclude("org.apache.maven", "maven-plugin-api") - .exclude("org.apache.ant", "ant"), - scriptedDependencies := { - scriptedDependencies.value - // TODO Get dependency projects automatically - scriptedDependencies.in(`sbt-coursier`).value - } - ) - lazy val `sbt-coursier-root` = project .in(file(".")) .disablePlugins(MimaPlugin) @@ -172,8 +155,7 @@ lazy val `sbt-coursier-root` = project `sbt-coursier-shared`, `sbt-coursier-shared-shaded`, `sbt-lm-coursier`, - `sbt-pgp-coursier`, - `sbt-shading` + `sbt-pgp-coursier` ) .settings( shared, diff --git a/modules/sbt-shading/src/main/java/org/pantsbuild/jarjar/util/CoursierJarProcessor.java b/modules/sbt-shading/src/main/java/org/pantsbuild/jarjar/util/CoursierJarProcessor.java deleted file mode 100644 index 51032b56f..000000000 --- a/modules/sbt-shading/src/main/java/org/pantsbuild/jarjar/util/CoursierJarProcessor.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.pantsbuild.jarjar.util; - -// adapted from https://github.com/pantsbuild/jarjar/blob/57845dc73d3e2c9b916ae4a788cfa12114fd7df1/src/main/java/org/pantsbuild/jarjar/util/StandaloneJarProcessor.java -// - made it accepted a List rather than a single File -// - added argument ignoreDuplicateEntries - -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.jar.JarOutputStream; -import java.util.Enumeration; -import java.io.*; -import java.util.*; - -public class CoursierJarProcessor -{ - public static void run(File[] from, File to, JarProcessor proc, boolean ignoreDuplicateEntries) throws IOException { - byte[] buf = new byte[0x2000]; - - final File tmpTo = File.createTempFile("jarjar", ".jar"); - Set entries = new HashSet<>(); - - FileOutputStream fos = null; - JarOutputStream out = null; - try { - fos = new FileOutputStream(tmpTo); - BufferedOutputStream buffered = new BufferedOutputStream(fos); - out = new JarOutputStream(buffered); - - for (File from0 : from) { - JarFile in = null; - try { - in = new JarFile(from0); - Enumeration e = in.entries(); - while (e.hasMoreElements()) { - EntryStruct struct = new EntryStruct(); - JarEntry entry = e.nextElement(); - struct.name = entry.getName(); - struct.time = entry.getTime(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - IoUtil.pipe(in.getInputStream(entry), baos, buf); - struct.data = baos.toByteArray(); - if (proc.process(struct)) { - if (entries.add(struct.name)) { - entry = new JarEntry(struct.name); - entry.setTime(struct.time); - entry.setCompressedSize(-1); - out.putNextEntry(entry); - out.write(struct.data); - } else if (struct.name.endsWith("/")) { - // TODO(chrisn): log - } else if (!ignoreDuplicateEntries) { - throw new DuplicateJarEntryException(from0.getAbsolutePath(), struct.name); - } - } - } - - } finally { - if (in != null) - in.close(); - } - } - } finally { - if (out != null) - out.close(); - if (fos != null) - fos.close(); - } - - // delete the empty directories - IoUtil.copyZipWithoutEmptyDirectories(tmpTo, to); - tmpTo.delete(); - - } -} diff --git a/modules/sbt-shading/src/main/scala/coursier/Shading.scala b/modules/sbt-shading/src/main/scala/coursier/Shading.scala deleted file mode 100644 index 51ccde956..000000000 --- a/modules/sbt-shading/src/main/scala/coursier/Shading.scala +++ /dev/null @@ -1,212 +0,0 @@ -package coursier - -import java.io.{File, FileInputStream} -import java.util.jar.JarInputStream -import java.util.zip.{ZipEntry, ZipInputStream} - -import coursier.core.{Configuration, Orders} -import coursier.util.Artifact -import org.pantsbuild.jarjar._ -import org.pantsbuild.jarjar.util.CoursierJarProcessor - -object Shading { - - // FIXME Also vaguely in cli - def zipEntries(zipStream: ZipInputStream): Iterator[ZipEntry] = - new Iterator[ZipEntry] { - var nextEntry = Option.empty[ZipEntry] - def update() = - nextEntry = Option(zipStream.getNextEntry) - - update() - - def hasNext = nextEntry.nonEmpty - def next() = { - val ent = nextEntry.get - update() - ent - } - } - - def jarClassNames(jar: File): Seq[String] = { - - var fis: FileInputStream = null - var zis: JarInputStream = null - - try { - fis = new FileInputStream(jar) - zis = new JarInputStream(fis) - - zipEntries(zis) - .map(_.getName) - .filter(_.endsWith(".class")) - .map(_.stripSuffix(".class").replace('/', '.')) - .toVector - } finally { - if (zis != null) - zis.close() - if (fis != null) - fis.close() - } - } - - def toShadeJars( - currentProject: Project, - res: Resolution, - configs: Map[Configuration, Set[Configuration]], - artifactFilesOrErrors: Map[Artifact, File], - classpathTypes: Set[Type], - baseConfig: Configuration, - shadedConf: Configuration, - log: sbt.Logger - ): Seq[File] = { - - def configDependencies(config: Configuration) = { - - def minDependencies(dependencies: Seq[Dependency]): Seq[Dependency] = - Orders.minDependencies( - dependencies.toSet, - dep => - res - .projectCache - .get(dep) - .map(_._2.configurations) - .getOrElse(Map.empty) - ).toSeq // sort so that this is deterministic? - - val includedConfigs = configs.getOrElse(config, Set.empty) + config - - minDependencies( - currentProject - .dependencies - .collect { - case (cfg, dep) if includedConfigs(cfg) => - dep - } - ) - } - - val dependencyArtifacts = res - .dependencyArtifacts(None, classpathOrder = false) - .filter { case (_, attr, _) => classpathTypes(attr.`type`) } - .groupBy(_._1) - .mapValues(_.map(t => (t._2, t._3))) - .iterator - .toMap - - val artifactFilesOrErrors0 = artifactFilesOrErrors - .collect { - case (a, f) => a.url -> f - } - - val compileDeps = configDependencies(baseConfig) - val shadedDeps = configDependencies(shadedConf) - - val compileOnlyDeps = compileDeps.filterNot(shadedDeps.toSet) - - log.debug( - s"Found ${compileDeps.size} dependencies in $baseConfig\n" + - compileDeps.toVector.map(" " + _).sorted.mkString("\n") - ) - log.debug( - s"Found ${compileOnlyDeps.size} dependencies only in $baseConfig\n" + - compileOnlyDeps.toVector.map(" " + _).sorted.mkString("\n") - ) - log.debug( - s"Found ${shadedDeps.size} dependencies in $shadedConf\n" + - shadedDeps.toVector.map(" " + _).sorted.mkString("\n") - ) - - def files(deps: Seq[Dependency]) = res - .subset(deps) - .minDependencies - .toSeq - .flatMap(dependencyArtifacts.get) - .flatten - .map(_._2.url) - .flatMap(artifactFilesOrErrors0.get) - - val noShadeJars = files(compileOnlyDeps) - val allShadedConfJars = files(shadedDeps) - - log.debug( - s"Found ${noShadeJars.length} JAR(s) only in $baseConfig\n" + - noShadeJars.map(" " + _).sorted.mkString("\n") - ) - log.debug( - s"Found ${allShadedConfJars.length} JAR(s) in $shadedConf\n" + - allShadedConfJars.map(" " + _).sorted.mkString("\n") - ) - - allShadedConfJars.filterNot(noShadeJars.toSet) - } - - def toShadeClasses( - shadeNamespaces: Set[String], - toShadeJars: Seq[File], - log: sbt.Logger - ): Seq[String] = { - - log.info( - s"Shading ${toShadeJars.length} JAR(s):\n" + - toShadeJars.map(" " + _).sorted.mkString("\n") - ) - - val toShadeClasses0 = toShadeJars.flatMap(jarClassNames) - - log.info(s"Found ${toShadeClasses0.length} class(es) in JAR(s) to be shaded") - log.debug(toShadeClasses0.map(" " + _).sorted.mkString("\n")) - - val toShadeClasses = shadeNamespaces.toVector.sorted.foldLeft(toShadeClasses0) { - (toShade, namespace) => - val prefix = namespace + "." - val (filteredOut, remaining) = toShade.partition(_.startsWith(prefix)) - - log.info(s"${filteredOut.length} classes already filtered out by shaded namespace $namespace") - log.debug(filteredOut.map(" " + _).sorted.mkString("\n")) - - remaining - } - - if (shadeNamespaces.nonEmpty) { - log.info(s"${toShadeClasses.length} remaining class(es) to be shaded") - log.debug(toShadeClasses.map(" " + _).sorted.mkString("\n")) - } - - toShadeClasses - } - - def createPackage( - baseJar: File, - shadingNamespace: String, - shadeNamespaces: Set[String], - toShadeClasses: Seq[String], - toShadeJars: Seq[File] - ) = { - - val outputJar = new File( - baseJar.getParentFile, - baseJar.getName.stripSuffix(".jar") + "-shading.jar" - ) - - def rename(from: String, to: String): Rule = { - val rule = new Rule - rule.setPattern(from) - rule.setResult(to) - rule - } - - val nsRules = shadeNamespaces.toVector.sorted.map { namespace => - rename(namespace + ".**", shadingNamespace + ".@0") - } - val clsRules = toShadeClasses.map { cls => - rename(cls, shadingNamespace + ".@0") - } - - val processor = JJProcessor(nsRules ++ clsRules, verbose = false, skipManifest = false) - CoursierJarProcessor.run((baseJar +: toShadeJars).toArray, outputJar, processor.proc, true) - - outputJar - } - -} diff --git a/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala b/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala deleted file mode 100644 index a4a960401..000000000 --- a/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala +++ /dev/null @@ -1,164 +0,0 @@ -package coursier - -import java.io.File - -import coursier.core.Configuration -import coursier.ivy.IvyXml.{mappings => ivyXmlMappings} -import lmcoursier.definitions.{ToCoursier, Configuration => DConfiguration} -import coursier.sbtcoursier.{CoursierPlugin, InputsTasks, Keys} -import coursier.sbtcoursiershared.{IvyXml, SbtCoursierShared} -import sbt.Keys._ -import sbt.{AutoPlugin, Compile, SettingKey, TaskKey, inConfig} - -object ShadingPlugin extends AutoPlugin { - - override def trigger = noTrigger - - override def requires = CoursierPlugin - - private val baseSbtConfiguration = Compile - val Shading = sbt.Configuration.of( - id = "Shading", - name = "shading", - description = "", - isPublic = false, - Vector(baseSbtConfiguration), - transitive = true - ) - - private val baseDependencyConfiguration = Configuration("compile") - val Shaded = sbt.Configuration.of( - id = "Shaded", - name = "shaded", - description = "", - isPublic = true, - Vector(), - transitive = true - ) - - val shadingNamespace = SettingKey[String]("shading-namespace") - - val shadeNamespaces = SettingKey[Set[String]]("shade-namespaces") - - val toShadeJars = TaskKey[Seq[File]]("to-shade-jars") - val toShadeClasses = TaskKey[Seq[String]]("to-shade-classes") - - object autoImport { - - /** Scope for shading related tasks */ - val Shading = ShadingPlugin.Shading - - /** Ivy configuration for shaded dependencies */ - val Shaded = ShadingPlugin.Shaded - - /** Namespace under which shaded things will be moved */ - val shadingNamespace = ShadingPlugin.shadingNamespace - - /** - * Assume everything under these namespaces is to be shaded. - * - * Allows to speed the shading phase, if everything under some namespaces is to be shaded. - */ - val shadeNamespaces = ShadingPlugin.shadeNamespaces - - val toShadeJars = ShadingPlugin.toShadeJars - val toShadeClasses = ShadingPlugin.toShadeClasses - } - - // same as similar things under sbt.Classpaths, tweaking a bit the configuration scope - lazy val shadingDefaultArtifactTasks = - makePom +: Seq(packageBin, packageSrc, packageDoc).map(_.in(Shading)) - lazy val shadingJvmPublishSettings = Seq( - artifacts := sbt.Classpaths.artifactDefs(shadingDefaultArtifactTasks).value, - packagedArtifacts := sbt.Classpaths.packaged(shadingDefaultArtifactTasks).value - ) - - import coursier.sbtcoursier.CoursierPlugin.autoImport._ - import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._ - - override lazy val buildSettings = super.buildSettings ++ Seq( - shadeNamespaces := Set() - ) - - override lazy val projectSettings = - Seq( - coursierConfigurations := InputsTasks.coursierConfigurationsTask( - Some(baseDependencyConfiguration.value -> Configuration(Shaded.name)) - ).value, - ivyConfigurations := Shaded +: ivyConfigurations.value.map { - conf => - if (conf.name == "compile") - conf.extend(Shaded) - else - conf - } - ) ++ - inConfig(Shading)( - sbt.Defaults.configSettings ++ - sbt.Classpaths.ivyBaseSettings ++ - sbt.Classpaths.ivyPublishSettings ++ - shadingJvmPublishSettings ++ - SbtCoursierShared.settings(pubSettings = false) ++ - CoursierPlugin.coursierSettings( - Some(baseDependencyConfiguration.value -> Configuration(Shaded.name)) - ) ++ - IvyXml.generateIvyXmlSettings(Some(lmcoursier.definitions.Configuration(Shaded.name))) ++ - Seq(SbtCoursierShared.publicationsSetting(Seq(Shading -> DConfiguration("compile")))) ++ - CoursierPlugin.treeSettings ++ - Seq( - configuration := baseSbtConfiguration, // wuw - ivyConfigurations := ivyConfigurations.in(baseSbtConfiguration).value - .filter(_.name != Shaded.name) - .map(c => c.withExtendsConfigs(c.extendsConfigs.filter(_.name != Shaded.name))), - libraryDependencies := libraryDependencies.in(baseSbtConfiguration).value.filter { dep => - val isShaded = dep.configurations.exists { mappings => - ivyXmlMappings(mappings).exists(_._1 == Configuration(Shaded.name)) - } - - !isShaded - }, - // required for cross-projects in particular - unmanagedSourceDirectories := (unmanagedSourceDirectories in Compile).value, - toShadeJars := { - coursier.Shading.toShadeJars( - ToCoursier.project(coursierProject.in(baseSbtConfiguration).value), - coursierResolutions - .in(baseSbtConfiguration) - .value - .collectFirst { - case (configs, res) if configs(baseDependencyConfiguration) => - res - } - .getOrElse { - sys.error(s"Resolution for configuration $baseDependencyConfiguration not found") - }, - coursierConfigurations.in(baseSbtConfiguration).value, - Keys.coursierArtifacts.in(baseSbtConfiguration).value, - classpathTypes.value.map(Type(_)), - baseDependencyConfiguration, - Configuration(Shaded.name), - streams.value.log - ) - }, - toShadeClasses := { - coursier.Shading.toShadeClasses( - shadeNamespaces.value, - toShadeJars.value, - streams.value.log - ) - }, - packageBin := { - coursier.Shading.createPackage( - packageBin.in(baseSbtConfiguration).value, - shadingNamespace.?.value.getOrElse { - throw new NoSuchElementException("shadingNamespace key not set") - }, - shadeNamespaces.value, - toShadeClasses.value, - toShadeJars.value - ) - } - ) - ) - -} diff --git a/modules/sbt-shading/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala b/modules/sbt-shading/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala deleted file mode 100644 index 90062933a..000000000 --- a/modules/sbt-shading/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala +++ /dev/null @@ -1,33 +0,0 @@ -package org.pantsbuild.jarjar - -// from https://github.com/sbt/sbt-assembly/blob/17786404117889e5a8225c97b9b7639160fb91e8/src/main/scala/org/pantsbuild/jarjar/JJProcessor.scala - -import org.pantsbuild.jarjar.util.{EntryStruct, JarProcessor} - -import scala.collection.JavaConverters._ - -class JJProcessor(val proc: JarProcessor) { - - def process(entry: EntryStruct): Boolean = proc.process(entry) - - def getExcludes(): Set[String] = { - val field = proc.getClass().getDeclaredField("kp") - field.setAccessible(true) - val keepProcessor = field.get(proc) - - if (keepProcessor == null) Set() - else { - val method = proc.getClass().getDeclaredMethod("getExcludes") - method.setAccessible(true) - method.invoke(proc).asInstanceOf[java.util.Set[String]].asScala.toSet - } - } - -} - -object JJProcessor { - - def apply(patterns: Seq[PatternElement], verbose: Boolean, skipManifest: Boolean): JJProcessor = - new JJProcessor(new MainProcessor(patterns.asJava, verbose, skipManifest)) - -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt deleted file mode 100644 index 6ecadf4c7..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt +++ /dev/null @@ -1,20 +0,0 @@ - -lazy val root = crossProject - .in(file(".")) - .jvmConfigure( - _.enablePlugins(coursier.ShadingPlugin) - ) - .jvmSettings( - shadingNamespace := "test.shaded", - libraryDependencies += "io.argonaut" %% "argonaut" % "6.2-RC2" % "shaded" - ) - .settings( - scalaVersion := "2.11.12", - organization := "io.get-coursier.test", - name := "shading-cross-test", - version := "0.1.0-SNAPSHOT", - libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value - ) - -lazy val jvm = root.jvm -lazy val js = root.js diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/coursier b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/coursier deleted file mode 100755 index 13c8a2b55460c6b5eb639e6f89e5c32e9be629aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11832 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 diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala deleted file mode 100644 index 30502dda1..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala +++ /dev/null @@ -1,21 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._ - -import Foo._ - -object Main extends App { - - val expectedClassName0 = expectedClassName(args.headOption == Some("--shaded")) - - Console.err.println(s"Expected class name: $expectedClassName0") - Console.err.println(s"Class name: $className") - - if (className != expectedClassName0) - sys.error(s"Expected class name $expectedClassName0, got $className") - - val msg = Json.obj().nospaces - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt deleted file mode 100644 index caf456ff5..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -{ - val pluginVersion = sys.props.getOrElse( - "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) - ) - - addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) -} - -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25") diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala deleted file mode 100644 index 6e510b152..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala +++ /dev/null @@ -1,16 +0,0 @@ - -import argonaut._ - -object Foo { - - def expectedClassName(shaded: Boolean) = - if (shaded) - "test.shaded.argonaut.Json" - else - // Don't use the literal "argonaut.Json", that seems to get - // changed to "test.shaded.argonaut.Json" by shading - "argonaut" + '.' + "Json" - - val className = classOf[Json].getName - -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test b/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test deleted file mode 100644 index 72419bd1d..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test +++ /dev/null @@ -1,10 +0,0 @@ -$ delete output -> rootJVM/run -$ exists output -$ delete output -> rootJVM/publishLocal -$ exec java -jar coursier launch io.get-coursier.test:shading-cross-test_2.11:0.1.0-SNAPSHOT --$ exec java -jar coursier launch io.get-coursier.test:shading-cross-test_2.11:0.1.0-SNAPSHOT -- --shaded -> rootJVM/shading:publishLocal --$ exec java -jar coursier launch io.get-coursier.test:shading-cross-test_2.11:0.1.0-SNAPSHOT -$ exec java -jar coursier launch io.get-coursier.test:shading-cross-test_2.11:0.1.0-SNAPSHOT -- --shaded diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt deleted file mode 100644 index 2a84893b3..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt +++ /dev/null @@ -1,17 +0,0 @@ - -enablePlugins(coursier.ShadingPlugin) -shadingNamespace := "test.shaded" -shadeNamespaces += "argonaut" - -libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5" % "shaded", - // directly depending on that one for it not to be shaded - "org.scala-lang" % "scala-reflect" % scalaVersion.value -) - -excludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.11") - -scalaVersion := "2.11.8" -organization := "io.get-coursier.test" -name := "shading-exclude-dependencies" -version := "0.1.0-SNAPSHOT" diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/coursier b/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/coursier deleted file mode 100755 index 13c8a2b55460c6b5eb639e6f89e5c32e9be629aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11832 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 diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt deleted file mode 100644 index 022e99e06..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt +++ /dev/null @@ -1,11 +0,0 @@ -{ - val pluginVersion = sys.props.getOrElse( - "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) - ) - - addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/src/main/scala/Main.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/src/main/scala/Main.scala deleted file mode 100644 index 80584c442..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/src/main/scala/Main.scala +++ /dev/null @@ -1,44 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._ - -object Main extends App { - - def excludeCheck(): Unit = { - val className = "shapeless.HList" - val loader = Thread.currentThread.getContextClassLoader - - val found = - try { - loader.loadClass(className) - true - } catch { - case _: java.lang.ClassNotFoundException => false - } - - assert(!found, s"Expected class $className not to be found") - } - - excludeCheck() - - val expectedClassName = - if (args.contains("--shaded")) - "test.shaded.argonaut.Json" - else - // Don't use the literal "argonaut.Json", that seems to get - // changed to "test.shaded.argonaut.Json" by shading - "argonaut" + '.' + "Json" - - val className = classOf[Json].getName - - Console.err.println(s"Expected class name: $expectedClassName") - Console.err.println(s"Class name: $className") - - if (className != expectedClassName) - sys.error(s"Expected class name $expectedClassName, got $className") - - val msg = Json.obj().nospaces - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/test b/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/test deleted file mode 100644 index 8665a512d..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/test +++ /dev/null @@ -1,9 +0,0 @@ -$ delete output -> run -$ exists output -> publishLocal -$ exec java -jar coursier launch io.get-coursier.test:shading-exclude-dependencies_2.11:0.1.0-SNAPSHOT --$ exec java -jar coursier launch io.get-coursier.test:shading-exclude-dependencies_2.11:0.1.0-SNAPSHOT -- --shaded -> shading:publishLocal --$ exec java -jar coursier launch io.get-coursier.test:shading-exclude-dependencies_2.11:0.1.0-SNAPSHOT -$ exec java -jar coursier launch io.get-coursier.test:shading-exclude-dependencies_2.11:0.1.0-SNAPSHOT -- --shaded diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt deleted file mode 100644 index 167d55b76..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt +++ /dev/null @@ -1,31 +0,0 @@ - -enablePlugins(coursier.ShadingPlugin) -shadingNamespace := "test.shaded" - -shadeNamespaces += "argonaut" - -libraryDependencies ++= Seq( - "io.argonaut" %% "argonaut" % "6.2-RC2" % "shaded", - // directly depending on that one for it not to be shaded - "org.scala-lang" % "scala-reflect" % scalaVersion.value -) - -scalaVersion := "2.11.8" -organization := "io.get-coursier.test" -name := "shading-base-test" -version := "0.1.0-SNAPSHOT" - -lazy val checkToShadeClasses = TaskKey[Unit]("check-to-shade-classes") - -checkToShadeClasses := { - val toShadeClasses0 = toShadeClasses.in(Shading).value - val log = streams.value.log - - if (toShadeClasses0.nonEmpty) { - log.error(s"Found ${toShadeClasses0.length} classes to be explicitly shaded") - for (name <- toShadeClasses0) - log.error(" " + name) - } - - assert(toShadeClasses0.isEmpty) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier b/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier deleted file mode 100755 index 13c8a2b55460c6b5eb639e6f89e5c32e9be629aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11832 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 diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt deleted file mode 100644 index 022e99e06..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt +++ /dev/null @@ -1,11 +0,0 @@ -{ - val pluginVersion = sys.props.getOrElse( - "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) - ) - - addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala deleted file mode 100644 index b7eee31a8..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._ - -object Main extends App { - - val expectedClassName = - if (args.headOption == Some("--shaded")) - "test.shaded.argonaut.Json" - else - // Don't use the literal "argonaut.Json", that seems to get - // changed to "test.shaded.argonaut.Json" by shading - "argonaut" + '.' + "Json" - - val className = classOf[Json].getName - - Console.err.println(s"Expected class name: $expectedClassName") - Console.err.println(s"Class name: $className") - - if (className != expectedClassName) - sys.error(s"Expected class name $expectedClassName, got $className") - - val msg = Json.obj().nospaces - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test b/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test deleted file mode 100644 index 0a1d76498..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test +++ /dev/null @@ -1,10 +0,0 @@ -$ delete output -> checkToShadeClasses -> run -$ exists output -> publishLocal -$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT --$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -- --shaded -> shading:publishLocal --$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -- --shaded diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/build.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/shading/build.sbt deleted file mode 100644 index 29093ea2d..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/build.sbt +++ /dev/null @@ -1,13 +0,0 @@ - -enablePlugins(coursier.ShadingPlugin) -shadingNamespace := "test.shaded" - -libraryDependencies ++= Seq( - "io.argonaut" %% "argonaut" % "6.2-RC2" % "shaded", - "org.scala-lang" % "scala-reflect" % scalaVersion.value // not shading that one -) - -scalaVersion := "2.11.8" -organization := "io.get-coursier.test" -name := "shading-base-test" -version := "0.1.0-SNAPSHOT" diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/coursier b/modules/sbt-shading/src/sbt-test/sbt-shading/shading/coursier deleted file mode 100755 index 13c8a2b55460c6b5eb639e6f89e5c32e9be629aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11832 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 diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt deleted file mode 100644 index 022e99e06..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt +++ /dev/null @@ -1,11 +0,0 @@ -{ - val pluginVersion = sys.props.getOrElse( - "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) - ) - - addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/src/main/scala/Main.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/shading/src/main/scala/Main.scala deleted file mode 100644 index b7eee31a8..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/src/main/scala/Main.scala +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._ - -object Main extends App { - - val expectedClassName = - if (args.headOption == Some("--shaded")) - "test.shaded.argonaut.Json" - else - // Don't use the literal "argonaut.Json", that seems to get - // changed to "test.shaded.argonaut.Json" by shading - "argonaut" + '.' + "Json" - - val className = classOf[Json].getName - - Console.err.println(s"Expected class name: $expectedClassName") - Console.err.println(s"Class name: $className") - - if (className != expectedClassName) - sys.error(s"Expected class name $expectedClassName, got $className") - - val msg = Json.obj().nospaces - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/test b/modules/sbt-shading/src/sbt-test/sbt-shading/shading/test deleted file mode 100644 index 6f020327e..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/shading/test +++ /dev/null @@ -1,9 +0,0 @@ -$ delete output -> run -$ exists output -> publishLocal -$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT --$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -- --shaded -> shading:publishLocal --$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -$ exec java -jar coursier launch io.get-coursier.test:shading-base-test_2.11:0.1.0-SNAPSHOT -- --shaded diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/build.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/build.sbt deleted file mode 100644 index 3f4280d74..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/build.sbt +++ /dev/null @@ -1,14 +0,0 @@ - -enablePlugins(coursier.ShadingPlugin) -shadingNamespace := "test.shaded" - -libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M4" % "shaded", - "com.chuusai" %% "shapeless" % "2.3.2", - "org.scala-lang" % "scala-reflect" % scalaVersion.value -) - -scalaVersion := "2.11.8" -organization := "io.get-coursier.test" -name := "shading-transitive-test" -version := "0.1.0-SNAPSHOT" diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/coursier b/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/coursier deleted file mode 100755 index 13c8a2b55460c6b5eb639e6f89e5c32e9be629aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11832 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 diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt b/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt deleted file mode 100644 index 022e99e06..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt +++ /dev/null @@ -1,11 +0,0 @@ -{ - val pluginVersion = sys.props.getOrElse( - "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) - ) - - addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/src/main/scala/Main.scala b/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/src/main/scala/Main.scala deleted file mode 100644 index b7eee31a8..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/src/main/scala/Main.scala +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._ - -object Main extends App { - - val expectedClassName = - if (args.headOption == Some("--shaded")) - "test.shaded.argonaut.Json" - else - // Don't use the literal "argonaut.Json", that seems to get - // changed to "test.shaded.argonaut.Json" by shading - "argonaut" + '.' + "Json" - - val className = classOf[Json].getName - - Console.err.println(s"Expected class name: $expectedClassName") - Console.err.println(s"Class name: $className") - - if (className != expectedClassName) - sys.error(s"Expected class name $expectedClassName, got $className") - - val msg = Json.obj().nospaces - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/test b/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/test deleted file mode 100644 index 84b72a875..000000000 --- a/modules/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/test +++ /dev/null @@ -1,9 +0,0 @@ -$ delete output -> run -$ exists output -> publishLocal -$ exec java -jar coursier launch io.get-coursier.test:shading-transitive-test_2.11:0.1.0-SNAPSHOT --$ exec java -jar coursier launch io.get-coursier.test:shading-transitive-test_2.11:0.1.0-SNAPSHOT -- --shaded -> shading:publishLocal --$ exec java -jar coursier launch io.get-coursier.test:shading-transitive-test_2.11:0.1.0-SNAPSHOT -$ exec java -jar coursier launch io.get-coursier.test:shading-transitive-test_2.11:0.1.0-SNAPSHOT -- --shaded From e43be3d52d6b09412c1f3836c24573b6fd940c57 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 12 May 2020 00:16:06 +0200 Subject: [PATCH 2/2] Update sbt-shading to 2.0.0 --- build.sbt | 33 ++++++++++++++++----------------- project/Settings.scala | 14 -------------- project/plugins.sbt | 2 +- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/build.sbt b/build.sbt index db3673bad..43b2ecdf4 100644 --- a/build.sbt +++ b/build.sbt @@ -45,28 +45,27 @@ lazy val `lm-coursier-shaded` = project Mima.lmCoursierFilters, Mima.lmCoursierShadedFilters, unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value, - shading, - shadingNamespace := "lmcoursier.internal.shaded", - shadeNamespaces ++= Set( - "coursier", - "shapeless", - "argonaut", - "org.fusesource", - "macrocompat", - "io.github.alexarchambault.windowsansi" - ), + shadedModules += "io.get-coursier" %% "coursier", + validNamespaces += "lmcoursier", + shadingRules ++= { + val toShade = Seq( + "coursier", + "shapeless", + "argonaut", + "org.fusesource", + "macrocompat", + "io.github.alexarchambault.windowsansi" + ) + for (ns <- toShade) + yield ShadingRule.moveUnder(ns, "lmcoursier.internal.shaded") + }, libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % coursierVersion0 % "shaded", + "io.get-coursier" %% "coursier" % coursierVersion0, "io.github.alexarchambault" %% "data-class" % "0.2.3" % Provided, "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded "org.scala-sbt" %% "librarymanagement-ivy" % "1.3.2", "org.scalatest" %% "scalatest" % "3.1.2" % Test - ), - packageBin.in(Shading) := { - val jar = packageBin.in(Shading).value - Check.onlyNamespace("lmcoursier", jar) - jar - } + ) ) lazy val `sbt-coursier-shared` = project diff --git a/project/Settings.scala b/project/Settings.scala index 530c8f69d..3b4e1ee1c 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -6,7 +6,6 @@ import sbt.Keys._ import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts} import com.jsuereth.sbtpgp._ -import coursier.ShadingPlugin.autoImport.{Shading, shadingNamespace} object Settings { @@ -65,19 +64,6 @@ object Settings { sbtVersion.in(pluginCrossBuild) := targetSbtVersion ) - lazy val shading = - inConfig(Shading)(PgpSettings.projectSettings) ++ - // Why does this have to be repeated here? - // Can't figure out why configuration gets lost without this in particular... - coursier.ShadingPlugin.projectSettings ++ - Seq( - shadingNamespace := "coursier.shaded", - publish := publish.in(Shading).value, - publishLocal := publishLocal.in(Shading).value, - PgpKeys.publishSigned := PgpKeys.publishSigned.in(Shading).value, - PgpKeys.publishLocalSigned := PgpKeys.publishLocalSigned.in(Shading).value - ) - lazy val generatePropertyFile = resourceGenerators.in(Compile) += Def.task { import sys.process._ diff --git a/project/plugins.sbt b/project/plugins.sbt index eb602ea76..ee0f31af4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,6 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0") addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC5-3") -addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0-RC5-3") +addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0") libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value