build: Always shade commons-compress

Even in thin JAR

Author: nightscape

build.mill

@@ -101,9 +101,25 @@ trait SparkModule extends Cross.Module2[String, String] with SbtModule with Sona
     Rule.Relocate("org.apache.commons.compress.**", "shadeio.commons.compress.@1")
   )
 
+  def thinJarAssembly: T[PathRef] = Task {
+
+    val bundledJars = defaultResolver().classpath(alwaysBundledDeps)
+
+    val assembled = Assembly.create(
+      destJar = Task.dest / "thin.jar",
+      inputPaths = Seq(jar().path) ++ bundledJars.map(_.path),
+      manifest = manifest(),
+      prependShellScript = None,
+      base = None,
+      assemblyRules = assemblyRules,
+      shader = mill.javalib.AssemblyModule.jarjarabramsWorker()
+    )
+    assembled.pathRef
+  }
+
   override def extraPublish = Seq(
     PublishInfo(assembly(), classifier = None, ivyConfig = "compile"),
-    PublishInfo(jar(), classifier = Some("thin"), ivyConfig = "compile")
+    PublishInfo(thinJarAssembly(), classifier = Some("thin"), ivyConfig = "compile")
   )
 
   override def sonatypeCentralReadTimeout: T[Int] = 600000
@@ -122,17 +138,21 @@ trait SparkModule extends Cross.Module2[String, String] with SbtModule with Sona
   }
 
   val poiVersion = "5.4.1"
+  val alwaysBundledDeps = Seq(
+    mvn"commons-io:commons-io:2.20.0",
+    mvn"org.apache.commons:commons-compress:1.27.1",
+    // POI needs to be bundled so that its bytecode can be rewritten
+    // to use the shaded version of commons-compress.
+    mvn"org.apache.poi:poi:$poiVersion",
+    mvn"org.apache.poi:poi-ooxml:$poiVersion",
+    mvn"org.apache.poi:poi-ooxml-lite:$poiVersion"
+  )
 
   override def mvnDeps = {
     val base = Seq(
-      mvn"org.apache.poi:poi:$poiVersion",
-      mvn"org.apache.poi:poi-ooxml:$poiVersion",
-      mvn"org.apache.poi:poi-ooxml-lite:$poiVersion",
       mvn"org.apache.xmlbeans:xmlbeans:5.3.0",
       mvn"com.norbitltd::spoiwo:2.2.1",
       mvn"com.github.pjfanning:excel-streaming-reader:5.1.1",
-      mvn"commons-io:commons-io:2.20.0",
-      mvn"org.apache.commons:commons-compress:1.27.1",
       mvn"org.apache.logging.log4j:log4j-api:2.24.3",
       mvn"com.zaxxer:SparseBitSet:1.3",
       mvn"org.apache.commons:commons-collections4:4.5.0",
@@ -141,7 +161,7 @@ trait SparkModule extends Cross.Module2[String, String] with SbtModule with Sona
       mvn"org.apache.commons:commons-math3:3.6.1",
       mvn"org.scala-lang.modules::scala-collection-compat:2.13.0",
       mvn"com.eed3si9n.ifdef::ifdef-annotation:0.4.1"
-    )
+    ) ++ alwaysBundledDeps
     if (sparkVersion >= "3.3.0") {
       base ++ Seq(mvn"org.apache.logging.log4j:log4j-core:2.24.3")
     } else {