summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
authorNikolay Tatarinov <5min4eq.unity@gmail.com>2018-04-01 20:13:46 +0300
committerGitHub <noreply@github.com>2018-04-01 20:13:46 +0300
commitbbd162d3518b4e294a9ad0d6c1d6f23e680f4712 (patch)
tree14189415b7f4db19b939bc1e9fd98fc881144fb2 /scalalib
parent9a7ce4a0c39378fdae3faf80c766a3aaf9de0b91 (diff)
downloadmill-bbd162d3518b4e294a9ad0d6c1d6f23e680f4712.tar.gz
mill-bbd162d3518b4e294a9ad0d6c1d6f23e680f4712.tar.bz2
mill-bbd162d3518b4e294a9ad0d6c1d6f23e680f4712.zip
fixes #173; use default(compile) configuration for deps as default (#270)
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/src/mill/scalalib/Dep.scala10
-rw-r--r--scalalib/test/src/mill/scalalib/ResolveDepsTests.scala8
2 files changed, 14 insertions, 4 deletions
diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala
index f20480b7..f67eed03 100644
--- a/scalalib/src/mill/scalalib/Dep.scala
+++ b/scalalib/src/mill/scalalib/Dep.scala
@@ -20,6 +20,8 @@ sealed trait Dep {
}
object Dep{
+ val DefaultConfiguration = "default(compile)"
+
implicit def parse(signature: String) = {
val parts = signature.split(';')
val module = parts.head
@@ -41,7 +43,7 @@ object Dep{
}).configure(attributes = attributes)
}
def apply(org: String, name: String, version: String, cross: Boolean): Dep = {
- this(coursier.Dependency(coursier.Module(org, name), version), cross)
+ this(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross)
}
case class Java(dep: coursier.Dependency, cross: Boolean) extends Dep {
def configure(attributes: coursier.Attributes): Dep = copy(dep = dep.copy(attributes = attributes))
@@ -49,7 +51,7 @@ object Dep{
object Java{
implicit def rw: RW[Java] = macroRW
def apply(org: String, name: String, version: String, cross: Boolean): Dep = {
- Java(coursier.Dependency(coursier.Module(org, name), version), cross)
+ Java(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross)
}
}
implicit def default(dep: coursier.Dependency): Dep = new Java(dep, false)
@@ -60,7 +62,7 @@ object Dep{
object Scala{
implicit def rw: RW[Scala] = macroRW
def apply(org: String, name: String, version: String, cross: Boolean): Dep = {
- Scala(coursier.Dependency(coursier.Module(org, name), version), cross)
+ Scala(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross)
}
}
case class Point(dep: coursier.Dependency, cross: Boolean) extends Dep {
@@ -69,7 +71,7 @@ object Dep{
object Point{
implicit def rw: RW[Point] = macroRW
def apply(org: String, name: String, version: String, cross: Boolean): Dep = {
- Point(coursier.Dependency(coursier.Module(org, name), version), cross)
+ Point(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross)
}
}
implicit def rw = RW.merge[Dep](
diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
index b1fcec3e..861fa312 100644
--- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
+++ b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
@@ -26,6 +26,14 @@ object ResolveDepsTests extends TestSuite {
assert(paths.items.next.path.toString.contains("natives-macos"))
}
+ 'resolveTransitiveRuntimeDeps - {
+ val deps = Agg(ivy"org.mockito:mockito-core:2.7.22")
+ val Success(paths) = evalDeps(deps)
+ assert(paths.nonEmpty)
+ assert(paths.exists(_.path.toString.contains("objenesis")))
+ assert(paths.exists(_.path.toString.contains("byte-buddy")))
+ }
+
'excludeTransitiveDeps - {
val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".exclude("com.lihaoyi" -> "fansi_2.12"))
val Success(paths) = evalDeps(deps)