Merge branch '1.x' into 1.0.x

notes/1.1.0/filter-scripted-tests.md

@@ -0,0 +1,14 @@
+[@jonas]: https://github.com/jonas
+
+[#3564]: https://github.com/sbt/sbt/issues/3564
+[#3566]: https://github.com/sbt/sbt/pull/3566
+
+### Improvements
+
+- Filter scripted tests based on optional `project/build.properties`. [#3564]/[#3566] by [@jonas]
+
+### Filtering scripted tests using `project/build.properties`.
+
+For all scripted tests in which `project/build.properties` exist, the value of the `sbt.version` property is read. If its binary version is different from `sbtBinaryVersion in pluginCrossBuild` the test will be skipped and a message indicating this will be logged.
+
+This allows you to define scripted tests that track the minimum supported sbt versions, e.g. 0.13.9 and 1.0.0-RC2.

notes/1.1.0/new-version-default.md

@@ -0,0 +1,3 @@
+### Improvements
+
+- Changes `version` setting default to `0.1.0-SNAPSHOT` for compatibility with Semantic Versioning

notes/1.1.0/project-id.md

@@ -0,0 +1,11 @@
+[@dwijnand]: https://github.com/dwijnand
+
+[#3601]: https://github.com/sbt/sbt/pull/3601
+
+### Fixes with compatibility implications
+
+### Improvements
+
+- Adds `Project#withId` to change a project's id. [#3601][] by [@dwijnand][]
+
+### Bug fixes

notes/1.1.0/unified-shell.markdown

@@ -0,0 +1,49 @@
+
+### Fixes with compatibility implications
+
+-
+
+### Improvements
+
+- Unifies sbt shell and build.sbt syntax. See below.
+
+### Bug fixes
+
+-
+
+### Unified slash syntax for sbt shell and build.sbt
+
+This adds unified slash syntax for both sbt shell and the build.sbt DSL.
+Instead of the current `<project-id>/config:intask::key`, this adds
+`<project-id>/<config-ident>/intask/key` where `<config-ident>` is the Scala identifier
+notation for the configurations like `Compile` and `Test`. (The old shell syntax will continue to function)
+
+These examples work both from the shell and in build.sbt.
+
+    Global / cancelable
+    ThisBuild / scalaVersion
+    Test / test
+    root / Compile / compile / scalacOptions
+    ProjectRef(uri("file:/xxx/helloworld/"),"root")/Compile/scalacOptions
+    Zero / Zero / name
+
+The inspect command now outputs something that can be copy-pasted:
+
+    > inspect compile
+    [info] Task: sbt.inc.Analysis
+    [info] Description:
+    [info]  Compiles sources.
+    [info] Provided by:
+    [info]  ProjectRef(uri("file:/xxx/helloworld/"),"root")/Compile/compile
+    [info] Defined at:
+    [info]  (sbt.Defaults) Defaults.scala:326
+    [info] Dependencies:
+    [info]  Compile/manipulateBytecode
+    [info]  Compile/incCompileSetup
+    ....
+
+[#3434][3434] by [@eed3si9n][@eed3si9n]
+
+  [3434]: https://github.com/sbt/sbt/pull/3434
+  [@eed3si9n]: https://github.com/eed3si9n
+  [@dwijnand]: http://github.com/dwijnand