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

Merge pull request #4732 from smarter/fix-updatesbtclass 

updateSbtClassifiers: use the correct scalaOrganization
This commit is contained in:
eugene yokota 2019-05-28 17:52:12 -04:00 committed by GitHub
parent b84a90f28d 7a84808f74
commit aefd0969b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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

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

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