diff options
Diffstat (limited to 'main/test/resources/examples/foreign/project/build.sc')
-rw-r--r-- | main/test/resources/examples/foreign/project/build.sc | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/main/test/resources/examples/foreign/project/build.sc b/main/test/resources/examples/foreign/project/build.sc index 80c2af9b..54686c2d 100644 --- a/main/test/resources/examples/foreign/project/build.sc +++ b/main/test/resources/examples/foreign/project/build.sc @@ -1,10 +1,9 @@ import $file.^.outer.build import $file.inner.build -import ammonite.ops._ import mill._ -def assertPaths(p1 : Path, p2 : Path) : Unit = if (p1 != p2) throw new Exception( +def assertPaths(p1 : os.Path, p2 : os.Path) : Unit = if (p1 != p2) throw new Exception( s"Paths were not equal : \n- $p1 \n- $p2" ) @@ -17,7 +16,7 @@ object sub extends PathAware with DestAware { } def checkProjectPaths = T { - val thisPath : Path = millSourcePath + val thisPath : os.Path = millSourcePath assert(thisPath.last == "project") assertPaths(sub.selfPath(), thisPath / 'sub) assertPaths(sub.sub.selfPath(), thisPath / 'sub / 'sub) @@ -25,47 +24,47 @@ def checkProjectPaths = T { } def checkInnerPaths = T { - val thisPath : Path = millSourcePath + val thisPath : os.Path = millSourcePath assertPaths(inner.build.millSourcePath, thisPath / 'inner ) assertPaths(inner.build.sub.selfPath(), thisPath / 'inner / 'sub) assertPaths(inner.build.sub.sub.selfPath(), thisPath / 'inner / 'sub / 'sub) } def checkOuterPaths = T { - val thisPath : Path = millSourcePath - assertPaths(^.outer.build.millSourcePath, thisPath / up / 'outer ) - assertPaths(^.outer.build.sub.selfPath(), thisPath / up / 'outer / 'sub) - assertPaths(^.outer.build.sub.sub.selfPath(), thisPath / up / 'outer / 'sub / 'sub) + val thisPath : os.Path = millSourcePath + assertPaths(^.outer.build.millSourcePath, thisPath / os.up / 'outer ) + assertPaths(^.outer.build.sub.selfPath(), thisPath / os.up / 'outer / 'sub) + assertPaths(^.outer.build.sub.sub.selfPath(), thisPath / os.up / 'outer / 'sub / 'sub) } def checkOuterInnerPaths = T { - val thisPath : Path = millSourcePath - assertPaths(^.outer.inner.build.millSourcePath, thisPath / up / 'outer / 'inner ) - assertPaths(^.outer.inner.build.sub.selfPath(), thisPath / up / 'outer / 'inner /'sub) - assertPaths(^.outer.inner.build.sub.sub.selfPath(), thisPath / up / 'outer / 'inner / 'sub / 'sub) + val thisPath : os.Path = millSourcePath + assertPaths(^.outer.inner.build.millSourcePath, thisPath / os.up / 'outer / 'inner ) + assertPaths(^.outer.inner.build.sub.selfPath(), thisPath / os.up / 'outer / 'inner /'sub) + assertPaths(^.outer.inner.build.sub.sub.selfPath(), thisPath / os.up / 'outer / 'inner / 'sub / 'sub) } def checkProjectDests = T { - val outPath : Path = millSourcePath / 'out + val outPath : os.Path = millSourcePath / 'out assertPaths(sub.selfDest(), outPath / 'sub) assertPaths(sub.sub.selfDest(), outPath / 'sub / 'sub) assertPaths(sub.sub2.selfDest(), outPath / 'sub / 'sub2) } def checkInnerDests = T { - val foreignOut : Path = millSourcePath / 'out / "foreign-modules" + val foreignOut : os.Path = millSourcePath / 'out / "foreign-modules" assertPaths(inner.build.sub.selfDest(), foreignOut / 'inner / 'sub) assertPaths(inner.build.sub.sub.selfDest(), foreignOut / 'inner / 'sub / 'sub) } def checkOuterDests = T { - val foreignOut : Path = millSourcePath / 'out / "foreign-modules" + val foreignOut : os.Path = millSourcePath / 'out / "foreign-modules" assertPaths(^.outer.build.sub.selfDest(), foreignOut / "up-1" / 'outer/ 'sub ) assertPaths(^.outer.build.sub.sub.selfDest(), foreignOut / "up-1" / 'outer/ 'sub / 'sub) } def checkOuterInnerDests = T { - val foreignOut : Path = millSourcePath / 'out / "foreign-modules" + val foreignOut : os.Path = millSourcePath / 'out / "foreign-modules" assertPaths(^.outer.inner.build.sub.selfDest(), foreignOut / "up-1" / 'outer/ 'inner / 'sub) assertPaths(^.outer.inner.build.sub.sub.selfDest(), foreignOut / "up-1" / 'outer/ 'inner / 'sub / 'sub) } @@ -77,6 +76,6 @@ trait PathAware extends mill.Module { } trait DestAware extends mill.Module { - def selfDest = T { T.ctx().dest / up / up } + def selfDest = T { T.ctx().dest / os.up / os.up } } |