From bc9dc386625021fec517f2dbf0644ccafe1e32c2 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 5 Nov 2018 03:00:04 +0800 Subject: WIP migrating over from `ammonite.ops` to `os` module. __.compile works, haven't run tests yet --- .../scalanativelib/worker/ScalaNativeWorkerImpl.scala | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'scalanativelib/worker') diff --git a/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala b/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala index 7e93fbd4..8c24a39e 100644 --- a/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala +++ b/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala @@ -4,7 +4,6 @@ import java.io.File import java.lang.System.{err, out} import scala.scalanative.build.{Build, Config, Discover, GC, Logger, Mode} -import ammonite.ops.Path import mill.scalanativelib.{NativeConfig, NativeLogLevel, ReleaseMode} import sbt.testing.Framework @@ -19,19 +18,19 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.ScalaNativeWorkerApi { warnFn = msg => if (level >= NativeLogLevel.Warn) out.println(msg), errorFn = msg => if (level >= NativeLogLevel.Error) err.println(msg)) - def discoverClang: Path = Path(Discover.clang()) - def discoverClangPP: Path = Path(Discover.clangpp()) - def discoverTarget(clang: Path, workdir: Path): String = Discover.targetTriple(clang.toNIO, workdir.toNIO) + def discoverClang: os.Path = os.Path(Discover.clang()) + def discoverClangPP: os.Path = os.Path(Discover.clangpp()) + def discoverTarget(clang: os.Path, workdir: os.Path): String = Discover.targetTriple(clang.toNIO, workdir.toNIO) def discoverCompileOptions: Seq[String] = Discover.compileOptions() def discoverLinkingOptions: Seq[String] = Discover.linkingOptions() def defaultGarbageCollector: String = GC.default.name - 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], @@ -60,7 +59,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.ScalaNativeWorkerApi { NativeConfig(config) } - def nativeLink(nativeConfig: NativeConfig, outPath: Path): Path = { + def nativeLink(nativeConfig: NativeConfig, outPath: os.Path): os.Path = { val config = nativeConfig.config.asInstanceOf[Config] Build.build(config, outPath.toNIO) outPath -- cgit v1.2.3