mirror of https://github.com/sbt/sbt.git
BSP is part of the JVM plugin
This commit is contained in:
parent
6bce0a7b07
commit
4f00abf1ba
|
|
@ -240,7 +240,7 @@ object Defaults extends BuildCommon {
|
|||
bgCopyClasspath :== true,
|
||||
closeClassLoaders :== SysProp.closeClassLoaders,
|
||||
allowZombieClassLoaders :== true,
|
||||
)
|
||||
) ++ BuildServerProtocol.globalSettings
|
||||
|
||||
private[sbt] lazy val globalIvyCore: Seq[Setting[_]] =
|
||||
Seq(
|
||||
|
|
@ -386,8 +386,7 @@ object Defaults extends BuildCommon {
|
|||
sys.env.contains("CI") || SysProp.ci,
|
||||
// watch related settings
|
||||
pollInterval :== Watch.defaultPollInterval,
|
||||
) ++ BuildServerProtocol.globalSettings
|
||||
++ LintUnused.lintSettings
|
||||
) ++ LintUnused.lintSettings
|
||||
++ DefaultBackgroundJobService.backgroundJobServiceSettings
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,9 @@ object BuildServerProtocol {
|
|||
bspTargetConfigs.toSeq.map(name => Scope.Global.in(ref, ConfigKey(name)))
|
||||
}
|
||||
Def.setting {
|
||||
val targetIds = scopes.map(_ / Keys.bspTargetIdentifier).join.value
|
||||
val targetIds = scopes.map(_ / Keys.bspTargetIdentifier)
|
||||
.map(_?) // bspTargetIdentifier might no be defined if the JvmPlugin is disabled
|
||||
.join.value.flatten
|
||||
targetIds.zip(scopes).toMap
|
||||
}
|
||||
}.value,
|
||||
|
|
|
|||
Loading…
Reference in New Issue