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

Merge pull request #6457 from steinybot/fix/runner-scope 

Remove configuration scope from runner settings
This commit is contained in:
eugene yokota 2021-04-22 08:56:28 -04:00 committed by GitHub
parent fe5497938a 223ab2b310
commit cb2e228549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2561,11 +2561,8 @@ object Defaults extends BuildCommon {
// 1. runnerSettings is added unscoped via JvmPlugin. // 1. runnerSettings is added unscoped via JvmPlugin.
// 2. In addition it's added scoped to run task. // 2. In addition it's added scoped to run task.
lazy val runnerSettings: Seq[Setting[_]] = Seq(runnerTask, forkOptions := forkOptionsTask.value) lazy val runnerSettings: Seq[Setting[_]] = Seq(runnerTask, forkOptions := forkOptionsTask.value)
private[this] lazy val newRunnerSettings: Seq[Setting[_]] = { private[this] lazy val newRunnerSettings: Seq[Setting[_]] =
val unscoped: Seq[Def.Setting[_]] =
Seq(runner := ClassLoaders.runner.value, forkOptions := forkOptionsTask.value) Seq(runner := ClassLoaders.runner.value, forkOptions := forkOptionsTask.value)
inConfig(Compile)(unscoped) ++ inConfig(Test)(unscoped)
}
lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase