mirror of https://github.com/sbt/sbt.git
Add bspEnabled setting
This commit is contained in:
parent
788fd4aa28
commit
23c8889e26
|
|
@ -386,7 +386,8 @@ object Keys {
|
||||||
val exportPipelining = settingKey[Boolean]("Product early output so downstream subprojects can do pipelining.").withRank(BSetting)
|
val exportPipelining = settingKey[Boolean]("Product early output so downstream subprojects can do pipelining.").withRank(BSetting)
|
||||||
|
|
||||||
val bspConfig = taskKey[Unit]("Create or update the BSP connection files").withRank(DSetting)
|
val bspConfig = taskKey[Unit]("Create or update the BSP connection files").withRank(DSetting)
|
||||||
val bspTargetIdentifier = settingKey[BuildTargetIdentifier]("Id for BSP build target.").withRank(DSetting)
|
val bspEnabled = settingKey[Boolean]("Enable/Disable BSP for this build, project or configuration")
|
||||||
|
val bspTargetIdentifier = settingKey[BuildTargetIdentifier]("Build target identifier of a project and configuration.").withRank(DSetting)
|
||||||
val bspWorkspace = settingKey[Map[BuildTargetIdentifier, Scope]]("Mapping of BSP build targets to sbt scopes").withRank(DSetting)
|
val bspWorkspace = settingKey[Map[BuildTargetIdentifier, Scope]]("Mapping of BSP build targets to sbt scopes").withRank(DSetting)
|
||||||
val bspInternalDependencyConfigurations = settingKey[Seq[(ProjectRef, Set[ConfigKey])]]("The project configurations that this configuration depends on, possibly transitivly").withRank(DSetting)
|
val bspInternalDependencyConfigurations = settingKey[Seq[(ProjectRef, Set[ConfigKey])]]("The project configurations that this configuration depends on, possibly transitivly").withRank(DSetting)
|
||||||
val bspWorkspaceBuildTargets = taskKey[Seq[BuildTarget]]("List all the BSP build targets").withRank(DTask)
|
val bspWorkspaceBuildTargets = taskKey[Seq[BuildTarget]]("List all the BSP build targets").withRank(DTask)
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ object BuildServerProtocol {
|
||||||
sbtVersion.value,
|
sbtVersion.value,
|
||||||
(ThisBuild / baseDirectory).value
|
(ThisBuild / baseDirectory).value
|
||||||
),
|
),
|
||||||
|
bspEnabled := true,
|
||||||
bspWorkspace := bspWorkspaceSetting.value,
|
bspWorkspace := bspWorkspaceSetting.value,
|
||||||
bspWorkspaceBuildTargets := Def.taskDyn {
|
bspWorkspaceBuildTargets := Def.taskDyn {
|
||||||
val workspace = Keys.bspWorkspace.value
|
val workspace = Keys.bspWorkspace.value
|
||||||
|
|
@ -246,7 +247,15 @@ object BuildServerProtocol {
|
||||||
.map(_ / Keys.bspTargetIdentifier)
|
.map(_ / Keys.bspTargetIdentifier)
|
||||||
.join
|
.join
|
||||||
.value
|
.value
|
||||||
targetIds.zip(scopes).toMap
|
val bspEnabled = scopes
|
||||||
|
.map(_ / Keys.bspEnabled)
|
||||||
|
.join
|
||||||
|
.value
|
||||||
|
val result = for {
|
||||||
|
(targetId, scope, bspEnabled) <- (targetIds, scopes, bspEnabled).zipped
|
||||||
|
if bspEnabled
|
||||||
|
} yield targetId -> scope
|
||||||
|
result.toMap
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue