From ccb67db3759a16e95a75920d87281185310ccd81 Mon Sep 17 00:00:00 2001 From: Robby Date: Sat, 7 Apr 2018 08:23:42 -0500 Subject: Merge April 1 - 4, 2018 changes on master (#283) * fix build * Detect sh/batch launcher, dev.assembly, and release filename. * Updated appveyor cache. * Added some entries for master in readme.md changelog. * Updated readme.md changelog. * fixes #173; use default(compile) configuration for deps as default (#270) * revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268 * Updated ci tests. * Reverted Ammonite caching workaround (a796f0a) now that it's fixed * Changed ci/test-mill-0.sh to use interactive mode due to intermittent client failures to connect to server in travis * Added ci/test-mill-bootstrap.sh (ci/test-mill-0.sh with bootstrapping) and use it on oraclejdk9 instead of ci/test-mill-0.sh * Upgraded mill used for ci to 0.1.7-29-f5097f * revive #254 and fix #268 (#274) * Test mill batch (.bat) in AppVeyor * fix minor typos in docs * Sync Ammonite in ScalaModule (with build.sc). --- scalalib/src/mill/scalalib/Dep.scala | 10 ++++++---- scalalib/src/mill/scalalib/ScalaModule.scala | 2 +- scalalib/src/mill/scalalib/publish/Ivy.scala | 6 +++--- scalalib/src/mill/scalalib/publish/Pom.scala | 2 +- scalalib/test/src/mill/scalalib/ResolveDepsTests.scala | 8 ++++++++ 5 files changed, 19 insertions(+), 9 deletions(-) (limited to 'scalalib') diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala index 84aa6576..9719bd2d 100644 --- a/scalalib/src/mill/scalalib/Dep.scala +++ b/scalalib/src/mill/scalalib/Dep.scala @@ -24,6 +24,8 @@ sealed trait Dep { } object Dep{ + val DefaultConfiguration = "default(compile)" + implicit def parse(signature: String) = { val parts = signature.split(';') val module = parts.head @@ -45,7 +47,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, force: Boolean) extends Dep { def configure(attributes: coursier.Attributes): Dep = copy(dep = dep.copy(attributes = attributes)) @@ -53,7 +55,7 @@ object Dep{ object Java{ implicit def rw: RW[Java] = macroRW def apply(org: String, name: String, version: String, cross: Boolean, force: Boolean): Dep = { - Java(coursier.Dependency(coursier.Module(org, name), version), cross, force) + Java(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross, force) } } implicit def default(dep: coursier.Dependency): Dep = new Java(dep, false, false) @@ -64,7 +66,7 @@ object Dep{ object Scala{ implicit def rw: RW[Scala] = macroRW def apply(org: String, name: String, version: String, cross: Boolean, force: Boolean): Dep = { - Scala(coursier.Dependency(coursier.Module(org, name), version), cross, force) + Scala(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross, force) } } case class Point(dep: coursier.Dependency, cross: Boolean, force: Boolean) extends Dep { @@ -73,7 +75,7 @@ object Dep{ object Point{ implicit def rw: RW[Point] = macroRW def apply(org: String, name: String, version: String, cross: Boolean, force: Boolean): Dep = { - Point(coursier.Dependency(coursier.Module(org, name), version), cross, force) + Point(coursier.Dependency(coursier.Module(org, name), version, DefaultConfiguration), cross, force) } } implicit def rw = RW.merge[Dep]( diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 562b60d6..c0ef6cce 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -335,7 +335,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => unmanagedClasspath() ++ resolveDeps(T.task{ runIvyDeps() ++ scalaLibraryIvyDeps() ++ transitiveIvyDeps() ++ - Agg(ivy"com.lihaoyi:::ammonite:1.1.0-7-33b728c") + Agg(ivy"com.lihaoyi:::ammonite:1.1.0-12-f07633d") })() } diff --git a/scalalib/src/mill/scalalib/publish/Ivy.scala b/scalalib/src/mill/scalalib/publish/Ivy.scala index 3b271fa8..22e26ff6 100644 --- a/scalalib/src/mill/scalalib/publish/Ivy.scala +++ b/scalalib/src/mill/scalalib/publish/Ivy.scala @@ -42,10 +42,10 @@ object Ivy { private def renderDependency(dep: Dependency) = { if (dep.exclusions.isEmpty) - default(${dep.configuration.getOrElse("compile")})"} /> + ${dep.configuration.getOrElse("default(compile)")}"} /> else - default(${dep.configuration.getOrElse("compile")})"}> - {dep.exclusions.map(ex => ).toSeq} + ${dep.configuration.getOrElse("default(compile)")}"}> + {dep.exclusions.map(ex => )} } diff --git a/scalalib/src/mill/scalalib/publish/Pom.scala b/scalalib/src/mill/scalalib/publish/Pom.scala index 3c8ba4dc..84cf0632 100644 --- a/scalalib/src/mill/scalalib/publish/Pom.scala +++ b/scalalib/src/mill/scalalib/publish/Pom.scala @@ -108,7 +108,7 @@ object Pom { {ex._1} {ex._2} - )}.toSeq + )} {scope} 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) -- cgit v1.2.3