summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2018-07-10 17:09:37 +0200
committerGitHub <noreply@github.com>2018-07-10 17:09:37 +0200
commit28e03bf7b6f101324aa76cbe997227165d912655 (patch)
treeaf8b5a5feb2b75e05b6ab7234171424b08f5ceb8
parent6ed26139d936a88545fe8c118b0b1c9d21dc6087 (diff)
parent05191401c6031bc11e0c1d38948f1b25a8a0720c (diff)
downloadspray-json-28e03bf7b6f101324aa76cbe997227165d912655.tar.gz
spray-json-28e03bf7b6f101324aa76cbe997227165d912655.tar.bz2
spray-json-28e03bf7b6f101324aa76cbe997227165d912655.zip
Merge pull request #258 from xuwei-k/Scala-2.12.6
Scala 2.12.6
-rw-r--r--.travis.yml2
-rw-r--r--build.sbt2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index cfab53f..0e72ce9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
scala:
- 2.10.7
- 2.11.12
- - 2.12.4
+ - 2.12.6
- 2.13.0-M3
script:
- sbt "++ ${TRAVIS_SCALA_VERSION}!" test mimaReportBinaryIssues
diff --git a/build.sbt b/build.sbt
index 298ddeb..efd7fa4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -74,7 +74,7 @@ mimaBinaryIssueFilters := Seq(
// publishing
///////////////
-crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.4", "2.13.0-M3")
+crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M3")
scalaBinaryVersion := {
val sV = scalaVersion.value