diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 03:00:04 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 21:14:58 +0800 |
commit | bc9dc386625021fec517f2dbf0644ccafe1e32c2 (patch) | |
tree | 12db6817470708c7aa274aa231ef35eb79f2123a /scalajslib/src | |
parent | 8afe79afe33be68f59f89b8410984e508c3e8d08 (diff) | |
download | mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.tar.gz mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.tar.bz2 mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.zip |
WIP migrating over from `ammonite.ops` to `os` module.
__.compile works, haven't run tests yet
Diffstat (limited to 'scalajslib/src')
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 9 | ||||
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala | 19 |
2 files changed, 13 insertions, 15 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) |