Bump OS-Lib (#5048)

Split out from #5043 due to
apparent breakage in the upgrade

Author: lihaoyi

integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml

@@ -79,7 +79,8 @@
         <orderEntry type="library" name="mill-moduledefs_3-0.11.4.jar" level="project"/>
         <orderEntry type="library" name="munit_3-0.7.29.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
-        <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
+        <orderEntry type="library" name="os-lib_3-0.11.5-M8.jar" level="project"/>
+        <orderEntry type="library" name="os-zip-0.11.5-M8.jar" level="project"/>
         <orderEntry type="library" name="plexus-archiver-4.10.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-classworlds-2.6.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-container-default-2.1.1.jar" level="project"/>

integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml

@@ -81,7 +81,8 @@
         <orderEntry type="library" name="mill-runner-codesig_3.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-meta_3.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
-        <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
+        <orderEntry type="library" name="os-lib_3-0.11.5-M8.jar" level="project"/>
+        <orderEntry type="library" name="os-zip-0.11.5-M8.jar" level="project"/>
         <orderEntry type="library" name="plexus-archiver-4.10.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-classworlds-2.6.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-container-default-2.1.1.jar" level="project"/>

integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml

@@ -75,7 +75,8 @@
         <orderEntry type="library" name="mill-libs_3.jar" level="project"/>
         <orderEntry type="library" name="mill-moduledefs_3-0.11.4.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
-        <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
+        <orderEntry type="library" name="os-lib_3-0.11.5-M8.jar" level="project"/>
+        <orderEntry type="library" name="os-zip-0.11.5-M8.jar" level="project"/>
         <orderEntry type="library" name="plexus-archiver-4.10.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-classworlds-2.6.0.jar" level="project"/>
         <orderEntry type="library" name="plexus-container-default-2.1.1.jar" level="project"/>

libs/androidlib/src/mill/androidlib/AndroidAppModule.scala

@@ -225,6 +225,25 @@ trait AndroidAppModule extends AndroidModule { outer =>
       .flatMap(ref => {
         val dest = Task.dest / ref.path.baseName
         os.unzip(ref.path, dest)
+
+        // Fix permissions of unzipped directories
+        // `os.walk.stream` doesn't work
+        def walkStream(p: os.Path): geny.Generator[os.Path] = {
+          if (!os.isDir(p)) geny.Generator()
+          else {
+            val streamed = os.list.stream(p)
+            streamed ++ streamed.flatMap(walkStream)
+          }
+        }
+
+        for (p <- walkStream(dest) if os.isDir(p)) {
+          import java.nio.file.attribute.PosixFilePermission
+          val newPerms =
+            os.perms(p) + PosixFilePermission.OWNER_READ + PosixFilePermission.OWNER_EXECUTE
+
+          os.perms.set(p, newPerms)
+        }
+
         val lookupPath = dest / "META-INF"
         if (os.exists(lookupPath)) {
           os.walk(lookupPath)

mill-build/src/millbuild/Deps.scala

@@ -117,7 +117,7 @@ object Deps {
   val junitInterface = mvn"com.github.sbt:junit-interface:0.13.3"
   val commonsIo = mvn"commons-io:commons-io:2.18.0"
   val log4j2Core = mvn"org.apache.logging.log4j:log4j-core:2.24.3"
-  val osLib = mvn"com.lihaoyi::os-lib:0.11.5-M2"
+  val osLib = mvn"com.lihaoyi::os-lib:0.11.5-M8"
   val pprint = mvn"com.lihaoyi::pprint:0.9.0"
   val mainargs = mvn"com.lihaoyi::mainargs:0.7.6"
   val millModuledefsVersion = "0.11.4"