Make use of OS-Lib's new literal multi-segment subpaths (#3508)

Introduced in com-lihaoyi/os-lib#297, these
allow conciseness when working with literal paths/path-segments while
limiting it to compile-time literals to avoid potential path traversal
issues that may arise from parsing dynamic paths

build.mill

@@ -148,7 +148,7 @@ object Deps {
   val junitInterface = ivy"com.github.sbt:junit-interface:0.13.3"
   val commonsIO = ivy"commons-io:commons-io:2.16.1"
   val log4j2Core = ivy"org.apache.logging.log4j:log4j-core:2.23.1"
-  val osLib = ivy"com.lihaoyi::os-lib:0.10.7-M1"
+  val osLib = ivy"com.lihaoyi::os-lib:0.10.7-M2"
   val pprint = ivy"com.lihaoyi::pprint:0.9.0"
   val mainargs = ivy"com.lihaoyi::mainargs:0.7.4"
   val millModuledefsVersion = "0.11.0-M2"

contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala

@@ -104,9 +104,9 @@ object BloopTests extends TestSuite {
 
         // Ensuring that bloop config generation didn't trigger compilation
         assert(os.exists(workspaceOut / "scalaModule"))
-        assert(!os.exists(workspaceOut / "scalaModule" / "compile"))
+        assert(!os.exists(workspaceOut / "scalaModule/compile"))
         assert(os.exists(workspaceOut / "scalaModule2"))
-        assert(!os.exists(workspaceOut / "scalaModule2" / "compile"))
+        assert(!os.exists(workspaceOut / "scalaModule2/compile"))
       }
 
       test("scalaModule") {
@@ -126,7 +126,7 @@ object BloopTests extends TestSuite {
 
         assert(name == "scalaModule")
         assert(workspaceDir == Some(workdir.wrapped))
-        assert(sources == List(workdir / "scalaModule" / "src"))
+        assert(sources == List(workdir / "scalaModule/src"))
         assert(options.contains("-language:higherKinds"))
         assert(version == "2.12.8")
         assert(
@@ -171,7 +171,7 @@ object BloopTests extends TestSuite {
         val mainModuleClasspath = scalaModuleConfig.project.classpath
         assert(name == "scalaModule.test")
         assert(workspaceDir == Some(workdir.wrapped))
-        assert(sources == List(workdir / "scalaModule" / "test" / "src"))
+        assert(sources == List(workdir / "scalaModule/test/src"))
         assert(framework == "utest.runner.Framework")
         assert(dep == "scalaModule")
         assert(
@@ -228,7 +228,7 @@ object BloopTests extends TestSuite {
 
         assert(name == "scalajsModule")
         assert(workspaceDir == Some(workdir.wrapped))
-        assert(sources == List(workdir / "scalajsModule" / "src"))
+        assert(sources == List(workdir / "scalajsModule/src"))
         assert(version == build.scalajsModule.sv)
         assert(platform.config.emitSourceMaps)
         assert(platform.config.kind == BloopConfig.ModuleKindJS.CommonJSModule)
@@ -237,7 +237,7 @@ object BloopTests extends TestSuite {
       test("scalanativeModule") {
         scalanativeModuleConfig match {
           case None =>
-            val exists = os.exists(workdir / ".bloop" / "scalanativeModule.json")
+            val exists = os.exists(workdir / ".bloop/scalanativeModule.json")
             assert(exists == false)
           case Some(scalanativeModuleConfig) =>
             val p = scalanativeModuleConfig.project
@@ -252,14 +252,14 @@ object BloopTests extends TestSuite {
 
             assert(name == "scalanativeModule")
             assert(workspaceDir == Some(workdir.wrapped))
-            assert(sources == List(workdir / "scalanativeModule" / "src"))
+            assert(sources == List(workdir / "scalanativeModule/src"))
             assert(version == build.scalanativeModule.sv)
             assert(platform.config.mode == BloopConfig.LinkerMode.Debug)
             assert(platform.config.clang == clang.value.toNIO)
         }
       }
       test("skipped") {
-        val exists = os.exists(workdir / ".bloop" / "skippedModule.json")
+        val exists = os.exists(workdir / ".bloop/skippedModule.json")
         assert(exists == false)
       }
     }

contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala

@@ -89,10 +89,10 @@ object BuildInfoTests extends TestSuite {
   val testModuleSourcesPath: Path = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "buildinfo"
 
   def buildInfoSourcePath(eval: UnitTester) =
-    eval.outPath / "buildInfoSources.dest" / "foo" / "BuildInfo.scala"
+    eval.outPath / "buildInfoSources.dest/foo/BuildInfo.scala"
 
   def buildInfoResourcePath(eval: UnitTester) =
-    eval.outPath / "buildInfoResources.dest" / "foo" / "BuildInfo.buildinfo.properties"
+    eval.outPath / "buildInfoResources.dest/foo/BuildInfo.buildinfo.properties"
   def tests: Tests = Tests {
 
     test("notCreateEmptySourcefile") - UnitTester(
@@ -144,9 +144,9 @@ object BuildInfoTests extends TestSuite {
       val Right(result) = eval.apply(BuildInfoSettings.buildInfoSources)
       val path = result.value.head.path
 
-      assert(os.exists(path / "foo" / "bar.scala"))
+      assert(os.exists(path / "foo/bar.scala"))
 
-      val found = os.read(path / "foo" / "bar.scala").replaceAll("(\r\n)|\r", "\n")
+      val found = os.read(path / "foo/bar.scala").replaceAll("(\r\n)|\r", "\n")
       assert(found.contains("object bar"))
     }
 
@@ -200,7 +200,7 @@ object BuildInfoTests extends TestSuite {
     test("java-static") - UnitTester(BuildInfoJavaStatic, testModuleSourcesPath / "java").scoped {
       eval =>
         val runResult = eval.outPath / "hello-mill"
-        val generatedSrc = eval.outPath / "buildInfoSources.dest" / "foo" / "BuildInfo.java"
+        val generatedSrc = eval.outPath / "buildInfoSources.dest/foo/BuildInfo.java"
         val Right(_) =
           eval.apply(BuildInfoJavaStatic.run(T.task(Args(runResult.toString))))
 

contrib/flyway/src/mill/contrib/flyway/FlywayModule.scala

@@ -23,7 +23,7 @@ trait FlywayModule extends JavaModule {
   def flywayUser: T[String] = T("")
   def flywayPassword: T[String] = T("")
   def flywayFileLocations: T[Seq[PathRef]] = T {
-    resources().map(pr => PathRef(pr.path / "db" / "migration", pr.quick))
+    resources().map(pr => PathRef(pr.path / "db/migration", pr.quick))
   }
 
   def flywayDriverDeps: T[Agg[Dep]]

contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala

@@ -112,10 +112,10 @@ object PlayModuleTests extends TestSuite with PlayTestSuite {
               os.RelPath("views/html/main$.class"),
               os.RelPath("views/html/main.class")
             ).map(
-              eval.outPath / "core" / scalaVersion / playVersion / "compile.dest" / "classes" / _
+              eval.outPath / "core" / scalaVersion / playVersion / "compile.dest/classes" / _
             )
             assert(
-              result.value.classes.path == eval.outPath / "core" / scalaVersion / playVersion / "compile.dest" / "classes",
+              result.value.classes.path == eval.outPath / "core" / scalaVersion / playVersion / "compile.dest/classes",
               outputClassFiles.nonEmpty,
               outputClassFiles.forall(expectedClassfiles.contains),
               outputClassFiles.size == 15,

contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala

@@ -70,10 +70,10 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
         os.RelPath("router/RoutesPrefix$.class"),
         os.RelPath("router/RoutesPrefix.class")
       ).map(
-        eval.outPath / "compile.dest" / "classes" / _
+        eval.outPath / "compile.dest/classes" / _
       )
       assert(
-        result.value.classes.path == eval.outPath / "compile.dest" / "classes",
+        result.value.classes.path == eval.outPath / "compile.dest/classes",
         outputFiles.nonEmpty,
         outputFiles.forall(expectedClassfiles.contains),
         outputFiles.size == 11,

contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala

@@ -61,10 +61,10 @@ object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
         os.RelPath("views/html/main$.class"),
         os.RelPath("views/html/main.class")
       ).map(
-        eval.outPath / "compile.dest" / "classes" / _
+        eval.outPath / "compile.dest/classes" / _
       )
       assert(
-        result.value.classes.path == eval.outPath / "compile.dest" / "classes",
+        result.value.classes.path == eval.outPath / "compile.dest/classes",
         outputFiles.nonEmpty,
         outputFiles.forall(expectedClassfiles.contains),
         outputFiles.size == 15,

contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala

@@ -45,20 +45,20 @@ object TutorialTests extends TestSuite {
   object TutorialWithSpecificSources extends TutorialBase {
     object core extends TutorialModule {
       override def scalaPBSources: T[Seq[PathRef]] = T.sources {
-        millSourcePath / "protobuf" / "tutorial" / "Tutorial.proto"
+        millSourcePath / "protobuf/tutorial/Tutorial.proto"
       }
 
       override def scalaPBSearchDeps = true
       override def scalaPBIncludePath = Seq(
-        PathRef(millSourcePath / "protobuf" / "tutorial")
+        PathRef(millSourcePath / "protobuf/tutorial")
       )
     }
   }
 
   val resourcePath: os.Path = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER"))
 
   def protobufOutPath(eval: UnitTester): os.Path =
-    eval.outPath / "core" / "compileScalaPB.dest" / "com" / "example" / "tutorial"
+    eval.outPath / "core/compileScalaPB.dest/com/example/tutorial"
 
   def compiledSourcefiles: Seq[os.RelPath] = Seq[os.RelPath](
     os.rel / "AddressBook.scala",
@@ -92,7 +92,7 @@ object TutorialTests extends TestSuite {
         val expectedSourcefiles = compiledSourcefiles.map(outPath / _)
 
         assert(
-          result.value.path == eval.outPath / "core" / "compileScalaPB.dest",
+          result.value.path == eval.outPath / "core/compileScalaPB.dest",
           outputFiles.nonEmpty,
           outputFiles.forall(expectedSourcefiles.contains),
           outputFiles.size == 5,
@@ -123,7 +123,7 @@ object TutorialTests extends TestSuite {
         ).map(outPath / _)
 
         assert(
-          result.value.path == eval.outPath / "core" / "compileScalaPB.dest",
+          result.value.path == eval.outPath / "core/compileScalaPB.dest",
           outputFiles.nonEmpty,
           outputFiles.forall(expectedSourcefiles.contains),
           outputFiles.size == 3,

contrib/sonatypecentral/src/mill/contrib/sonatypecentral/SonatypeCentralPublisher.scala

@@ -45,7 +45,7 @@ class SonatypeCentralPublisher(
     val (_, releases) = mappings.partition(_._1.isSnapshot)
 
     val releaseGroups = releases.groupBy(_._1.group)
-    val wd = os.pwd / "out" / "publish-central"
+    val wd = os.pwd / "out/publish-central"
     os.makeDir.all(wd)
 
     singleBundleName.fold {

contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala

@@ -33,9 +33,9 @@ trait HelloWorldTests extends TestSuite {
 
   def resourcePath = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER"))
   def compileClassfiles: Seq[os.RelPath] = Seq[os.RelPath](
-    os.rel / "html" / "hello.template.scala",
-    os.rel / "html" / "wrapper.template.scala",
-    os.rel / "svg" / "test.template.scala"
+    os.rel / "html/hello.template.scala",
+    os.rel / "html/wrapper.template.scala",
+    os.rel / "svg/test.template.scala"
   )
 
   def expectedDefaultImports: Seq[String] = Seq(
@@ -85,11 +85,11 @@ trait HelloWorldTests extends TestSuite {
 
           val outputFiles = os.walk(result.value.classes.path).filter(_.last.endsWith(".scala"))
           val expectedClassfiles = compileClassfiles.map(
-            eval.outPath / "core" / "compileTwirl.dest" / _
+            eval.outPath / "core/compileTwirl.dest" / _
           )
 
           assert(
-            result.value.classes.path == eval.outPath / "core" / "compileTwirl.dest",
+            result.value.classes.path == eval.outPath / "core/compileTwirl.dest",
             outputFiles.nonEmpty,
             outputFiles.forall(expectedClassfiles.contains),
             outputFiles.size == 3,
@@ -126,7 +126,7 @@ trait HelloWorldTests extends TestSuite {
 
           val outputFiles = os.walk(result.value.classes.path).filter(_.last.endsWith(".scala"))
           val expectedClassfiles = compileClassfiles.map(name =>
-            eval.outPath / "core" / "compileTwirl.dest" / name / os.RelPath.up / name.last.replace(
+            eval.outPath / "core/compileTwirl.dest" / name / os.RelPath.up / name.last.replace(
               ".template.scala",
               "$$TwirlInclusiveDot.template.scala"
             )
@@ -135,7 +135,7 @@ trait HelloWorldTests extends TestSuite {
           println(s"outputFiles: $outputFiles")
 
           assert(
-            result.value.classes.path == eval.outPath / "core" / "compileTwirl.dest",
+            result.value.classes.path == eval.outPath / "core/compileTwirl.dest",
             outputFiles.nonEmpty,
             outputFiles.forall(expectedClassfiles.contains),
             outputFiles.size == 3,

example/depth/tasks/11-module-run-task/build.mill

@@ -15,7 +15,7 @@ object foo extends ScalaModule {
 
 object bar extends ScalaModule{
   def scalaVersion = "2.13.8"
-  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.9.1")
+  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.10.7-M2")
 }
 
 // This example demonstrates using Mill ``ScalaModule``s as build tasks: rather

example/extending/imports/3-import-ivy/build.mill

@@ -5,7 +5,7 @@ import $ivy.`com.lihaoyi::scalatags:0.12.0`, scalatags.Text.all._
 object `package` extends RootModule with ScalaModule {
   def scalaVersion = "2.13.8"
 
-  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.9.1")
+  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.10.7-M2")
   def htmlSnippet = T{ div(h1("hello"), p("world")).toString }
   def resources = T.sources{
     os.write(T.dest / "snippet.txt", htmlSnippet())

example/extending/metabuild/4-meta-build/build.mill

@@ -7,7 +7,7 @@ object `package` extends RootModule with ScalaModule {
   def scalaVersion = "2.13.4"
   def ivyDeps = Agg(
     ivy"com.lihaoyi::scalatags:${millbuild.DepVersions.scalatagsVersion}",
-    ivy"com.lihaoyi::os-lib:0.9.1"
+    ivy"com.lihaoyi::os-lib:0.10.7-M2"
   )
 
   def htmlSnippet = T{ h1("hello").toString }

example/extending/metabuild/5-meta-shared-sources/build.mill

@@ -5,7 +5,7 @@ import mill._, scalalib._
 object `package` extends RootModule with ScalaModule {
   def scalaVersion = millbuild.ScalaVersion.myScalaVersion
   def sources = T.sources{
-    super.sources() ++ Seq(PathRef(millSourcePath / "mill-build" / "src"))
+    super.sources() ++ Seq(PathRef(millSourcePath / "mill-build/src"))
   }
 }
 

example/extending/plugins/7-writing-mill-plugins/build.mill

@@ -21,7 +21,7 @@ object myplugin extends ScalaModule with PublishModule {
       def ivyDeps = Agg(ivy"com.lihaoyi:mill-dist:$millVersion")
       def mainClass = Some("mill.runner.client.MillClientMain")
       def resources = T{
-        val p = T.dest / "mill" / "local-test-overrides" / s"com.lihaoyi-${myplugin.artifactId()}"
+        val p = T.dest / "mill/local-test-overrides" / s"com.lihaoyi-${myplugin.artifactId()}"
         os.write(p, myplugin.localClasspath().map(_.path).mkString("\n"), createFolders = true)
         Seq(PathRef(T.dest))
       }

example/extending/plugins/7-writing-mill-plugins/myplugin/test/src/mill/testkit/IntegrationTests.scala

@@ -28,7 +28,7 @@ object IntegrationTests extends TestSuite {
       assert(res2.out.contains("Line Count: 17"))
       assert(tester.out("lineCount").value[Int] == 17)
 
-      tester.modifyFile(tester.workspacePath / "src" / "foo" / "Foo.java", _ + "\n")
+      tester.modifyFile(tester.workspacePath / "src/foo/Foo.java", _ + "\n")
 
       val res3 = tester.eval("run") // Additional newline forces recompile and increases line count
       assert(res3.err.contains("compiling 1 Java source"))

example/scalalib/builds/1-common-config/build.mill

@@ -13,7 +13,7 @@ object `package` extends RootModule with ScalaModule {
   // You can have arbitrary numbers of third-party dependencies
   def ivyDeps = Agg(
     ivy"com.lihaoyi::scalatags:0.8.2",
-    ivy"com.lihaoyi::os-lib:0.9.1",
+    ivy"com.lihaoyi::os-lib:0.10.7-M2",
   )
 
   // Choose a main class to use for `.run` if there are multiple present

example/scalalib/module/11-assembly-config/build.mill

@@ -6,7 +6,7 @@ import mill.scalalib.Assembly._
 object foo extends ScalaModule {
   def moduleDeps = Seq(bar)
   def scalaVersion = "2.13.8"
-  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.9.1")
+  def ivyDeps = Agg(ivy"com.lihaoyi::os-lib:0.10.7-M2")
   def assemblyRules = Seq(
     // all application.conf files will be concatenated into single file
     Rule.Append("application.conf"),

example/scalalib/module/5-resources/build.mill

@@ -5,7 +5,7 @@ import mill._, scalalib._
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
   def ivyDeps = Agg(
-    ivy"com.lihaoyi::os-lib:0.9.1"
+    ivy"com.lihaoyi::os-lib:0.10.7-M2"
   )
 
   object test extends ScalaTests {

example/scalalib/web/2-webapp-cache-busting/build.mill

@@ -7,7 +7,7 @@ object `package` extends RootModule with ScalaModule {
   def ivyDeps = Agg(
     ivy"com.lihaoyi::cask:0.9.1",
     ivy"com.lihaoyi::scalatags:0.12.0",
-    ivy"com.lihaoyi::os-lib:0.9.1"
+    ivy"com.lihaoyi::os-lib:0.10.7-M2"
   )
 
   def resources = T {

example/scalalib/web/4-webapp-scalajs/build.mill

@@ -14,8 +14,8 @@ object `package` extends RootModule with ScalaModule {
     val jsPath = client.fastLinkJS().dest.path
     // Move main.js[.map]into the proper filesystem position
     // in the resource folder for the web server code to pick up
-    os.copy(jsPath / "main.js", T.dest / "webapp" / "main.js")
-    os.copy(jsPath / "main.js.map", T.dest / "webapp" / "main.js.map")
+    os.copy(jsPath / "main.js", T.dest / "webapp/main.js")
+    os.copy(jsPath / "main.js.map", T.dest / "webapp/main.js.map")
     super.resources() ++ Seq(PathRef(T.dest))
   }
 

example/scalalib/web/5-webapp-scalajs-shared/build.mill

@@ -16,8 +16,8 @@ object `package` extends RootModule with AppScalaModule {
   def resources = T{
     os.makeDir(T.dest / "webapp")
     val jsPath = client.fastLinkJS().dest.path
-    os.copy(jsPath / "main.js", T.dest / "webapp" / "main.js")
-    os.copy(jsPath / "main.js.map", T.dest / "webapp" / "main.js.map")
+    os.copy(jsPath / "main.js", T.dest / "webapp/main.js")
+    os.copy(jsPath / "main.js.map", T.dest / "webapp/main.js.map")
     super.resources() ++ Seq(PathRef(T.dest))
   }