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

Merge branch 'develop' into scripted-classloader

This commit is contained in:
Ethan Atkins 2019-02-01 12:30:25 -08:00 committed by GitHub
parent 7b8ed4d13f 1c5608e1dd
commit 51f295a922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main-settings/src/main/scala/sbt/dsl/LinterLevel.scala
View File

@ -41,8 +41,7 @@ package sbt.dsl
* }}} * }}}
* To make this work, the instances are all defined as implicit case objects. Moreover, the * To make this work, the instances are all defined as implicit case objects. Moreover, the
* the [[LinterLevel.Warn]] setting is made default by placing [[LinterLevel.Abort]] and * the [[LinterLevel.Warn]] setting is made default by placing [[LinterLevel.Abort]] and
* [[LinterLevel.Ignore]] in the [[LinterLevelLowPriority]] trait that the [[LinterLevel]] * [[LinterLevel.Ignore]] using the low priority trait pattern.
* companion object extends.
*/ */
sealed trait LinterLevel sealed trait LinterLevel
object LinterLevel extends LinterLevelLowPriority { object LinterLevel extends LinterLevelLowPriority {

2
main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala
View File

@ -28,7 +28,7 @@ abstract class BaseTaskLinterDSL extends LinterDSL {
val unchecked = symbolOf[sbt.sbtUnchecked].asClass val unchecked = symbolOf[sbt.sbtUnchecked].asClass
val initializeType = typeOf[sbt.Def.Initialize[_]] val initializeType = typeOf[sbt.Def.Initialize[_]]
/** /*
* Lints a task tree. * Lints a task tree.
* *
* @param insideIf indicates whether or not the current tree is enclosed in an if statement. * @param insideIf indicates whether or not the current tree is enclosed in an if statement.

2
sbt/src/sbt-test/project/unique-settings-computation/project/A.scala
View File

@ -18,7 +18,7 @@ object A extends AutoPlugin {
Nil Nil
def setUpScripted = Command.command("setUpScripted") { (state0: State) => def setUpScripted = Command.command("setUpScripted") { (state0: State) =>
Project.extract(state0).append(name := "foo", state0) Project.extract(state0).appendWithoutSession(name := "foo", state0)
} }
// used to ensure the build-level and global settings are only added once // used to ensure the build-level and global settings are only added once