Merge branch 'develop' into scripted-classloader

main-settings/src/main/scala/sbt/dsl/LinterLevel.scala

@@ -41,8 +41,7 @@ package sbt.dsl
  * }}}
  * 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
- * [[LinterLevel.Ignore]] in the [[LinterLevelLowPriority]] trait that the [[LinterLevel]]
- * companion object extends.
+ * [[LinterLevel.Ignore]] using the low priority trait pattern.
  */
 sealed trait LinterLevel
 object LinterLevel extends LinterLevelLowPriority {

main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala

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

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

@@ -18,7 +18,7 @@ object A extends AutoPlugin {
     Nil
 
   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