0.13.0

.travis.yml

@@ -17,6 +17,7 @@ jdk:
   - openjdk7
 
 env:
+  # This splits the build into two parts
   matrix:
     - TEST_COMMAND="scripted sbt-assembly/*"
     - TEST_COMMAND="scripted merging/* caching/*"

README.md

@@ -24,7 +24,7 @@ Setup
 For sbt 0.13.6+ add sbt-assembly as a dependency in `project/assembly.sbt`:
 
 ```scala
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
 ```
 
 For older sbt 0.13.x, see [sbt-assembly 0.11.2](https://github.com/sbt/sbt-assembly/tree/0.11.2).

build.sbt

@@ -1,5 +1,5 @@
 lazy val commonSettings: Seq[Setting[_]] = Seq(
-  version in ThisBuild := "0.12.1-SNAPSHOT",
+  version in ThisBuild := "0.13.0",
   organization in ThisBuild := "com.eed3si9n"
 )
 

notes/0.13.0.markdown

@@ -0,0 +1,14 @@
+  [144]: https://github.com/sbt/sbt-assembly/pull/144
+  [145]: https://github.com/sbt/sbt-assembly/pull/145
+  [@jeffreyolchovy][@jeffreyolchovy]: https://github.com/jeffreyolchovy
+  [@catap]: https://github.com/catap
+
+### Accumulate errors during merge
+
+sbt-assembly 0.13.0 now accumulates merge conflict errors and displays them all.
+
+[#144][144] by [@jeffreyolchovy][@jeffreyolchovy].
+
+### Improvements
+
+- `META-INF/mailcap`, `META-INF/mimetypes.default`, and `META-INF/maven/` are discarded by default. [#145][145] by [@catap][@catap]