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

__.compile works, haven't run tests yet

2 files changed, 12 insertions, 14 deletions

diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
index c8d9abda..d8a282de 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
@@ -3,7 +3,6 @@ package scalanativelib
 
 import java.net.URLClassLoader
 
-import ammonite.ops.Path
 import coursier.Cache
 import coursier.maven.MavenRepository
 import mill.define.{Target, Task}
@@ -71,7 +70,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
     val workerKey = "MILL_SCALANATIVE_WORKER_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_')
     val workerPath = sys.props(workerKey)
     if (workerPath != null)
-      Result.Success(Agg(workerPath.split(',').map(p => PathRef(Path(p), quick = true)): _*))
+      Result.Success(Agg(workerPath.split(',').map(p => PathRef(os.Path(p), quick = true)): _*))
     else
       Lib.resolveDependencies(
         Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
index 05c3f7d7..be834e89 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
@@ -3,7 +3,6 @@ package mill.scalanativelib
 import java.io.File
 import java.net.URLClassLoader
 
-import ammonite.ops.Path
 import mill.define.{Discover, Worker}
 import mill.{Agg, T}
 import sbt.testing.Framework
@@ -12,8 +11,8 @@ import sbt.testing.Framework
 class ScalaNativeWorker {
   private var scalaInstanceCache = Option.empty[(Long, ScalaNativeWorkerApi)]
 
-  def impl(toolsClasspath: Agg[Path]): ScalaNativeWorkerApi = {
-    val classloaderSig = toolsClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum
+  def impl(toolsClasspath: Agg[os.Path]): ScalaNativeWorkerApi = {
+    val classloaderSig = toolsClasspath.map(p => p.toString().hashCode + os.mtime(p)).sum
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
       case _ =>
@@ -44,18 +43,18 @@ class ScalaNativeWorker {
 case class NativeConfig(config: Any)
 
 trait ScalaNativeWorkerApi {
-  def discoverClang: Path
-  def discoverClangPP: Path
-  def discoverTarget(clang: Path, workDir: Path): String
+  def discoverClang: os.Path
+  def discoverClangPP: os.Path
+  def discoverTarget(clang: os.Path, workDir: os.Path): String
   def discoverCompileOptions: Seq[String]
   def discoverLinkingOptions: Seq[String]
 
-  def config(nativeLibJar: Path,
+  def config(nativeLibJar: os.Path,
              mainClass: String,
-             classpath: Seq[Path],
-             nativeWorkdir: Path,
-             nativeClang: Path,
-             nativeClangPP: Path,
+             classpath: Seq[os.Path],
+             nativeWorkdir: os.Path,
+             nativeClang: os.Path,
+             nativeClangPP: os.Path,
              nativeTarget: String,
              nativeCompileOptions: Seq[String],
              nativeLinkingOptions: Seq[String],
@@ -65,7 +64,7 @@ trait ScalaNativeWorkerApi {
              logLevel: NativeLogLevel): NativeConfig
 
   def defaultGarbageCollector: String
-  def nativeLink(nativeConfig: NativeConfig, outPath: Path): Path
+  def nativeLink(nativeConfig: NativeConfig, outPath: os.Path): os.Path
 
   def newScalaNativeFrameWork(framework: Framework, id: Int, testBinary: File,
                               logLevel: NativeLogLevel, envVars: Map[String, String]): Framework