Vendor apache ant zip

Author: kiendang

build.mill

@@ -23,7 +23,7 @@ object Deps {
   val acyclic = ivy"com.lihaoyi:::acyclic:0.3.18"
   val jna = ivy"net.java.dev.jna:jna:5.15.0"
   val geny = ivy"com.lihaoyi::geny::1.1.1"
-  val compress = ivy"org.apache.ant:ant:1.10.15"
+  // val compress = ivy"org.apache.ant:ant:1.10.15"
   val sourcecode = ivy"com.lihaoyi::sourcecode::0.4.2"
   val utest = ivy"com.lihaoyi::utest::0.8.4"
   val expecty = ivy"com.eed3si9n.expecty::expecty::0.16.0"
@@ -113,7 +113,8 @@ trait OsLibModule
 }
 
 trait OsModule extends OsLibModule { outer =>
-  def ivyDeps = Agg(Deps.geny, Deps.compress)
+  def ivyDeps = Agg(Deps.geny)
+  // def ivyDeps = Agg(Deps.geny, Deps.compress)
   override def compileIvyDeps = T {
     val scalaReflectOpt = Option.when(!ZincWorkerUtil.isDottyOrScala3(scalaVersion()))(
       Deps.scalaReflect(scalaVersion())
@@ -139,6 +140,38 @@ trait OsModule extends OsLibModule { outer =>
 
   def scalaDocOptions = super.scalaDocOptions() ++ conditionalScalaDocOptions()
 
+  def apacheAntZipSources: T[PathRef] = Task(persistent = true) {
+    if (!_root_.os.exists(Task.dest / "src")) {
+      _root_.os.remove.all(Task.dest / "unzipped")
+      _root_.os.unzip.stream(
+        requests.get.stream("https://repo1.maven.org/maven2/org/apache/ant/ant/1.10.15/ant-1.10.15-sources.jar"),
+        Task.dest / "unzipped"
+      )
+      _root_.os.makeDir.all(Task.dest / "src/os")
+
+      val classes = _root_.os.walk.stream(Task.dest / "unzipped" / "org/apache/tools/zip")
+        .map(_.baseName)
+      val classRegex = classes.mkString("|")
+      val prefix = "_Apache"
+
+      // Add "_Apache" prefix to all classes
+      // Move from "package org.apache.tools.zip" to "package os"
+      // Make all classes package private (private [os])
+      _root_.os.walk.stream(Task.dest / "unzipped" / "org/apache/tools/zip")
+        .filter(_.ext == "java")
+        .foreach { p =>
+          val content = _root_.os.read(p)
+            .replaceAll(s"(?<![_a-zA-Z\\.])(${classRegex})(?![_a-zA-Z0-9])", prefix + "$1")
+            .replaceAll(s"(?<=org.apache.tools.zip.)($classRegex)(?![_a-zA-Z0-9])", prefix + "$1")
+            .replaceAll("org.apache.tools.zip", "os")
+            .replaceAll("^public ", "")
+          _root_.os.write(Task.dest / "src/os" / s"$prefix${p.last}", content)
+        }
+    }
+
+    PathRef(Task.dest / "src")
+  }
+
   def generatedSources = T {
     val conversions = for (i <- Range.inclusive(2, 22)) yield {
       val ts = Range.inclusive(1, i).map(n => s"T$n").mkString(", ")
@@ -162,7 +195,7 @@ trait OsModule extends OsLibModule { outer =>
          |""".stripMargin,
       createFolders = true
     )
-    Seq(PathRef(T.dest))
+    Seq(PathRef(T.dest), apacheAntZipSources())
   }
 }
 

os/src/ZipOps.scala

@@ -1,7 +1,5 @@
 package os
 
-import org.apache.tools.{zip => ant}
-
 import java.net.URI
 import java.nio.file.{FileSystem, FileSystems, Files}
 import java.nio.file.attribute.{BasicFileAttributeView, FileTime, PosixFilePermissions}
@@ -117,7 +115,7 @@ object zip {
       compressionLevel: Int,
       out: java.io.OutputStream
   ): Unit = {
-    val zipOut = new ant.ZipOutputStream(out)
+    val zipOut = new _ApacheZipOutputStream(out)
     zipOut.setLevel(compressionLevel)
 
     try {
@@ -157,9 +155,9 @@ object zip {
       file: os.Path,
       sub: os.SubPath,
       preserveMtimes: Boolean,
-      zipOut: ant.ZipOutputStream
+      zipOut: _ApacheZipOutputStream
   ) = {
-    val zipEntry = new ant.ZipEntry(sub.toString)
+    val zipEntry = new _ApacheZipEntry(sub.toString)
 
     val mtime = if (preserveMtimes) os.mtime(file) else 0
     zipEntry.setTime(mtime)
@@ -249,7 +247,7 @@ object unzip {
 
   private lazy val S_IFMT: Int = java.lang.Integer.parseInt("0170000", 8)
   private def isSymLink(mode: Int): Boolean =
-    (mode & S_IFMT) == ant.UnixStat.LINK_FLAG
+    (mode & S_IFMT) == _ApacheUnixStat.LINK_FLAG
 
   /**
    * Extract the given zip file into the destination directory
@@ -266,7 +264,7 @@ object unzip {
   ): os.Path = {
     checker.value.onWrite(dest)
 
-    val zipFile = new ant.ZipFile(source.toIO)
+    val zipFile = new _ApacheZipFile(source.toIO)
     val zipEntryInputStreams = zipFile.getEntries.asScala
       .filter(ze => os.zip.shouldInclude(ze.getName, excludePatterns, includePatterns))
       .map(ze => (ze, zipFile.getInputStream(ze)))