From 926613d10d59181475111f0613125a079368a127 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 2 May 2017 23:23:33 +0200 Subject: [PATCH] Allow to manually shade whole namespaces to speed up shading --- .../main/scala-2.10/coursier/Shading.scala | 60 ++++++++++++------ .../scala-2.10/coursier/ShadingPlugin.scala | 51 ++++++++++++--- .../sbt-shading/shade-namespace/build.sbt | 31 +++++++++ .../sbt-shading/shade-namespace/coursier | Bin 0 -> 11832 bytes .../shade-namespace/project/plugins.sbt | 31 +++++++++ .../shade-namespace/src/main/scala/Main.scala | 27 ++++++++ .../sbt-test/sbt-shading/shade-namespace/test | 10 +++ 7 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt create mode 100755 sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier create mode 100644 sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt create mode 100644 sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala create mode 100644 sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test diff --git a/sbt-shading/src/main/scala-2.10/coursier/Shading.scala b/sbt-shading/src/main/scala-2.10/coursier/Shading.scala index 50ceeeeab..5092635df 100644 --- a/sbt-shading/src/main/scala-2.10/coursier/Shading.scala +++ b/sbt-shading/src/main/scala-2.10/coursier/Shading.scala @@ -54,23 +54,16 @@ object Shading { } } - def createPackage( - baseJar: File, + def toShadeJars( currentProject: Project, res: Resolution, configs: Map[String, Set[String]], artifactFilesOrErrors: Map[Artifact, FileError \/ File], classpathTypes: Set[String], - shadingNamespace: String, baseConfig: String, shadedConf: String, log: sbt.Logger - ) = { - - val outputJar = new File( - baseJar.getParentFile, - baseJar.getName.stripSuffix(".jar") + "-shading.jar" - ) + ): Seq[File] = { def configDependencies(config: String) = { @@ -98,11 +91,6 @@ object Shading { ) } - // Things could be split into intermediate tasks here, like - // shadingDependencies: Seq[coursier.Dependency], dependencies whose JARs are to be shaded - // shadingJars: Seq[java.io.File], JARs about to be shaded - // Note that shadingDependencies is not explicitly calculated below. - val dependencyArtifacts = res.dependencyArtifacts .filter { case (_, a) => classpathTypes(a.`type`) } .groupBy(_._1) @@ -154,19 +142,55 @@ object Shading { allShadedConfJars.map(" " + _).sorted.mkString("\n") ) - val toShadeJars = allShadedConfJars.filterNot(noShadeJars.toSet) + 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 toShadeClasses = toShadeJars.flatMap(jarClassNames) + val toShadeClasses0 = toShadeJars.flatMap(jarClassNames) - log.info(s"Found ${toShadeClasses.length} class(es) in JAR(s) to be shaded") - log.debug(toShadeClasses.map(" " + _).sorted.mkString("\n")) + 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) { + (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 + } + } + + 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" + ) val processor = new DefaultJarProcessor + + for (namespace <- shadeNamespaces) + processor.addClassRename(new ClassRename(namespace + ".**", shadingNamespace + ".@0")) + for (cls <- toShadeClasses) processor.addClassRename(new ClassRename(cls, shadingNamespace + ".@0")) diff --git a/sbt-shading/src/main/scala-2.10/coursier/ShadingPlugin.scala b/sbt-shading/src/main/scala-2.10/coursier/ShadingPlugin.scala index 93763f25e..f2b5bcc38 100644 --- a/sbt-shading/src/main/scala-2.10/coursier/ShadingPlugin.scala +++ b/sbt-shading/src/main/scala-2.10/coursier/ShadingPlugin.scala @@ -1,6 +1,8 @@ package coursier -import coursier.ivy.IvyXml.{ mappings => ivyXmlMappings } +import java.io.File + +import coursier.ivy.IvyXml.{mappings => ivyXmlMappings} import sbt.Keys._ import sbt.{AutoPlugin, Compile, Configuration, TaskKey, inConfig} @@ -16,8 +18,15 @@ object ShadingPlugin extends AutoPlugin { private val baseDependencyConfiguration = "compile" val Shaded = Configuration("shaded", "", isPublic = true, List(), transitive = true) + // make that a setting? val shadingNamespace = TaskKey[String]("shading-namespace") + // make that a setting? + val shadeNamespaces = TaskKey[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 */ @@ -26,7 +35,18 @@ object ShadingPlugin extends AutoPlugin { /** 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 @@ -50,7 +70,8 @@ object ShadingPlugin extends AutoPlugin { conf.extend(Shaded) else conf - } + }, + shadeNamespaces := Set() ) ++ inConfig(Shading)( sbt.Defaults.configSettings ++ @@ -76,21 +97,35 @@ object ShadingPlugin extends AutoPlugin { }, // required for cross-projects in particular unmanagedSourceDirectories := (unmanagedSourceDirectories in Compile).value, - packageBin := { - coursier.Shading.createPackage( - packageBin.in(baseSbtConfiguration).value, + toShadeJars := { + coursier.Shading.toShadeJars( coursierProject.in(baseSbtConfiguration).value, coursierResolution.in(baseSbtConfiguration).value, coursierConfigurations.in(baseSbtConfiguration).value, Keys.coursierArtifacts.in(baseSbtConfiguration).value, classpathTypes.value, - shadingNamespace.?.value.getOrElse { - throw new NoSuchElementException("shadingNamespace key not set") - }, baseDependencyConfiguration, 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/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt new file mode 100644 index 000000000..a68e32723 --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt @@ -0,0 +1,31 @@ + +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 + + if (toShadeClasses0.nonEmpty) { + val log = streams.value.log + log.error(s"Found ${toShadeClasses0.length} classes to be explicitly shaded") + for (name <- toShadeClasses0) + log.error(" " + name) + } + + assert(toShadeClasses0.isEmpty) +} diff --git a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/coursier new file mode 100755 index 0000000000000000000000000000000000000000..13c8a2b55460c6b5eb639e6f89e5c32e9be629aa GIT binary patch literal 11832 zcmZ`<19WA}(hep*u`#i2+qOBeZO&Li zRlR%HM?^s9?C3yeU~WTaY~zCOXa;TUW^9OWq3@!PPh+9)fKNtaW9wq7s4$k^YZai%1kcEo-lszoBRm#iB`wbJ zqGIwWk+3&FaCUvT9HESv;_S;%tl_RHB-wbNQQ^zOcXIwS9x*ufm*_04YQIu-(9RpR zHUg{ZUH0hd3RT->7TzIg&nd*-mG_8OrFSI3C2G#3K%bC_p!PA3eS#703+8)6n)pTz ztQJFgo@Fet-bZD&Rx1Z509>+IlY zZtOt!->dPiE|z-zu@VxXKtNc39VTdN>*VOe?vsXmCyoN!k(Fc9O| zjFfiAiRSxEu3yg+QF=h<+xx`qw97}a{?N2sO@1PgWpJcbefAM~-S!#X-l>I(m868D zMg#P%RI#FZ6mgg|F1lvM%K1ovM|M)Dq4lI-c>8Uq4r5+afL`xCY#m77EnyWR;@#AsKlFFiEC(~^z zppn?LiCfL=pbPydrL-1i4t3fOW-CS^v|$BsaK%{nSgz%2LHZ`E6#lO21Hax9!vVe9 zCB{x7M)7a_GMo~kSM@jpDKSr74JrGuRIC+4>-OEnde^Vw#CME1366YG3G>*20VeFU z))rVcGXZ5^^^w3PYGZ-wVkw;{U~c9%r;aq1X=Z$I|l3aQlD`^--_WlgG}tf{Zh}a z|Ng59D9B~TXs0SqaDoWW7x=$DW%p_)IvC_5Zax74;rxxK5HtMKR|1qT4=3k3OBEcj&}nzY&MJXTp<)wZ(=pb~|VUd^`O^X=~l)wBDg zJX&ji?T@ddG{3#P-eP~{C?}Z;OXGZsp0S5%j1%99ghO_R1%r*_WZp$eR8(34PNz5)yTh@? z*ju%P8|yoWKsB8D<&cUivzYbH_4|9^MU&Gs)kzPPgrsp$?x?`?WQBNT%4Ta{dl^S?t zqZZ;;W;te46a=^;27Pq5kOA{0WEgnjrFw78H!`;odMtB?`~vkdM(sG*N|)3mee&zp z)s^}N!K@)QtVk_nULgmiPcfPHpc7RF+4)0EZZ@0HswHD*lF4ZW#|??!#KAW74s^#= z@>5&{042XDi%Tk~0ia~}i*9qdK9i((^4epDuV*qad(Cg@P}ykCsin`$KOpsf*+s>t zK8B&p=7FB?YY*ok!PevFUQvm``5CWpVzh+3=l=j8zpIoKCN7v?S^)Y-r_i6pzJQGCREFs9#fp}#c@;jDog{qkg(M^5f*VKfyRRXPU=sG~h7c%RbJ z*(2E7-O8@xCzy8ePKo%QK?e8f%+dtOHM1-&aC7*AJBVC-SjjKq%<^lL4B71xEV-GI zuTim5B?Drk-Yp}8hbUjNMvOUSzGMwB?eZ$^81CuPQc*Ggi1$p;F7?*#tyTV!@N9)Q zvDHk8S2P32Ec$h&U33M-IdOo@0%xIJc?A+77yB(hkW=c8QzKLM>Wa|j^2$J$FsXpC zLHba3?vdFhe$=5komP=GWMurhPH>OOsU=J8*o(Asx;a4YggIlu%qvm4G9js!#YV+F zLw3}y9gs;RcTnn;DLeY;l|VOH5+dZVgrD?Pds*2=ZE4y(A=!z@wYW{9hy_RWQ7~h^ zMy}2}dUT%~gCN(TXh0$3=T_W@{^ z+rtAA!mqwGm&SxMk=4|SyBvS2`##!(SjG#JL=?FwYvWf@;pQE{w4MPFv&cbj&?~xj zly;}tiZml%`W$qq_HuEjMemX`%40!diRg6;gJ{r?gh91aO&bDA_03tD34W)L;fcHQ z8eYXmU=KYdm3KauS}@`>VzXC9jvb192V?x|cMQ79q5YqD-N`ZPTI7TchNZa1V=>FB z;ps+{%SiBK6@i)g3F@C6+2g}q#Dw}a_%*N<^aKfA)rU!!;9n4^VfQdcSOSoTpRAsv zf=8xcl;5gH_!J(E6Z8ZKKo(11lpuIi-Y{nZr?jXs&U)TmMi~GIpiopx0LP-ML5vG!^a+Lq^6rVw?|SyW2x$n2E8UQw48|Nq$ckj>KQsS0FnitNe9XQHg={>Zv9s6awU(O{1&=e4X>U3;3osAp>Q zOk}s;@!#0*#Lp3hv7Nk!#6Q=l_0Smi67Tk9d9ZzPoyAz& zbUg%9E|JC-W79e-3P4J;LP(`g)ev%JH^6pX4UBhT=`E-n*z~>R1BPHh58P&1yAto& zbUl*s_aSdZS53N4Xlj32%s^|K-}=#?)dSAsQ81;|TUqH_~VXR^lURiU1#NT!gQ z{4@y+7{eQ9HfDEeVY8{*R(&>0JqpI&!w{m#Bl}ii9t4Med)kmuM#%&)E_9%tDR=V9 zf5t3tTyBZ0e%MwwRqI0%rBQv^wo5C{jxTDcQClLQIkF^2olMWn=Ar1fQa~%<%r3Zc z19Y=A8Y`7^P3vMskVvrww6v6))xV}6o*##jl;2GomDjDE6-maWAtXU9)lFwN9(4;JhE>wVykq??~^-jRScgTWZIAqQv8xfAf{IK zwE9UHKcLJ9VUBP&awXqX$CNJ4pR8!_;GUaX*Dx!8d}z)rCRUYQoZ-@6SEqtC1>e83 zrXx|tSmzCc)?JMNrr9!zVW;j%NYR*Y7o`i%TSQ-u8l@cM&Ro=X-p8S!J)wcMv-}JkC@YPmKJenxzg_w1}G4?!oRgL1)u6T zE+|+!nPbr&2R!jR(MU{$D6$6kf?zXNv33vxV5m_s zmBj)T?Pb~ZM=>d_;Rh>NKhef(lL{lx2W~4g(Woz@g+fbUE0R&9MwHP8w8n0kHM+5& zoGl?8r-1FTYzj&_bQ##?p9qllPNQ(KrxW+4QpKBupeCNG7t!}#j9)} zq)|{8E?>ZaRLvzx}mF;w57*SR&>6zMXG}WOPMk6vr zr6t5se=U^F%W@;bQiz$|^6#T98NJJOTZcAqBCG@38LC`8+`UX9M9TizM3OQi@3P#H zR!JU{B0U-$U)9*%nu_#7x@0r*8FA7X0NF>ejgSo!G`4lE5~im0Ufx26h9X3EbG(Ou zsIPss4AU81%_B+Su=n0I>l`7i9!1I+?hg*41TsK5C%EZi-*Y(pxNGMEz}4gYE<{4& z!BLlfUTDb0L2@5PzhZ1hs87LhQ18dDNRqV>UR(EAqT3fMI6mkMxTGvfNDZVDV2~nq z2%jc}Hz!i!O_gv}(O<{;bAg-V^USw&^hqV}P z-=yG4S)b-L5a6Be^deHTpy5|dw=Nx8$>aqD2^hUVUZXSxlcx!W zpaxT|B%Nei&-!3u2AjjULT;pJP^TwopGgbM*{4XM*+Ta#WyRN+oos8huZc;qyCV(D za~~1wP2dgnwa73I_ETsbz~S9QQ8-aeml5{hk}EtGH~ExTB$(0 zSK5qc2%E0Gr3fBjJP2OiMWX^z4V7!5uyd9eST;cX1agWV+dvdOj(L(^3Gx&DGoBs6 zQt-_6JQFM9=eXO^@k0O|t_X=CW)=#Q9G)z6{OCRQ>I$LRn$m-JlLdjEN#1;-@m7Uu zE2smNVXm^HyP?v20FlL1a5RS(O({A$Zpt(o583Rx4+azTtcI2X5kVChrdDmKeYh#s zi5RXKw$2D?A&1zDXd*$1qq=>Akg_XuA}x3LVVF=%aQsy-W;aE4EZ6X)3Hx^ObrfNG zEDhE4;%T)dZZ3IDisY}Tm$^Oh%_0qln=0UuFbtkG5H48w^B~vCnWUnOqyYWp8%{LV zJXnBp6Gi+R<$KHtNr~)>x`)vOB1^jZ@)F5>a(q>17ssO=RvTvZc5lQ?_%&jh2~o|` zV^0W42@}lNWHTliMqdW$*HskcWKcmmbYB|2*iN+g$_X?xL(cELUi#$^$)f?R6K@5* z93*28!ONy`0&UzY`m$;+BVt|;PV+_%m`e*1rtw4Tm@<@neyi*BkzlbnWF`_%R%@aS z%cKOY?6Wjq*z}zi_MMim=W5m@yNb?wvv@UQbBtX5A`9aV2?(zzg`d!Fx02VR*aBQO zz43QmUD_^wx^;qHY!r5H-4BM5j+mlxqw8DI@r0bXUb3RPqP-=&_C-Z|`FcqD1lK@> ziO11F(;iVPo=*9RNtB%Cr5j*jWv||(g2ZN3Ns1TP$IAhizvA-vv((%n$A|IdKKk#P zpOM)rT~XXL&1-99D76UVIRBjGoeqTX40=TeOj>;7o#4}je8>UV6P!G#z6`qYqnd}s__f*b z<*S#s5wnUw<;(uDsl=$eAGC`Ky!=+E0Hs;Q75c4`J^jMi8PPkO>-^Yl(#=#;of#7a z{DLG#HuQ>`62si2Te3CdC$2=39nPTrDQ&Gb`+S`IE6Vob=_t5qWyq3gDWd$o5Ik^H zij7`%-t$H{MW6v}ys-*s59x_aPFvXwEP2rN45yMKsA5O|WqcW+e&Nm~u{dd1^mile zC$kYC8QA@ZjEuz0xp8i#${(27d49YzYEWxZ{(&i$7KQp)tw&~}FVY(_gXF=rH8`5B zGJESe)+Xm>uW|#ha&vL3dZ)`tyhX^XmynUT|u-#XWh9Q9mDH&q91e8T>MDoxg!0w_7{P9!O zSDf+Q{_9TPC?gTS>ur-s27~gI>U0D?yT^zn32SzbPHY63l@qgKtDnD7a&%<5(*a%^&AGsQ=&VU9 z{BcOalpNNbdy@^pkkxvRXvUCW!oR`Pz4|E=v5G3#!-+K0bm<~8-kFti?R%rvkXR$( ziw)?jOL+(AS1&TRRj}hTb#Dl>i%(IlU*YZ-vBu)EDT{EhA-;a=BoiLQLo2%(B#6h8 z^S~gwL-7svX0*SSyD^18j`x;t2THzN#IF!Ut1l05_*8{0Zlw z1aGltVx2>`pb1Tn_JYv}U4hX)kx+53GDv@mV+tWwCtj zlsXaUkvOW@OlvyiP>l+eLK}rVr)3#*PHu0) zG@@Xk16qqprk6DTNAd@XFC)mO;fv8mN}mAynnir6xG@Vz?&GeTrBMd$yD(4bE;+8` z>rx)__k$4Rz#TpGCLXRaJxq_H9VspBSr^-$hlFfRHX;uQn)t9o+MmQTrK5=P#ycV`QB~~K}ml?NBOE!(78lpyE5q(ZK3kSMH&$c%KX{sncTKh`Q0F49k?I3wCg2^ z`R%Jwx0Fzq>BbgjhavpOhs~|5X9*Q7Wse1}boh6Nt4p5b6Yr ztOxlNDxNOW3?+o_3^-tH&OI6`O8e0LtYG!8w_<@zUTvG0&*A|~(9K^d?JD;OS0LT< zak9DB;rYz3)561qvj%net0-#gv9f8#=UUCnw6xS_o33;eb^=|aZq!?kkXnaEW(w}& zhGw~LMu>>M#Y|Z`d<}Ku9v2OB#j3h=Vztf*EqG3gJ*LoIfo~h>3-`Xs3BzPTmuyl^`TbvGjWiCT`Yt08)8| zZnS7s(F<-gr@vq;75&9GxTi-1;3a^1qE;zLzmd>4W$JLC?$u3Y7N5~7TN*nlDx=@Q zte$H(7?xvzgDryMdT;P~VrHFi{vw*tSHDKDler2m#?<~+Rz0K1?_U>M^-d>KxkgJO zJwc0616`r(uY=P^q+mo!kaz8d_1GL=>c;tbVsLWUi<-p_lV%IE4tNQzTRWZVs8(Bq z&5^}B#PX0KQ$)^=hG)3;2rN^m(%{XRH}h@C`Gz*DtDiedhBqc^A3w>SN9~v3%BapR zwqU|=E!WT%>9hn&YZMNM@?lU)0-P}Ph)?OFSf&u`=U)OARTLxy3|5W%&u5U7Vl5F8 zb?^AeaQOWh!ew3Qgr-pfErs<+Ylo)bhs!s>5=j!eqTr4AmT&@`Tq+JQ-NZmPj^Kx! z#D}J@S=iYpuWZ=_R@c6`3nq!B-anWj=gja_XBThtaT>8*Cu@|ydI8JUaIK^%T3hEX zkhZu(e9jQHdq-DtYRtdnAX9O7P-1SBtlBDf)WY+Y5FFnjW-u5q^nfsH^$kkLP<}si z5Nhus=+0!9jLjRk8Cnv!-yo>%z?wObUdLqaB2A_X=!Qf~?)Z|U(Ny$>ZaaQ;-@xxj_zqgw8HEc# zyPw{@DXnZSO9!LKzdV>t_#{aQTmn3!he@7tQm6|h?6oq+2J?J)^5rdBoGx{#25qsX z;gi&u0jmOCXEje5_9{fF3orV#QYcWNK{B=aRt z;))qsBT*cU#a2XJB-ht<^y!4Q6c;0ZP4}z(eW*2OM4`mAi8GFt+|T3;b^|$-BaLp=uJJ)iX60}@~z9X$!&SYo3|-Z^gdgi*H3K& zQ?d)wl=SwG8VlV>To*-ek+iON#0f${Fld)YWA*HYa}~`X2ihgS+b(nzgE*-JAKLwl zuT}Y(VK@2XhCBlqnbK2J`7Se*bsVT&c*mM-+$K$PUw3u zzJJt2tv;$xQA$WIKlb z=;ocN-07T2LL&_J<}FulGYm{H65S1b@rx1lRGz@q>rPuL)WF$q&;bd<>glXDWrBK_ z7Q(?wwitnDiKN?CDt4;vh%B`;A>~ej09_3hCm9@xlljidc!}`+TNbGTF!&wKd?ZZ0 zgzwF&Ibr5_Ov$%X{1&I}iMc%Xn@7Dl=J$?mADZE$~IoIyc6VQvXw z!E%>%$BJV?Z1XMcqGWw~MQ*EFNi;2sf+R}z$P&Cdm~Pw7owwuaS}V_`dx!zfj5H~+ zp&AYBP!kmyoJnLA8=Q zU=$EZ0o%t+Ef>DKx-(6FIJ6S6*0en0sL?$LfecH#lbyhxw_d+hDRZ0Bo1?*ifP6nH z;eYe&nEq9xRDE<*QbBpMNxdtmM90!<0GWdfJ`ycfnFXIJM1du(V+EsDxngOy)^qo! z>$sm5>4!x{z1LY~v&#?w7ZekHS>x-%9JJpseZih}jI)uDI+LDg=Xien*?iwo`S$pN z^L6ynoWpOCRw9U)OL=z70~K*KI~PO&mCHUa6k|K~G}ccROh?fr&d&x_D&GYR$zfrq z*9O(IO6{#lBUYDUg-jxgxn1PkM#WBx<8H?V73+zFtOQ>L?i(;3c)?sWd`qY%;MtBp z;2UCzQE64QD#aid$|AHj7$&&0G7~Gn^3G+=L>&uzUbH^iCcxz|5R!>pF||4ZGlpVy z^88%gZDewOES{xDJ|W3Odkxb0z%5^)L50oP6V=ZRqTW6z6GiI7#-MCtEoY6F69OepIA+|-4vQc?OK#5h{C2@Ip21<=C2%Uk( zkDX;rk2vN08qTqNeU26m4D|Ep1V#E0hCusBaApT)ePl7nG>%k;ZhNxx?Ivsp)YV>l zx^pEvzClp-zAJp(Z8wY{%m?l79Jt+i04mc_@g`QVFe4`-6068TyYD;p+}&NNDBQzW zD4B`jrtFysxhC9$S8d_1AiBG5P;^Y?BMagL;N-%^Ym#zK`}``G(1QwXrJF2~3s>NS zX>MUT9;{D*H|X_!H;9YaM!1!R)2>B?N9g==hMB55lmd)s^R~fF^MbW!c0p@vfV?Gj ziZ6dr4$pu+4xXJ?a1@Hy*cDWRo%T1H*=1t=^TQsv@y+&}fb5Xe!m1V6ar;lOUpt$c z0rg=nNdul8h7MfhtH~lW;xuH9F`Ma_AxA%N#!%p1(@nmggu-G-`Z?T1%Il`HuK-Rz{7N--`wj%yqk+K~Cvt=llOKiA&k1jlv=)FA3?9g_YGXrmW+BdwpO3l2=7!SRS* zc@gEfmNt7ND|z7w-Hn7&Y+@(C&*@Q+NbHr;xngZ?%3V%_S=-GfPbrnbs<5#Y4sc6; z^}HtqJSiC^VpDMM$15&**qOpBg`sJ-014k#M_Xpg4y(H1hL!nLI742-2YO-JXWEo* zhFQ_IAbf;H0#jo|(|3z_ul-8F$PG3@ENKX<5&yZL;gJc3WIZ{6PB6c%zOK*-$-;6; zL-{5ai7$+#-LxvcAwlDzj22%|lte?>SRtdohDm+Bbe3GByja0vgtS`mTrK8_@&dj1 zh=wC%E<~byX~oVS&GH^sOzMT0Hr+wfSz#T!0HK($Ig3%9EU%nQu%mWy@`0qeg*YsN zthmquCzq@y@i?|#bd&4}mc4^y*j3&C0DID4x_7*J$Pg2j;`kI zbI=up?3SF-726MD__@m$DUc|?G8Apt!fclB^iXXmHS-&y@;2i_5;+=ho6}F!v^)&( zx0pn^3zO^q)=jL9x zVi#;#Y04JKB^bNhR62<2NFN5bXTj?8m}F z{5|Q5@n4IoxMDNIkHC|b++r_-E!Zq{M1sOqK|f-N08dl#eb;X`k@v>BR%5ziRi{o@ z=#l)>9vr+E5MBTV*<@hYr^L1s%q$KjN0Sbp=NB-3Yr?Y(z6t6DIICE zwADxkcS9LyT@(45RRk%;*BG)tdd9J_n{o~q6w`E z3-iF_jwjR&GZ@#7BdjlIF3*J@G>>5(lY#M^o=a_E?7!1M3+>3cY@bUdVRhGvrBT>d z3KKmQQo3g3R7fkbu3#b>j%plV7V(k+1DJd(OwQy({U~#&!xUb84a?tu@W@ano#Q4! zh|Z|zt+_!ong@B&YZ8i{h?GuiaLF@DX|yuZkPIT2Xyi6^dp+9OB)a`ut&?Z+0LK`> zVNy2NYoPNVJVBHXHY6mFd%UN_M{NB^kUn|_|K|PuL8zp0cCd0Z9u|P>;fLg(LI%zt zwP_QY_%b9;IsS?CD~#=ijnmHg>x1pSx>@j-qB0{VDu|A+iN%m*9vPZ(M|2U|O12Pbo5N2Ps5 zINEWg%TYQddPX(+x++H2dPWv`I~Q05dPaKY9m$aiItp3}N$SZ_Not2->Kc_2S{hlJ z>CvGHnTojush@N-ls~0uri036*k+j~nI>;pm_?@3(vnjS(&N;%tzc%dlhWf#4gh<0 z!2eL!vq?0``a_w(k0vh#41)4ON&P#b>OXAy&*krEtAC(C1N}V@^gjSV2Or(PutNX) z=D+ho|C|Q*kvRS{?fdWH*5IEw>>tVJf8qR_L-;$=@9eEVk)A%@_y0fAKNHyR zD8HZW{zM_f{a+}5r_Jx@j6ZSK@%|^yzfK*$>+}0Q_a{yv$zO2(cGvqI@AuUHCmtx- zU-15XZvRU3|Hk=u(ET+W|40je3OvPMV&^|e;`jM~jQ@8W{t>i)O7;Jn|DO>49ptak h@khx1DGz@I`AY!HOM!v^F$(bU6aH|pBFaDh{U3O~NhJUP literal 0 HcmV?d00001 diff --git a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt new file mode 100644 index 000000000..8f83e814d --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt @@ -0,0 +1,31 @@ +{ + 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) +} + +// for the locally publish jarjar +resolvers += Resolver.mavenLocal + +val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" + +def coursierJarjarFoundInM2 = + (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() + +def jarjarVersion = + if (coursierJarjarFoundInM2) + coursierJarjarVersion + else + sys.error( + "Ad hoc jarjar version not found. Run\n" + + " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + + "to run this test" + ) + +libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion diff --git a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala new file mode 100644 index 000000000..b7eee31a8 --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/src/main/scala/Main.scala @@ -0,0 +1,27 @@ +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/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test new file mode 100644 index 000000000..0a1d76498 --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/test @@ -0,0 +1,10 @@ +$ 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