Merge pull request #6207 from adpi2/scala3-libmanagement

Remove dotty tool dependencies
This commit is contained in:
eugene yokota 2020-12-17 11:03:09 -05:00 committed by GitHub
commit 1dcafebb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions

View File

@ -3078,10 +3078,8 @@ object Classpaths {
val version = scalaVersion.value
if (scalaHome.value.isDefined || scalaModuleInfo.value.isEmpty || !managedScalaInstance.value)
pluginAdjust
else {
val isDotty = ScalaInstance.isDotty(version)
ScalaArtifacts.toolDependencies(sbtOrg, version, isDotty) ++ pluginAdjust
}
else
ScalaArtifacts.toolDependencies(sbtOrg, version) ++ pluginAdjust
},
// in case of meta build, exclude all sbt modules from the dependency graph, so we can use the sbt resolved by the launcher
allExcludeDependencies := {