Merge remote-tracking branch 'origin/master' into HEAD

# Conflicts:
#	.travis.yml
#	CHANGELOG
#	build.sbt

3 files changed, 5 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index eb8d2d8..8fe5502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 # sudo required for installing dependencies of Scala Native
 sudo: required
+dist: trusty
+
 language: scala
 
 jdk:
@@ -20,8 +22,3 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
-
-#notifications:
-#  email:
-#    - johannes@spray.io
-#    - mathias@spray.io
diff --git a/CHANGELOG b/CHANGELOG
index 87237e7..5c3dc70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,7 @@ implement reflective product formats, meaning that there are no more
 `jsonFormat(<constructor>, <field_names>*)` is still available and may
 be used as a workaround.
 
-Version 1.3.5 (2017-10-24)
+Version 1.3.5 (2018-11-08)
 --------------------------
 
 Security fix for several Denial Of Service vulnerabilities:
diff --git a/build.sbt b/build.sbt
index 6dba46e..0bec659 100644
--- a/build.sbt
+++ b/build.sbt
@@ -52,8 +52,8 @@ lazy val sprayJson =
       OsgiKeys.importPackage ++= Seq("""spray.json;version="${Bundle-Version}"""", "*"),
       OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
       mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, 13)) => Set.empty
-        case _ => Set("io.spray" %% "spray-json" % "1.3.5")
+        case Some((2, 13)) => Set("io.spray" %% "spray-json" % "1.3.5")
+        case _ => Set("1.3.2", "1.3.3", "1.3.4", "1.3.5").map { v => "io.spray" %% "spray-json" % v }
       }),
       mimaBinaryIssueFilters := Seq(
         ProblemFilters.exclude[ReversedMissingMethodProblem]("spray.json.PrettyPrinter.organiseMembers")