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

updateSbtClassifiers: use the correct scalaOrganization

This commit is contained in:
Guillaume Martres 2019-05-28 16:10:49 +02:00
parent b6f02b9b8c
commit 7a84808f74
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2574,6 +2574,7 @@ object Classpaths {
// to fix https://github.com/sbt/sbt/issues/2686 // to fix https://github.com/sbt/sbt/issues/2686
scalaVersion := appConfiguration.value.provider.scalaProvider.version, scalaVersion := appConfiguration.value.provider.scalaProvider.version,
scalaBinaryVersion := binaryScalaVersion(scalaVersion.value), scalaBinaryVersion := binaryScalaVersion(scalaVersion.value),
scalaOrganization := ScalaArtifacts.Organization,
scalaModuleInfo := { scalaModuleInfo := {
Some( Some(
ScalaModuleInfo( ScalaModuleInfo(

3
sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt
View File

@ -7,3 +7,6 @@ ivyConfiguration := {
dependencyResolution := { dependencyResolution := {
throw new RuntimeException("updateSbtClassifiers should use updateSbtClassifiers / dependencyResolution") throw new RuntimeException("updateSbtClassifiers should use updateSbtClassifiers / dependencyResolution")
} }
scalaOrganization := "doesnt.exist"