Make the shaded code generatedSources

Author: kiendang

.github/scala-steward.conf

@@ -79,13 +79,7 @@ trait MiMaChecks extends Mima {
   )
 }
 
-trait OsLibModule
-    extends CrossScalaModule
-    with PublishModule
-    with AcyclicModule
-    with SafeDeps
-    with PlatformScalaModule { outer =>
-
+trait OsLibPublishModule extends PublishModule {
   def publishVersion = VcsVersion.vcsState().format()
   def pomSettings = PomSettings(
     description = artifactName(),
@@ -100,6 +94,14 @@ trait OsLibModule
       Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi")
     )
   )
+}
+
+trait OsLibModule
+    extends OsLibPublishModule
+    with CrossScalaModule
+    with AcyclicModule
+    with SafeDeps
+    with PlatformScalaModule { outer =>
 
   trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps {
     def ivyDeps = Agg(Deps.utest, Deps.sourcecode)
@@ -170,7 +172,7 @@ object os extends Module {
 
   object jvm extends Cross[OsJvmModule](scalaVersions)
   trait OsJvmModule extends OsModule with MiMaChecks {
-    def moduleDeps = super.moduleDeps ++ Seq(os.zip.jvm())
+    def moduleDeps = super.moduleDeps ++ Seq(os.zip)
 
     object test extends ScalaTests with OsLibTestModule {
       override def ivyDeps = T { super.ivyDeps() ++ Agg(Deps.expecty) }
@@ -197,13 +199,7 @@ object os extends Module {
     object nohometest extends ScalaTests with OsLibTestModule
   }
 
-  object zip extends Module {
-    object jvm extends Cross[OsZipJvmModule](scalaVersions)
-    trait OsZipJvmModule extends OsLibModule
-
-    val pkg = "os.shaded_org_apache_tools_zip"
-    val zipSrc = millSourcePath / "src" / "os/shaded_org_apache_tools_zip"
-
+  object zip extends JavaModule with OsLibPublishModule {
     def apacheAntZipOriginalSource: T[PathRef] = Task(persistent = true) {
       if (!_root_.os.exists(Task.dest / "unzipped")) {
         val antVersion = Deps.ant.version
@@ -233,11 +229,10 @@ object os extends Module {
      * To avoid classpath conflicts, the dependency is shaded and compiled from source. Only the `org.apache.tools.zip`
      * package, not the entire Ant codebase, is needed. This only adds < 100kb to Os-Lib jar size.
      */
-    def apacheAntZipSource: T[PathRef] = Task {
-      _root_.os.walk.stream(zipSrc)
-        .filter(_.ext == "java")
-        .filter(_.last != "PermissionUtils.java")
-        .foreach(_root_.os.remove(_))
+    def generatedSources = T {
+      val pkg = "os.shaded_org_apache_tools_zip"
+      val zipSrc = T.dest / "os/shaded_org_apache_tools_zip"
+      _root_.os.makeDir.all(zipSrc)
 
       // Move from "package org.apache.tools.zip" to "package os.shaded_org_apache_tools_zip"
       // Make all classes package private (private [os]) by removing any `public` access modifier
@@ -249,7 +244,7 @@ object os extends Module {
           _root_.os.write(zipSrc / p.last, content)
         }
 
-      PathRef(zipSrc)
+      Seq(PathRef(T.dest))
     }
   }