Merge pull request #3169 from scalacenter/util-x11

Bump up to lm X11

main-actions/src/test/scala/sbt/CacheIvyTest.scala

@@ -51,8 +51,9 @@ class CacheIvyTest extends Properties("CacheIvy") {
       o <- Gen.alphaStr
       n <- Gen.alphaStr
       a <- Gen.alphaStr
+      v <- arbCrossVersion.arbitrary
       cs <- arbitrary[List[String]]
-    } yield ExclusionRule(o, n, a, cs.toVector)
+    } yield ExclusionRule(o, n, a, cs.toVector, v)
   )
 
   implicit val arbCrossVersion: Arbitrary[CrossVersion] = Arbitrary {

main/src/main/scala/sbt/Keys.scala

@@ -67,6 +67,7 @@ import sbt.librarymanagement.{
   UpdateLogging,
   UpdateReport
 }
+import sbt.librarymanagement.ExclusionRule
 import sbt.internal.librarymanagement.{
   CompatibilityWarningOptions,
   DeliverConfiguration,
@@ -77,7 +78,6 @@ import sbt.internal.librarymanagement.{
   MakePomConfiguration,
   PublishConfiguration,
   RetrieveConfiguration,
-  SbtExclusionRule,
   UnresolvedWarningConfiguration
 }
 import sbt.util.{ Level, Logger }
@@ -396,7 +396,7 @@ object Keys {
   val dependencyCacheDirectory = TaskKey[File]("dependency-cache-directory", "The base directory for cached dependencies.", DTask)
   val libraryDependencies = SettingKey[Seq[ModuleID]]("library-dependencies", "Declares managed dependencies.", APlusSetting)
   val dependencyOverrides = SettingKey[Set[ModuleID]]("dependency-overrides", "Declares managed dependency overrides.", BSetting)
-  val excludeDependencies = SettingKey[Seq[SbtExclusionRule]]("exclude-dependencies", "Declares managed dependency exclusions.", BSetting)
+  val excludeDependencies = SettingKey[Seq[ExclusionRule]]("exclude-dependencies", "Declares managed dependency exclusions.", BSetting)
   val allDependencies = TaskKey[Seq[ModuleID]]("all-dependencies", "Inter-project and library dependencies.", CTask)
   val projectDependencies = TaskKey[Seq[ModuleID]]("project-dependencies", "Inter-project dependencies.", DTask)
   val ivyXML = SettingKey[NodeSeq]("ivy-xml", "Defines inline Ivy XML for configuring dependency management.", BSetting)

project/Dependencies.scala

@@ -13,7 +13,7 @@ object Dependencies {
   // sbt modules
   private val ioVersion = "1.0.0-M11"
   private val utilVersion = "1.0.0-M23"
-  private val lmVersion = "1.0.0-X10"
+  private val lmVersion = "1.0.0-X11"
   private val zincVersion = "1.0.0-X14"
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion