summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippus Baalman <philippus@gmail.com>2019-07-08 09:50:49 +0200
committerArnout Engelen <arnout@bzzt.net>2019-07-08 09:50:49 +0200
commitd2da814e393d147c7f8a5a0856e65f9ac9550784 (patch)
tree54acc397f35e96351aa2d42a8aa4550b4645612c
parentda8ed26cfed5e958eeb29a3444ff882a46090459 (diff)
downloadspray-json-d2da814e393d147c7f8a5a0856e65f9ac9550784.tar.gz
spray-json-d2da814e393d147c7f8a5a0856e65f9ac9550784.tar.bz2
spray-json-d2da814e393d147c7f8a5a0856e65f9ac9550784.zip
Update scala 2.13.0-RC3 to 2.13.0 (#299)
* Update scala 2.13.0-RC3 to 2.13.0 * Update mimaPreviousArtifacts * Set dist to trusty
-rw-r--r--.travis.yml3
-rw-r--r--build.sbt7
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index d501ae9..2e9e5c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
+dist: trusty
language: scala
scala:
- 2.10.7
- 2.11.12
- 2.12.8
- - 2.13.0-RC3
+ - 2.13.0
jdk:
- oraclejdk8
diff --git a/build.sbt b/build.sbt
index c6ecc15..cf88060 100644
--- a/build.sbt
+++ b/build.sbt
@@ -52,9 +52,10 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
// Migration Manager
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
- case Some((2, 13)) => Set.empty
+ case Some((2, 13)) =>
+ Set("io.spray" %% "spray-json" % "1.3.5")
case _ =>
- Set("1.3.2", "1.3.3", "1.3.4").map { v =>
+ Set("1.3.2", "1.3.3", "1.3.4", "1.3.5").map { v =>
"io.spray" %% "spray-json" % v
}
})
@@ -67,7 +68,7 @@ mimaBinaryIssueFilters := Seq(
// publishing
///////////////
-crossScalaVersions := Seq("2.12.8", "2.10.7", "2.11.12", "2.13.0-RC3")
+crossScalaVersions := Seq("2.12.8", "2.10.7", "2.11.12", "2.13.0")
publishMavenStyle := true