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

Adjust to upstream

This commit is contained in:
Eugene Yokota 2017-01-15 09:27:26 -05:00
parent 95a209b033
commit 27397de8cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
View File

@ -171,11 +171,9 @@ final class IvySbt(val configuration: IvyConfiguration, fileToStore: File => Cac
val configs =
moduleSettings match {
case ic: InlineConfiguration => ic.configurations
case ic: InlineConfigurationWithExcludes => ic.configurations
case ec: EmptyConfiguration => Nil
case pc: PomConfiguration => Configurations.default ++ Configurations.defaultInternal
case ifc: IvyFileConfiguration => Configurations.default ++ Configurations.defaultInternal
case ic: InlineConfiguration => ic.configurations
case pc: PomConfiguration => Configurations.default ++ Configurations.defaultInternal
case ifc: IvyFileConfiguration => Configurations.default ++ Configurations.defaultInternal
}
moduleSettings.ivyScala match {
case Some(is) =>

4
librarymanagement/src/test/scala/ScalaOverrideTest.scala
View File

@ -12,10 +12,12 @@ class ScalaOverrideTest extends UnitSpec {
val OtherOrgID = "other.org"
def check(org0: String, version0: String)(org1: String, name1: String, version1: String) = {
val osm = new OverrideScalaMediator(org0, version0)
val scalaConfigs = Configurations.default.toVector filter { Configurations.underScalaVersion } map { _.name }
val osm = new OverrideScalaMediator(org0, version0, scalaConfigs)
val mrid = ModuleRevisionId.newInstance(org1, name1, version1)
val dd = new DefaultDependencyDescriptor(mrid, false)
dd.addDependencyConfiguration("compile", "compile")
val res = osm.mediate(dd)
res.getDependencyRevisionId shouldBe ModuleRevisionId.newInstance(org0, name1, version0)