diff --git a/main/src/main/scala/sbt/Plugins.scala b/main/src/main/scala/sbt/Plugins.scala index 63795bd6d..9738ed053 100644 --- a/main/src/main/scala/sbt/Plugins.scala +++ b/main/src/main/scala/sbt/Plugins.scala @@ -41,11 +41,11 @@ Steps for users: For example, given plugins Web and Javascript (perhaps provided by plugins added with addSbtPlugin), - .addPlugins( Web && Javascript ) + .enablePlugins( Web && Javascript ) will activate `MyPlugin` defined above and have its settings automatically added. If the user instead defines - .addPlugins( Web && Javascript ).disablePlugins(MyPlugin) + .enablePlugins( Web && Javascript ).disablePlugins(MyPlugin) then the `MyPlugin` settings (and anything that activates only when `MyPlugin` is activated) will not be added. diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala index b26cd4088..cd04879fd 100755 --- a/main/src/main/scala/sbt/Project.scala +++ b/main/src/main/scala/sbt/Project.scala @@ -145,8 +145,8 @@ sealed trait Project extends ProjectDefinition[ProjectReference] def setSbtFiles(files: File*): Project = copy(auto = AddSettings.append( AddSettings.clearSbtFiles(auto), AddSettings.sbtFiles(files: _*)) ) /** Sets the [[AutoPlugin]]s of this project. - A [[AutoPlugin]] is a common label that is used by plugins to determine what settings, if any, to add to a project. */ - def addPlugins(ns: Plugins*): Project = setPlugins(ns.foldLeft(plugins)(Plugins.and)) + A [[AutoPlugin]] is a common label that is used by plugins to determine what settings, if any, to enable on a project. */ + def enablePlugins(ns: Plugins*): Project = setPlugins(ns.foldLeft(plugins)(Plugins.and)) /** Disable the given plugins on this project. */ def disablePlugins(ps: AutoPlugin*): Project = diff --git a/sbt/src/sbt-test/project/auto-plugins/build.sbt b/sbt/src/sbt-test/project/auto-plugins/build.sbt index 7039ed235..bb3ec3b44 100644 --- a/sbt/src/sbt-test/project/auto-plugins/build.sbt +++ b/sbt/src/sbt-test/project/auto-plugins/build.sbt @@ -1,17 +1,17 @@ // disablePlugins(Q) will prevent R from being auto-added -lazy val projA = project.addPlugins(A, B).disablePlugins(Q) +lazy val projA = project.enablePlugins(A, B).disablePlugins(Q) // without B, Q is not added -lazy val projB = project.addPlugins(A) +lazy val projB = project.enablePlugins(A) // with both A and B, Q is selected, which in turn selects R, but not S -lazy val projC = project.addPlugins(A, B) +lazy val projC = project.enablePlugins(A, B) // with no natures defined, nothing is auto-added lazy val projD = project // with S selected, Q is loaded automatically, which in turn selects R -lazy val projE = project.addPlugins(S) +lazy val projE = project.enablePlugins(S) check := { val adel = (del in projA).?.value // should be None diff --git a/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala b/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala index dde89c439..9675ce201 100644 --- a/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala +++ b/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala @@ -23,5 +23,5 @@ object A extends AutoPlugin { } object B extends Build { - lazy val extra = project.addPlugins(bN) + lazy val extra = project.enablePlugins(bN) }