Skip to content

Bump OS-Lib #5048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 9, 2025
Merged

Bump OS-Lib #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ace866
.
lihaoyi May 9, 2025
05e7c80
.
lihaoyi May 9, 2025
7bd9ae9
fix
lihaoyi May 9, 2025
04e8e69
fix
lihaoyi May 9, 2025
486d6c7
fix
lihaoyi May 9, 2025
4b47ee1
fix
lihaoyi May 9, 2025
76a3973
fix
lihaoyi May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
3 changes: 2 additions & 1 deletion integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
3 changes: 2 additions & 1 deletion integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
19 changes: 19 additions & 0 deletions libs/androidlib/src/mill/androidlib/AndroidAppModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mill-build/src/millbuild/Deps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading