summaryrefslogtreecommitdiff
path: root/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-11-05 03:00:04 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-11-05 21:14:58 +0800
commitbc9dc386625021fec517f2dbf0644ccafe1e32c2 (patch)
tree12db6817470708c7aa274aa231ef35eb79f2123a /scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
parent8afe79afe33be68f59f89b8410984e508c3e8d08 (diff)
downloadmill-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 'scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala')
-rw-r--r--scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala b/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
index 74f64e28..6a81d975 100644
--- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
+++ b/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
@@ -1,6 +1,5 @@
package mill.scalalib.scalafmt
-import ammonite.ops.{exists, ls, pwd}
import mill._
import mill.define._
import mill.scalalib._
@@ -19,7 +18,7 @@ trait ScalafmtModule extends JavaModule {
def scalafmtVersion: T[String] = "1.5.1"
- def scalafmtConfig: Sources = T.sources(pwd / ".scalafmt.conf")
+ def scalafmtConfig: Sources = T.sources(os.pwd / ".scalafmt.conf")
def scalafmtDeps: T[Agg[PathRef]] = T {
Lib.resolveDependencies(
@@ -31,8 +30,8 @@ trait ScalafmtModule extends JavaModule {
protected def filesToFormat(sources: Seq[PathRef]) = {
for {
- pathRef <- sources if exists(pathRef.path)
- file <- ls.rec(pathRef.path) if file.isFile && file.ext == "scala"
+ pathRef <- sources if os.exists(pathRef.path)
+ file <- os.walk(pathRef.path) if os.isFile(file) && file.ext == "scala"
} yield PathRef(file)
}