Update Scala 2.12 and sbt

circe · May 11, 2018 · 4874dfe · 4874dfe
1 parent 83d1cb7
commit 4874dfe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ dist: trusty
 
 scala:
   - 2.11.12
-  - 2.12.5
+  - 2.12.6
 
 jdk:
   - oraclejdk8

diff --git a/build.sbt b/build.sbt
@@ -58,8 +58,7 @@ lazy val benchmark = project.in(file("."))
       "io.circe" %% "circe-jackson29" % "0.9.0",
       "io.spray" %% "spray-json" % "1.3.4",
       "org.json4s" %% "json4s-jackson" % "3.6.0-M3",
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
-      compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
+      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
     ),
     libraryDependencies ++= circeDependencies
   )

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.3
+sbt.version=1.1.5
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.1")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")