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

Merge pull request #1538 from sbt/fix/1439 

Fixes #1439. Fixes metabuild downloading unused Scala 2.10.2
This commit is contained in:
Havoc Pennington 2014-08-20 14:26:02 -04:00
parent b827768faa 8a069d0fb2
commit b202bd6848
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/IvyScala.scala
View File

@ -16,6 +16,7 @@ object ScalaArtifacts {
val Organization = ScalaOrganization val Organization = ScalaOrganization
val LibraryID = ScalaLibraryID val LibraryID = ScalaLibraryID
val CompilerID = ScalaCompilerID val CompilerID = ScalaCompilerID
val ReflectID = "scala-reflect"
def libraryDependency(version: String): ModuleID = ModuleID(Organization, LibraryID, version) def libraryDependency(version: String): ModuleID = ModuleID(Organization, LibraryID, version)
private[sbt] def toolDependencies(org: String, version: String): Seq[ModuleID] = Seq( private[sbt] def toolDependencies(org: String, version: String): Seq[ModuleID] = Seq(
@ -47,6 +48,7 @@ private object IvyScala {
def overrideScalaVersion(module: DefaultModuleDescriptor, version: String) { def overrideScalaVersion(module: DefaultModuleDescriptor, version: String) {
overrideVersion(module, Organization, LibraryID, version) overrideVersion(module, Organization, LibraryID, version)
overrideVersion(module, Organization, CompilerID, version) overrideVersion(module, Organization, CompilerID, version)
overrideVersion(module, Organization, ReflectID, version)
} }
def overrideVersion(module: DefaultModuleDescriptor, org: String, name: String, version: String) { def overrideVersion(module: DefaultModuleDescriptor, org: String, name: String, version: String) {
val id = new ModuleId(org, name) val id = new ModuleId(org, name)

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

@ -1070,8 +1070,8 @@ object Classpaths {
allDependencies := { allDependencies := {
projectDependencies.value ++ libraryDependencies.value projectDependencies.value ++ libraryDependencies.value
}, },
ivyScala <<= ivyScala or (scalaHome, scalaVersion in update, scalaBinaryVersion in update, scalaOrganization) { (sh, fv, bv, so) => ivyScala <<= ivyScala or (scalaHome, scalaVersion in update, scalaBinaryVersion in update, scalaOrganization, sbtPlugin) { (sh, fv, bv, so, plugin) =>
Some(new IvyScala(fv, bv, Nil, filterImplicit = false, checkExplicit = true, overrideScalaVersion = false, scalaOrganization = so)) Some(new IvyScala(fv, bv, Nil, filterImplicit = false, checkExplicit = true, overrideScalaVersion = plugin, scalaOrganization = so))
}, },
artifactPath in makePom <<= artifactPathSetting(artifact in makePom), artifactPath in makePom <<= artifactPathSetting(artifact in makePom),
publishArtifact in makePom := publishMavenStyle.value && publishArtifact.value, publishArtifact in makePom := publishMavenStyle.value && publishArtifact.value,

2
notes/0.13.6.md
View File

@ -31,6 +31,7 @@
[1423]: https://github.com/sbt/sbt/pull/1423 [1423]: https://github.com/sbt/sbt/pull/1423
[1426]: https://github.com/sbt/sbt/pull/1426 [1426]: https://github.com/sbt/sbt/pull/1426
[1433]: https://github.com/sbt/sbt/pull/1433 [1433]: https://github.com/sbt/sbt/pull/1433
[1439]: https://github.com/sbt/sbt/issues/1439
[1447]: https://github.com/sbt/sbt/pull/1447 [1447]: https://github.com/sbt/sbt/pull/1447
[1450]: https://github.com/sbt/sbt/pull/1450 [1450]: https://github.com/sbt/sbt/pull/1450
[1451]: https://github.com/sbt/sbt/pull/1451 [1451]: https://github.com/sbt/sbt/pull/1451
@ -112,6 +113,7 @@
- Fixes config-classes leak in loading build files. [#1524][1524] by [@jsuereth][@jsuereth] - Fixes config-classes leak in loading build files. [#1524][1524] by [@jsuereth][@jsuereth]
- Fixes name-conflicts in hashed settings class files. [#1465][1465] by [@jsuereth][@jsuereth] - Fixes name-conflicts in hashed settings class files. [#1465][1465] by [@jsuereth][@jsuereth]
- Fixes `NullPointerError` in tab completion by `FileExamples`. [#1530][1530] by [@eed3si9n][@eed3si9n] - Fixes `NullPointerError` in tab completion by `FileExamples`. [#1530][1530] by [@eed3si9n][@eed3si9n]
- Fixes metabuild downloading unused Scala 2.10.2. [#1439][1439] by [@eed3si9n][@eed3si9n]
### Maven Central Repository defaults to HTTPS ### Maven Central Repository defaults to HTTPS