diff options
Diffstat (limited to 'main/core/src/mill/util/Scripts.scala')
-rw-r--r-- | main/core/src/mill/util/Scripts.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/core/src/mill/util/Scripts.scala b/main/core/src/mill/util/Scripts.scala index 1815b6de..65eb6b2b 100644 --- a/main/core/src/mill/util/Scripts.scala +++ b/main/core/src/mill/util/Scripts.scala @@ -2,7 +2,7 @@ package mill.util import java.nio.file.NoSuchFileException -import ammonite.ops._ + import ammonite.runtime.Evaluator.AmmoniteExit import ammonite.util.Name.backtickWrap import ammonite.util.Util.CodeSource @@ -31,15 +31,15 @@ object Scripts { scriptArgs } - def runScript(wd: Path, - path: Path, + def runScript(wd: os.Path, + path: os.Path, interp: ammonite.interp.Interpreter, scriptArgs: Seq[(String, Option[String])] = Nil) = { interp.watch(path) val (pkg, wrapper) = Util.pathToPackageWrapper(Seq(), path relativeTo wd) for{ - scriptTxt <- try Res.Success(Util.normalizeNewlines(read(path))) catch{ + scriptTxt <- try Res.Success(Util.normalizeNewlines(os.read(path))) catch{ case e: NoSuchFileException => Res.Failure("Script file not found: " + path) } @@ -169,7 +169,7 @@ object Scripts { for((lhs, rhs) <- args) yield { val lhsPadded = lhs.padTo(leftColWidth, ' ') - val rhsPadded = rhs.lines.mkString(Util.newLine) + val rhsPadded = rhs.linesIterator.mkString(Util.newLine) s"$leftIndentStr $lhsPadded $rhsPadded" } val mainDocSuffix = main.doc match{ @@ -273,7 +273,7 @@ object Scripts { } def softWrap(s: String, leftOffset: Int, maxWidth: Int) = { - val oneLine = s.lines.mkString(" ").split(' ') + val oneLine = s.linesIterator.mkString(" ").split(' ') lazy val indent = " " * leftOffset @@ -325,6 +325,6 @@ object Scripts { /** * Additional [[scopt.Read]] instance to teach it how to read Ammonite paths */ - implicit def pathScoptRead: scopt.Read[Path] = scopt.Read.stringRead.map(Path(_, pwd)) + implicit def pathScoptRead: scopt.Read[os.Path] = scopt.Read.stringRead.map(os.Path(_, os.pwd)) } |