From c7c99ee3da9500a3f6b5295ce107e463c2fe366d Mon Sep 17 00:00:00 2001 From: leakyabstraction Date: Mon, 2 Apr 2018 11:21:53 -0400 Subject: [PATCH] revive #254 and fix #268 --- scalalib/src/mill/scalalib/Dep.scala | 14 +++++ scalalib/src/mill/scalalib/publish/Ivy.scala | 8 ++- scalalib/src/mill/scalalib/publish/Pom.scala | 28 +++++++-- .../src/mill/scalalib/publish/settings.scala | 16 +++-- .../src/mill/scalalib/ResolveDepsTests.scala | 18 ++++++ .../src/mill/scalalib/publish/IvyTests.scala | 60 +++++++++++++++++++ .../src/mill/scalalib/publish/PomTests.scala | 12 +++- 7 files changed, 141 insertions(+), 15 deletions(-) create mode 100644 scalalib/test/src/mill/scalalib/publish/IvyTests.scala diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala index bd7fce4fb1e..f67eed0387c 100644 --- a/scalalib/src/mill/scalalib/Dep.scala +++ b/scalalib/src/mill/scalalib/Dep.scala @@ -3,6 +3,20 @@ import mill.util.JsonFormatters._ import upickle.default.{macroRW, ReadWriter => RW} sealed trait Dep { def configure(attributes: coursier.Attributes): Dep + def exclude(exclusions: (String, String)*): Dep = + this match { + case dep : Dep.Java => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) + case dep : Dep.Scala => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) + case dep : Dep.Point => dep.copy(dep = dep.dep.copy(exclusions = dep.dep.exclusions ++ exclusions)) + } + def excludeOrg(organizations: String*): Dep = exclude(organizations.map(_ -> "*"): _*) + def excludeName(names: String*): Dep = exclude(names.map("*" -> _): _*) + def withConfiguration(configuration: String): Dep = + this match { + case dep : Dep.Java => dep.copy(dep = dep.dep.copy(configuration = configuration)) + case dep : Dep.Scala => dep.copy(dep = dep.dep.copy(configuration = configuration)) + case dep : Dep.Point => dep.copy(dep = dep.dep.copy(configuration = configuration)) + } } object Dep{ diff --git a/scalalib/src/mill/scalalib/publish/Ivy.scala b/scalalib/src/mill/scalalib/publish/Ivy.scala index 644e2c53099..22e26ff692f 100644 --- a/scalalib/src/mill/scalalib/publish/Ivy.scala +++ b/scalalib/src/mill/scalalib/publish/Ivy.scala @@ -41,8 +41,12 @@ object Ivy { } private def renderDependency(dep: Dependency) = { - val scope = scopeToConf(dep.scope) - default(compile)"}> + if (dep.exclusions.isEmpty) + ${dep.configuration.getOrElse("default(compile)")}"} /> + else + ${dep.configuration.getOrElse("default(compile)")}"}> + {dep.exclusions.map(ex => )} + } private def scopeToConf(s: Scope): String = s match { diff --git a/scalalib/src/mill/scalalib/publish/Pom.scala b/scalalib/src/mill/scalalib/publish/Pom.scala index 1a86e7de79e..84cf0632f5f 100644 --- a/scalalib/src/mill/scalalib/publish/Pom.scala +++ b/scalalib/src/mill/scalalib/publish/Pom.scala @@ -90,12 +90,28 @@ object Pom { case Scope.Test => test case Scope.Runtime => runtime } - - {d.artifact.group} - {d.artifact.id} - {d.artifact.version} - {scope} - + if (d.exclusions.isEmpty) + + {d.artifact.group} + {d.artifact.id} + {d.artifact.version} + {scope} + + else + + {d.artifact.group} + {d.artifact.id} + {d.artifact.version} + + {d.exclusions.map(ex => + + {ex._1} + {ex._2} + + )} + + {scope} + } } diff --git a/scalalib/src/mill/scalalib/publish/settings.scala b/scalalib/src/mill/scalalib/publish/settings.scala index 1076fb41b79..34f7e7ad728 100644 --- a/scalalib/src/mill/scalalib/publish/settings.scala +++ b/scalalib/src/mill/scalalib/publish/settings.scala @@ -15,7 +15,9 @@ object Artifact { case Dep.Java(dep, cross) => Dependency( Artifact(dep.module.organization, dep.module.name, dep.version), - Scope.Compile + Scope.Compile, + if (dep.configuration == "" ) None else Some(dep.configuration), + dep.exclusions.toList ) case Dep.Scala(dep, cross) => Dependency( @@ -24,7 +26,9 @@ object Artifact { s"${dep.module.name}_${scalaBin}", dep.version ), - Scope.Compile + Scope.Compile, + if (dep.configuration == "") None else Some(dep.configuration), + dep.exclusions.toList ) case Dep.Point(dep, cross) => Dependency( @@ -33,7 +37,9 @@ object Artifact { s"${dep.module.name}_${scalaFull}", dep.version ), - Scope.Compile + Scope.Compile, + if (dep.configuration == "") None else Some(dep.configuration), + dep.exclusions.toList ) } } @@ -49,7 +55,9 @@ object Scope { case class Dependency( artifact: Artifact, - scope: Scope + scope: Scope, + configuration: Option[String] = None, + exclusions: Seq[(String, String)] = Nil ) case class Developer( diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala index 97fcbd505e7..861fa3129c5 100644 --- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala +++ b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala @@ -34,6 +34,24 @@ object ResolveDepsTests extends TestSuite { 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) + assert(!paths.exists(_.path.toString.contains("fansi_2.12"))) + } + + 'excludeTransitiveDepsByOrg - { + val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".excludeOrg("com.lihaoyi")) + val Success(paths) = evalDeps(deps) + assert(!paths.exists(path => path.path.toString.contains("com/lihaoyi") && !path.path.toString.contains("pprint_2.12"))) + } + + 'excludeTransitiveDepsByName - { + val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".excludeName("fansi_2.12")) + val Success(paths) = evalDeps(deps) + assert(!paths.exists(_.path.toString.contains("fansi_2.12"))) + } + 'errOnInvalidOrgDeps - { val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3") val Failure(errMsg, _) = evalDeps(deps) diff --git a/scalalib/test/src/mill/scalalib/publish/IvyTests.scala b/scalalib/test/src/mill/scalalib/publish/IvyTests.scala new file mode 100644 index 00000000000..0f275dd98a8 --- /dev/null +++ b/scalalib/test/src/mill/scalalib/publish/IvyTests.scala @@ -0,0 +1,60 @@ +package mill.scalalib.publish + +import utest._ +import mill._ + +import scala.xml.{Node, NodeSeq, XML} + +object IvyTests extends TestSuite { + + def tests: Tests = Tests { + val artifactId = "mill-scalalib_2.12" + val artifact = + Artifact("com.lihaoyi", "mill-scalalib_2.12", "0.0.1") + val deps = Agg( + Dependency(Artifact("com.lihaoyi", "mill-main_2.12", "0.1.4"), + Scope.Compile), + Dependency(Artifact("org.scala-sbt", "test-interface", "1.0"), + Scope.Compile), + Dependency(Artifact("com.lihaoyi", "pprint_2.12", "0.5.3"), + Scope.Compile, exclusions = List("com.lihaoyi" -> "fansi_2.12", "*" -> "sourcecode_2.12")) + ) + + 'fullIvy - { + val fullIvy = XML.loadString(Ivy(artifact, deps)) + + 'topLevel - { + val info = singleNode(fullIvy \ "info") + assert( + singleAttr(info, "organisation") == artifact.group + , singleAttr(info, "module") == artifact.id + , singleAttr(info, "revision") == artifact.version + ) + } + + 'dependencies - { + val dependencies = fullIvy \ "dependencies" \ "dependency" + val ivyDeps = deps.indexed + + assert(dependencies.size == ivyDeps.size) + + dependencies.zipWithIndex.foreach { case (dep, index) => + assert( + singleAttr(dep, "org") == ivyDeps(index).artifact.group + , singleAttr(dep, "name") == ivyDeps(index).artifact.id + , singleAttr(dep, "rev") == ivyDeps(index).artifact.version + , (dep \ "exclude").zipWithIndex forall { case (exclude, j) => + singleAttr(exclude, "org") == ivyDeps(index).exclusions(j)._1 && + singleAttr(exclude, "name") == ivyDeps(index).exclusions(j)._2 + } + ) + } + } + } + } + + def singleNode(seq: NodeSeq): Node = + seq.headOption.getOrElse(throw new RuntimeException("empty seq")) + def singleAttr(node: Node, attr: String): String = + node.attribute(attr).flatMap(_.headOption.map(_.text)).getOrElse(throw new RuntimeException(s"empty attr $attr")) +} diff --git a/scalalib/test/src/mill/scalalib/publish/PomTests.scala b/scalalib/test/src/mill/scalalib/publish/PomTests.scala index 31e874467c7..c15ff172d83 100644 --- a/scalalib/test/src/mill/scalalib/publish/PomTests.scala +++ b/scalalib/test/src/mill/scalalib/publish/PomTests.scala @@ -15,7 +15,9 @@ object PomTests extends TestSuite { Dependency(Artifact("com.lihaoyi", "mill-main_2.12", "0.1.4"), Scope.Compile), Dependency(Artifact("org.scala-sbt", "test-interface", "1.0"), - Scope.Compile) + Scope.Compile), + Dependency(Artifact("com.lihaoyi", "pprint_2.12", "0.5.3"), + Scope.Compile, exclusions = List("com.lihaoyi" -> "fansi_2.12", "*" -> "sourcecode_2.12")) ) val settings = PomSettings( description = "mill-scalalib", @@ -104,7 +106,7 @@ object PomTests extends TestSuite { 'dependencies - { val dependencies = fullPom \ "dependencies" \ "dependency" - assert(dependencies.size == 2) + assert(dependencies.size == 3) val pomDeps = deps.indexed @@ -114,7 +116,11 @@ object PomTests extends TestSuite { singleText(dep \ "groupId") == pomDeps(index).artifact.group, singleText(dep \ "artifactId") == pomDeps(index).artifact.id, singleText(dep \ "version") == pomDeps(index).artifact.version, - optText(dep \ "scope").isEmpty + optText(dep \ "scope").isEmpty, + (dep \ "exclusions").zipWithIndex.forall { case (node, j) => + singleText(node \ "exclude" \ "groupId") == pomDeps(index).exclusions(j)._1 && + singleText(node \ "exclude" \ "artifactId") == pomDeps(index).exclusions(j)._2 + } ) } }