diff options
| author | Johannes Rudolph <johannes.rudolph@gmail.com> | 2018-08-07 11:37:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 11:37:22 +0200 |
| commit | 3e4d7da9b35abde4e110d0c61ea251da2697667c (patch) | |
| tree | c53214f93a11423d2f9a6e24afa8e38614b76a5c | |
| parent | 7b0d5d802838aa5e0676cf587344287ed247b387 (diff) | |
| parent | d2f0f997df4487b556ef39b447cac36978bf9821 (diff) | |
| download | spray-json-3e4d7da9b35abde4e110d0c61ea251da2697667c.tar.gz spray-json-3e4d7da9b35abde4e110d0c61ea251da2697667c.tar.bz2 spray-json-3e4d7da9b35abde4e110d0c61ea251da2697667c.zip | |
Merge pull request #269 from jrudolph/update-dependencies
Update dependencies
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | build.sbt | 26 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 6 |
4 files changed, 8 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 0e72ce9..f736360 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ scala: - 2.10.7 - 2.11.12 - 2.12.6 - - 2.13.0-M3 script: - sbt "++ ${TRAVIS_SCALA_VERSION}!" test mimaReportBinaryIssues jdk: @@ -16,20 +16,10 @@ startYear := Some(2011) licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) -scalaVersion := "2.11.12" - scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8") resolvers += Opts.resolver.sonatypeReleases -libraryDependencies ++= - (CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, n)) if n >= 13 => - Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2") - case _ => - Nil - }) - libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 10)) => Seq( "org.specs2" %% "specs2-core" % "3.8.9" % "test", @@ -37,9 +27,9 @@ 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.2" % "test", - "org.specs2" %% "specs2-scalacheck" % "4.0.2" % "test", - "org.scalacheck" %% "scalacheck" % "1.13.5" % "test" + "org.specs2" %% "specs2-core" % "4.3.2" % "test", + "org.specs2" %% "specs2-scalacheck" % "4.3.2" % "test", + "org.scalacheck" %% "scalacheck" % "1.14.0" % "test" ) case _ => Nil }) @@ -77,15 +67,7 @@ mimaBinaryIssueFilters := Seq( // publishing /////////////// -crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M3") - -scalaBinaryVersion := { - val sV = scalaVersion.value - if (CrossVersion.isScalaApiCompatible(sV)) - CrossVersion.binaryScalaVersion(sV) - else - sV -} +crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12") publishMavenStyle := true diff --git a/project/build.properties b/project/build.properties index d6e3507..f59579f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index b687503..ed1a250 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") |