luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump util to X11 and rename `SbtExclusionRule`

This commit is contained in:
jvican 2017-05-03 12:42:16 +02:00
parent edf7e566ba
commit 818b8c85ae
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main-actions/src/test/scala/sbt/CacheIvyTest.scala
View File

@ -51,8 +51,9 @@ class CacheIvyTest extends Properties("CacheIvy") {
o <- Gen.alphaStr o <- Gen.alphaStr
n <- Gen.alphaStr n <- Gen.alphaStr
a <- Gen.alphaStr a <- Gen.alphaStr
v <- arbCrossVersion.arbitrary
cs <- arbitrary[List[String]] 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 { implicit val arbCrossVersion: Arbitrary[CrossVersion] = Arbitrary {

4
main/src/main/scala/sbt/Keys.scala
View File

@ -67,6 +67,7 @@ import sbt.librarymanagement.{
UpdateLogging, UpdateLogging,
UpdateReport UpdateReport
} }
import sbt.librarymanagement.ExclusionRule
import sbt.internal.librarymanagement.{ import sbt.internal.librarymanagement.{
CompatibilityWarningOptions, CompatibilityWarningOptions,
DeliverConfiguration, DeliverConfiguration,
@ -77,7 +78,6 @@ import sbt.internal.librarymanagement.{
MakePomConfiguration, MakePomConfiguration,
PublishConfiguration, PublishConfiguration,
RetrieveConfiguration, RetrieveConfiguration,
SbtExclusionRule,
UnresolvedWarningConfiguration UnresolvedWarningConfiguration
} }
import sbt.util.{ Level, Logger } 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 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 libraryDependencies = SettingKey[Seq[ModuleID]]("library-dependencies", "Declares managed dependencies.", APlusSetting)
val dependencyOverrides = SettingKey[Set[ModuleID]]("dependency-overrides", "Declares managed dependency overrides.", BSetting) 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 allDependencies = TaskKey[Seq[ModuleID]]("all-dependencies", "Inter-project and library dependencies.", CTask)
val projectDependencies = TaskKey[Seq[ModuleID]]("project-dependencies", "Inter-project dependencies.", DTask) 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) val ivyXML = SettingKey[NodeSeq]("ivy-xml", "Defines inline Ivy XML for configuring dependency management.", BSetting)

2
project/Dependencies.scala
View File

@ -13,7 +13,7 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = "1.0.0-M11" private val ioVersion = "1.0.0-M11"
private val utilVersion = "1.0.0-M23" 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 zincVersion = "1.0.0-X14"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion