summaryrefslogtreecommitdiff
path: root/scalalib/src/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-15 22:48:04 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-15 23:14:55 -0800
commitd1c65c7e85467c23a31291b02d2f8fa5889335dc (patch)
tree966874a674de54e4f75c39cbb1a3f98d477d524a /scalalib/src/test
parent5e9d809c6eb566e8452bbe2f3a986f31c57e5438 (diff)
downloadmill-d1c65c7e85467c23a31291b02d2f8fa5889335dc.tar.gz
mill-d1c65c7e85467c23a31291b02d2f8fa5889335dc.tar.bz2
mill-d1c65c7e85467c23a31291b02d2f8fa5889335dc.zip
- Swap over to new `ivy"foo:bar:baz"` syntax for defining ivy dependencies
- `projectDeps` is now `moduleDeps` for compatibility with our `Module` terminology - `scalalib.Module` is now `ScalaModule` for compatibility with `import scalalib._`
Diffstat (limited to 'scalalib/src/test')
-rw-r--r--scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala2
-rw-r--r--scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala8
2 files changed, 5 insertions, 5 deletions
diff --git a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala
index 657ddc9e..70c78cee 100644
--- a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala
@@ -16,7 +16,7 @@ import scala.collection.JavaConverters._
object HelloWorldTests extends TestSuite {
- trait HelloWorldModule extends scalalib.Module {
+ trait HelloWorldModule extends scalalib.ScalaModule {
def scalaVersion = "2.12.4"
def basePath = HelloWorldTests.workingSrcPath
}
diff --git a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala b/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala
index f28df152..d1ddde20 100644
--- a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala
+++ b/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala
@@ -14,25 +14,25 @@ object ResolveDepsTests extends TestSuite {
val tests = Tests {
'resolveValidDeps - {
- val deps = Agg(Dep("com.lihaoyi", "pprint", "0.5.3"))
+ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3")
val Success(paths) = evalDeps(deps)
assert(paths.nonEmpty)
}
'errOnInvalidOrgDeps - {
- val deps = Agg(Dep("xxx.yyy.invalid", "pprint", "0.5.3"))
+ val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3")
val Failure(errMsg) = evalDeps(deps)
assert(errMsg.contains("xxx.yyy.invalid"))
}
'errOnInvalidVersionDeps - {
- val deps = Agg(Dep("com.lihaoyi", "pprint", "invalid.version.num"))
+ val deps = Agg(ivy"com.lihaoyi::pprint:invalid.version.num")
val Failure(errMsg) = evalDeps(deps)
assert(errMsg.contains("invalid.version.num"))
}
'errOnPartialSuccess - {
- val deps = Agg(Dep("com.lihaoyi", "pprint", "0.5.3"), Dep("fake", "fake", "fake"))
+ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3", ivy"fake::fake:fake")
val Failure(errMsg) = evalDeps(deps)
assert(errMsg.contains("fake"))
}