summaryrefslogtreecommitdiff
path: root/main/test/resources/examples/foreign/conflict
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 /main/test/resources/examples/foreign/conflict
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 'main/test/resources/examples/foreign/conflict')
-rw-r--r--main/test/resources/examples/foreign/conflict/build.sc3
-rw-r--r--main/test/resources/examples/foreign/conflict/inner/build.sc3
2 files changed, 2 insertions, 4 deletions
diff --git a/main/test/resources/examples/foreign/conflict/build.sc b/main/test/resources/examples/foreign/conflict/build.sc
index d6c08b81..bedd7237 100644
--- a/main/test/resources/examples/foreign/conflict/build.sc
+++ b/main/test/resources/examples/foreign/conflict/build.sc
@@ -1,6 +1,5 @@
import $file.inner.{build => innerBuild}
import mill._
-import ammonite.ops._
// In this build, we have a local module targeting
// the 'inner sub-directory, and an imported foreign
@@ -20,5 +19,5 @@ def checkDests : T[Unit] = T {
}
object inner extends mill.Module {
- def selfDest = T { T.ctx().dest / up / up }
+ def selfDest = T { T.ctx().dest / os.up / os.up }
}
diff --git a/main/test/resources/examples/foreign/conflict/inner/build.sc b/main/test/resources/examples/foreign/conflict/inner/build.sc
index 729f4f3d..81e5fc2f 100644
--- a/main/test/resources/examples/foreign/conflict/inner/build.sc
+++ b/main/test/resources/examples/foreign/conflict/inner/build.sc
@@ -1,4 +1,3 @@
import mill._
-import ammonite.ops._
-def selfDest = T { T.ctx().dest / up / up }
+def selfDest = T { T.ctx().dest / os.up / os.up }