From 4ace866c49ef63ec77fcdf50e52c5550e246c13a Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 12:44:14 +0800 Subject: [PATCH 1/7] . --- mill-build/src/millbuild/Deps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mill-build/src/millbuild/Deps.scala b/mill-build/src/millbuild/Deps.scala index 75d2db717ad1..938919411fce 100644 --- a/mill-build/src/millbuild/Deps.scala +++ b/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-M7" val pprint = mvn"com.lihaoyi::pprint:0.9.0" val mainargs = mvn"com.lihaoyi::mainargs:0.7.6" val millModuledefsVersion = "0.11.4" From 05e7c802ee7a1f27b29542a1c6c27341c493e181 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 12:59:43 +0800 Subject: [PATCH 2/7] . --- mill-build/src/millbuild/Deps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mill-build/src/millbuild/Deps.scala b/mill-build/src/millbuild/Deps.scala index 938919411fce..c5634a02e173 100644 --- a/mill-build/src/millbuild/Deps.scala +++ b/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-M7" + 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" From 7bd9ae986e5d3c0f8b14586aa45bc445da7d937a Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 13:14:23 +0800 Subject: [PATCH 3/7] fix --- .../src/mill/androidlib/AndroidAppModule.scala | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala index b41bbd4be756..4a07c59dcb28 100644 --- a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala +++ b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala @@ -225,6 +225,24 @@ 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 <- walk_(dest) if os.isDir(p)) { + 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) From 04e8e69050b210a6c37f2b93c6b29db89c3d4163 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 13:19:18 +0800 Subject: [PATCH 4/7] fix --- libs/androidlib/src/mill/androidlib/AndroidAppModule.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala index 4a07c59dcb28..c65a46786896 100644 --- a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala +++ b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala @@ -236,7 +236,7 @@ trait AndroidAppModule extends AndroidModule { outer => } } - for (p <- walk_(dest) if os.isDir(p)) { + for (p <- walkStream(dest) if os.isDir(p)) { val newPerms = os.perms(p) + PosixFilePermission.OWNER_READ + PosixFilePermission.OWNER_EXECUTE From 486d6c76b009152b7728b31e8e8434dc38c051cb Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 13:28:05 +0800 Subject: [PATCH 5/7] fix --- libs/androidlib/src/mill/androidlib/AndroidAppModule.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala index c65a46786896..71282c47346f 100644 --- a/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala +++ b/libs/androidlib/src/mill/androidlib/AndroidAppModule.scala @@ -237,6 +237,7 @@ trait AndroidAppModule extends AndroidModule { outer => } 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 From 4b47ee1fe17bcbc6e65f8315efb77338a17458f8 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 13:32:52 +0800 Subject: [PATCH 6/7] fix --- .../resources/extended/idea/mill_modules/mill-build.iml | 2 +- .../extended/idea/mill_modules/mill-build.mill-build.iml | 2 +- .../resources/hello-idea/idea/mill_modules/mill-build.iml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml index 5d744b70a388..ca31556a2d36 100644 --- a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml +++ b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml @@ -79,7 +79,7 @@ - + diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml index ad1e09a96fff..8b3bfeeef851 100644 --- a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml +++ b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml @@ -81,7 +81,7 @@ - + diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml index c05b703dfca9..3f32f9c7edf4 100644 --- a/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml +++ b/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml @@ -75,7 +75,7 @@ - + From 76a397387379b20313319644b7cbd8b01b4265f7 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 9 May 2025 14:17:50 +0800 Subject: [PATCH 7/7] fix --- .../gen-idea/resources/extended/idea/mill_modules/mill-build.iml | 1 + .../extended/idea/mill_modules/mill-build.mill-build.iml | 1 + .../resources/hello-idea/idea/mill_modules/mill-build.iml | 1 + 3 files changed, 3 insertions(+) diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml index ca31556a2d36..629c2ae08266 100644 --- a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml +++ b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml @@ -80,6 +80,7 @@ + diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml index 8b3bfeeef851..77046201d9ac 100644 --- a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml +++ b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml @@ -82,6 +82,7 @@ + diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml index 3f32f9c7edf4..8ae06e7bca27 100644 --- a/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml +++ b/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml @@ -76,6 +76,7 @@ +