From 13c67295077d0658625cbdcb5a284b2c54028ed6 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 12 Aug 2015 23:54:38 +0100
Subject: [PATCH 1/2] Extract Def.settings from Project#settings.

This allows for the same functionality that using SettingsDefinition in
Project#settings allows (specifying either bare Setting[_] or a Seq[Setting[_]])
to be available outside of the settings for a project, for instance when
defining a val.

In short, it allows:

    val modelSettings = Def.settings(
      sharedSettings,
      libraryDependencies += foo
    )
---
 main/settings/src/main/scala/sbt/Def.scala | 2 ++
 main/src/main/scala/sbt/Project.scala      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/settings/src/main/scala/sbt/Def.scala b/main/settings/src/main/scala/sbt/Def.scala
index 073505b6e..5ae4e737a 100644
--- a/main/settings/src/main/scala/sbt/Def.scala
+++ b/main/settings/src/main/scala/sbt/Def.scala
@@ -10,6 +10,8 @@ import KeyRanks.{ DTask, Invisible }
 object Def extends Init[Scope] with TaskMacroExtra {
   type Classpath = Seq[Attributed[File]]
 
+  def settings(ss: SettingsDefinition*): Seq[Setting[_]] = ss.flatMap(_.settings)
+
   val triggeredBy = AttributeKey[Seq[Task[_]]]("triggered-by")
   val runBefore = AttributeKey[Seq[Task[_]]]("run-before")
   val resolvedScoped = SettingKey[ScopedKey[_]]("resolved-scoped", "The ScopedKey for the referencing setting or task.", KeyRanks.DSetting)
diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala
index 48db490d0..5ad063dc0 100755
--- a/main/src/main/scala/sbt/Project.scala
+++ b/main/src/main/scala/sbt/Project.scala
@@ -141,7 +141,7 @@ sealed trait Project extends ProjectDefinition[ProjectReference] {
   def aggregate(refs: ProjectReference*): Project = copy(aggregate = (aggregate: Seq[ProjectReference]) ++ refs)
 
   /** Appends settings to the current settings sequence for this project. */
-  def settings(ss: Def.SettingsDefinition*): Project = copy(settings = (settings: Seq[Def.Setting[_]]) ++ ss.flatMap(_.settings))
+  def settings(ss: Def.SettingsDefinition*): Project = copy(settings = (settings: Seq[Def.Setting[_]]) ++ Def.settings(ss: _*))
 
   @deprecated("Use settingSets method.", "0.13.5")
   def autoSettings(select: AddSettings*): Project = settingSets(select.toSeq: _*)

From dcbbc531edb762a9a6ed8454fee25b6cfea0d46a Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 13 Aug 2015 00:31:31 +0100
Subject: [PATCH 2/2] Add notes for PR 2151.

---
 notes/0.13.10/def-settings.markdown | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 notes/0.13.10/def-settings.markdown

diff --git a/notes/0.13.10/def-settings.markdown b/notes/0.13.10/def-settings.markdown
new file mode 100644
index 000000000..f258832a9
--- /dev/null
+++ b/notes/0.13.10/def-settings.markdown
@@ -0,0 +1,22 @@
+
+  [@dwijnand]: http://github.com/dwijnand
+  [2151]: https://github.com/sbt/sbt/pull/2151
+
+### Fixes with compatibility implications
+
+### Improvements
+
+- Adds `Def.settings`, which facilitates mixing settings with seq of settings. See below.
+
+### Bug fixes
+
+### `Def.settings`
+
+Using `Def.settings` it is now possible to nicely define settings as such:
+
+    val modelSettings = Def.settings(
+      sharedSettings,
+      libraryDependencies += foo
+    )
+
+[#2151][2151] by [@dwijnand][@dwijnand].