summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad `ktoso` Malawski <konrad.malawski@project13.pl>2018-02-15 07:27:22 +0100
committerGitHub <noreply@github.com>2018-02-15 07:27:22 +0100
commitaf984af38c9a0a76d3fdbfa47dd115e2a08dae1b (patch)
tree89ee18bf20e4a8abb3473ad30468f595e7b97889
parentba2448a32acc7ced5ac86001577c834f93e38afb (diff)
parent7d54cd8e8a3ae256b15463f877eb9797ca435f96 (diff)
downloadspray-json-af984af38c9a0a76d3fdbfa47dd115e2a08dae1b.tar.gz
spray-json-af984af38c9a0a76d3fdbfa47dd115e2a08dae1b.tar.bz2
spray-json-af984af38c9a0a76d3fdbfa47dd115e2a08dae1b.zip
Merge pull request #248 from xuwei-k/Scala-2.13.0-M3
Scala 2.13.0-M3
-rw-r--r--.travis.yml2
-rw-r--r--build.sbt6
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 81cf13f..7a058c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ scala:
- 2.10.6
- 2.11.11
- 2.12.3
- - 2.13.0-M2
+ - 2.13.0-M3
script:
- sbt ++$TRAVIS_SCALA_VERSION test mimaReportBinaryIssues
jdk:
diff --git a/build.sbt b/build.sbt
index 438928e..7d6b9ab 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,8 +37,8 @@ libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
)
case Some((2, n)) if n >= 11 => Seq(
- "org.specs2" %% "specs2-core" % "4.0.1" % "test",
- "org.specs2" %% "specs2-scalacheck" % "4.0.1" % "test",
+ "org.specs2" %% "specs2-core" % "4.0.2" % "test",
+ "org.specs2" %% "specs2-scalacheck" % "4.0.2" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test"
)
case _ => Nil
@@ -74,7 +74,7 @@ mimaBinaryIssueFilters := Seq(
// publishing
///////////////
-crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3", "2.13.0-M2")
+crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3", "2.13.0-M3")
scalaBinaryVersion := {
val sV = scalaVersion.value