From 81bdc4abfb791fe6781f147e8a1ce23d418699c5 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 10 May 2017 02:05:26 +0200 Subject: [PATCH 1/3] Print classes about to be shaded by their full name --- sbt-shading/src/main/scala/coursier/Shading.scala | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sbt-shading/src/main/scala/coursier/Shading.scala b/sbt-shading/src/main/scala/coursier/Shading.scala index 5092635df..b79725f64 100644 --- a/sbt-shading/src/main/scala/coursier/Shading.scala +++ b/sbt-shading/src/main/scala/coursier/Shading.scala @@ -161,7 +161,7 @@ object Shading { log.info(s"Found ${toShadeClasses0.length} class(es) in JAR(s) to be shaded") log.debug(toShadeClasses0.map(" " + _).sorted.mkString("\n")) - shadeNamespaces.toVector.sorted.foldLeft(toShadeClasses0) { + val toShadeClasses = shadeNamespaces.toVector.sorted.foldLeft(toShadeClasses0) { (toShade, namespace) => val prefix = namespace + "." val (filteredOut, remaining) = toShade.partition(_.startsWith(prefix)) @@ -171,6 +171,13 @@ object Shading { 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( @@ -201,4 +208,4 @@ object Shading { outputJar } -} \ No newline at end of file +} From 3a2b2536439f5336c329e4f76a1c0f07688bb6b0 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 10 May 2017 02:06:47 +0200 Subject: [PATCH 2/3] Shade jsoup too --- build.sbt | 7 ++++++- .../io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 480e93fec..d0ab3fd3a 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,12 @@ lazy val core = crossProject scalaXmlIfNecessary, libs ++= Seq( Deps.fastParse % "shaded", - Deps.jsoup + Deps.jsoup % "shaded" + ), + shadeNamespaces ++= Set( + "org.jsoup", + "fastparse", + "sourcecode" ), generatePropertyFile ) diff --git a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT index d0382a1e0..eee9def25 100644 --- a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT +++ b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT @@ -1,5 +1,4 @@ io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile -org.jsoup:jsoup:1.10.2:default org.scala-lang:scala-library:2.11.11:default org.scala-lang.modules:scala-xml_2.11:1.0.6:default org.scalaz:scalaz-core_2.11:7.2.8:default From ed134dda7ab2a8a713a0570c5f72f74fd0d40056 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 10 May 2017 15:39:10 +0200 Subject: [PATCH 3/3] Remove unnecessary java option in scripted tests --- project/CoursierSettings.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/project/CoursierSettings.scala b/project/CoursierSettings.scala index d45b234a7..2d8d406e3 100644 --- a/project/CoursierSettings.scala +++ b/project/CoursierSettings.scala @@ -185,7 +185,6 @@ object CoursierSettings { Seq( scriptedLaunchOpts ++= Seq( "-Xmx1024M", - "-XX:MaxPermSize=256M", "-Dplugin.version=" + version.value, "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath ),