From e0e2336a4bd5d54e7d5db5b1f5c9ac1fad8d7049 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sat, 22 Dec 2018 15:06:35 -0800 Subject: [PATCH 1/3] Update call to deprecated api in scripted --- .../project/unique-settings-computation/project/A.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt/src/sbt-test/project/unique-settings-computation/project/A.scala b/sbt/src/sbt-test/project/unique-settings-computation/project/A.scala index 225665c3f..9558c5599 100644 --- a/sbt/src/sbt-test/project/unique-settings-computation/project/A.scala +++ b/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 From df6f3bd8881dc61e426409a86c275378e23b5250 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 19 Dec 2018 14:06:02 -0800 Subject: [PATCH 2/3] Switch to regular comment instead of scaladoc Having this as scaladoc adds an unmoored doc comment compiler warning because no documentation is generated for the class that is being documented. --- main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala b/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala index d560a84a5..534a96459 100644 --- a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala +++ b/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. From 82cfbe83a797491ff7258770283c7607be3e0c32 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 31 Jan 2019 17:02:47 -0800 Subject: [PATCH 3/3] Fix doc warning The scaladoc task was warning: 'Could not find any member to link for "LinterLevelLowPriority"'. Given that LinterLevelLowPriority is a package private trait, it shouldn't be mentioned by name. --- main-settings/src/main/scala/sbt/dsl/LinterLevel.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main-settings/src/main/scala/sbt/dsl/LinterLevel.scala b/main-settings/src/main/scala/sbt/dsl/LinterLevel.scala index 028eecb15..7fe257c82 100644 --- a/main-settings/src/main/scala/sbt/dsl/LinterLevel.scala +++ b/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 {