WIP migrating over from `ammonite.ops` to `os` module.

__.compile works, haven't run tests yet

6 files changed, 31 insertions, 39 deletions

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index e0ee55a5..37537a85 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -1,7 +1,6 @@
 package mill
 package scalajslib
 
-import ammonite.ops.{Path, exists, ls, mkdir, rm}
 import coursier.Cache
 import coursier.maven.MavenRepository
 import mill.eval.{PathRef, Result}
@@ -108,13 +107,13 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
            moduleKind: ModuleKind)(implicit ctx: Ctx): Result[PathRef] = {
     val outputPath = ctx.dest / "out.js"
 
-    mkdir(ctx.dest)
-    rm(outputPath)
+    os.makeDir.all(ctx.dest)
+    os.remove.all(outputPath)
 
     val classpath = runClasspath.map(_.path)
     val sjsirFiles = classpath
-      .filter(path => exists(path) && path.isDir)
-      .flatMap(ls.rec)
+      .filter(path => os.exists(path) && os.isDir(path))
+      .flatMap(os.walk(_))
       .filter(_.ext == "sjsir")
     val libraries = classpath.filter(_.ext == "jar")
     worker.link(
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
index 552aa572..881a65b9 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
@@ -3,7 +3,6 @@ package mill.scalajslib
 import java.io.File
 import java.net.URLClassLoader
 
-import ammonite.ops.Path
 import mill.define.Discover
 import mill.eval.Result
 import mill.util.Ctx
@@ -23,10 +22,10 @@ object ModuleKind{
 class ScalaJSWorker {
   private var scalaInstanceCache = Option.empty[(Long, ScalaJSWorkerApi)]
 
-  private def bridge(toolsClasspath: Agg[Path])
+  private def bridge(toolsClasspath: Agg[os.Path])
                     (implicit ctx: Ctx.Home) = {
     val classloaderSig =
-      toolsClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum
+      toolsClasspath.map(p => p.toString().hashCode + os.mtime(p)).sum
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
       case _ =>
@@ -44,14 +43,14 @@ class ScalaJSWorker {
     }
   }
 
-  def link(toolsClasspath: Agg[Path],
-           sources: Agg[Path],
-           libraries: Agg[Path],
+  def link(toolsClasspath: Agg[os.Path],
+           sources: Agg[os.Path],
+           libraries: Agg[os.Path],
            dest: File,
            main: Option[String],
            fullOpt: Boolean,
            moduleKind: ModuleKind)
-          (implicit ctx: Ctx.Home): Result[Path] = {
+          (implicit ctx: Ctx.Home): Result[os.Path] = {
     bridge(toolsClasspath).link(
       sources.items.map(_.toIO).toArray,
       libraries.items.map(_.toIO).toArray,
@@ -59,15 +58,15 @@ class ScalaJSWorker {
       main.orNull,
       fullOpt,
       moduleKind
-    ).map(Path(_))
+    ).map(os.Path(_))
   }
 
-  def run(toolsClasspath: Agg[Path], config: NodeJSConfig, linkedFile: File)
+  def run(toolsClasspath: Agg[os.Path], config: NodeJSConfig, linkedFile: File)
          (implicit ctx: Ctx.Home): Unit = {
     bridge(toolsClasspath).run(config, linkedFile)
   }
 
-  def getFramework(toolsClasspath: Agg[Path],
+  def getFramework(toolsClasspath: Agg[os.Path],
                    config: NodeJSConfig,
                    frameworkName: String,
                    linkedFile: File)
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index cfdcdd1f..7b1027e8 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -1,8 +1,6 @@
 package mill.scalajslib
 
 import java.util.jar.JarFile
-
-import ammonite.ops._
 import mill._
 import mill.define.Discover
 import mill.eval.{Evaluator, Result}
@@ -71,7 +69,7 @@ object HelloJSWorldTests extends TestSuite {
     override lazy val millDiscover = Discover[this.type]
   }
 
-  val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
+  val millSourcePath = os.pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
 
   val helloWorldEvaluator = TestEvaluator.static(HelloJSWorld)
 
@@ -87,7 +85,7 @@ object HelloJSWorldTests extends TestSuite {
           helloWorldEvaluator(HelloJSWorld.helloJsWorld(scalaVersion, scalaJSVersion).compile)
 
         val outPath = result.classes.path
-        val outputFiles = ls.rec(outPath)
+        val outputFiles = os.walk(outPath)
         val expectedClassfiles = compileClassfiles(outPath)
         assert(
           outputFiles.toSet == expectedClassfiles,
@@ -213,7 +211,7 @@ object HelloJSWorldTests extends TestSuite {
         helloWorldEvaluator.outPath,
         task.ctx.segments
       )
-      val log = read(paths.log)
+      val log = os.read(paths.log)
       assert(
         evalCount > 0,
         log.contains("node"),
@@ -229,7 +227,7 @@ object HelloJSWorldTests extends TestSuite {
     }
   }
 
-  def compileClassfiles(parentDir: Path) = Set(
+  def compileClassfiles(parentDir: os.Path) = Set(
     parentDir / "ArgsParser$.class",
     parentDir / "ArgsParser$.sjsir",
     parentDir / "ArgsParser.class",
@@ -241,9 +239,9 @@ object HelloJSWorldTests extends TestSuite {
   )
 
   def prepareWorkspace(): Unit = {
-    rm(workspacePath)
-    mkdir(workspacePath / up)
-    cp(millSourcePath, workspacePath)
+    os.remove.all(workspacePath)
+    os.makeDir.all(workspacePath / os.up)
+    os.copy(millSourcePath, workspacePath)
   }
 
 }
diff --git a/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala b/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala
index 37429038..751c7537 100644
--- a/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala
@@ -1,6 +1,5 @@
 package mill.scalajslib
 
-import ammonite.ops._
 import mill._
 import mill.define.Discover
 import mill.eval.Evaluator
@@ -10,7 +9,7 @@ import utest._
 
 object MultiModuleTests extends TestSuite {
   val workspacePath =  TestUtil.getOutPathStatic() / "multi-module"
-  val sourcePath = pwd / 'scalajslib / 'test / 'resources / "multi-module"
+  val sourcePath = os.pwd / 'scalajslib / 'test / 'resources / "multi-module"
 
   object MultiModule extends TestUtil.BaseModule {
     trait BaseModule extends ScalaJSModule {
@@ -76,7 +75,7 @@ object MultiModuleTests extends TestSuite {
         evaluator.outPath,
         command.ctx.segments
       )
-      val log = read(paths.log)
+      val log = os.read(paths.log)
       assert(
         evalCount > 0,
         log.contains("node"),
@@ -86,9 +85,9 @@ object MultiModuleTests extends TestSuite {
   }
 
   def prepareWorkspace(): Unit = {
-    rm(workspacePath)
-    mkdir(workspacePath / up)
-    cp(sourcePath, workspacePath)
+    os.remove.all(workspacePath)
+    os.makeDir.all(workspacePath / os.up)
+    os.copy(sourcePath, workspacePath)
   }
 
 }
diff --git a/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala b/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala
index 5aef8dad..27ea0a13 100644
--- a/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala
@@ -1,6 +1,5 @@
 package mill.scalajslib
 
-import ammonite.ops._
 import mill._
 import mill.define.Discover
 import mill.eval.Evaluator
@@ -53,7 +52,7 @@ object NodeJSConfigTests extends TestSuite {
     override lazy val millDiscover = Discover[this.type]
   }
 
-  val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
+  val millSourcePath = os.pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
 
   val helloWorldEvaluator = TestEvaluator.static(HelloJSWorld)
 
@@ -68,7 +67,7 @@ object NodeJSConfigTests extends TestSuite {
         helloWorldEvaluator.outPath,
         command.ctx.segments
       )
-      val log = read(paths.log)
+      val log = os.read(paths.log)
       assert(
         nodeArgs.forall(log.contains),
         notNodeArgs.forall(!log.contains(_))
@@ -96,9 +95,9 @@ object NodeJSConfigTests extends TestSuite {
   }
 
   def prepareWorkspace(): Unit = {
-    rm(workspacePath)
-    mkdir(workspacePath / up)
-    cp(millSourcePath, workspacePath)
+    os.remove.all(workspacePath)
+    os.makeDir.all(workspacePath / os.up)
+    os.copy(millSourcePath, workspacePath)
   }
 
 }
diff --git a/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala b/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala
index 859d2d56..68f2f7ee 100644
--- a/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala
+++ b/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala
@@ -3,10 +3,8 @@ package mill.scalajslib
 import java.io.{FileReader, StringWriter}
 import javax.script.{ScriptContext, ScriptEngineManager}
 
-import ammonite.ops.Path
-
 object ScalaJsUtils {
-  def runJS(path: Path): String = {
+  def runJS(path: os.Path): String = {
     val engineManager = new ScriptEngineManager(null)
     val engine = engineManager.getEngineByName("nashorn")
     val console = new Console