From 69ae4a0f60197c2e17756c2a51a2f5b75156b854 Mon Sep 17 00:00:00 2001 From: frunza Date: Sat, 3 Feb 2018 13:48:03 +0200 Subject: [PATCH 1/2] add croess scala version 2.12.4 --- build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 723a46f..80684a2 100644 --- a/build.sbt +++ b/build.sbt @@ -4,9 +4,9 @@ name := "json-annotation" version := "0.2" -scalaVersion := "2.11.1" +scalaVersion := "2.12.4" -crossScalaVersions := Seq("2.10.2", "2.10.3", "2.10.4", "2.11.0", "2.11.1") +crossScalaVersions := Seq("2.10.2", "2.10.3", "2.10.4", "2.11.0", "2.11.1", "2.12.4") resolvers ++= Seq( Resolver.sonatypeRepo("releases"), @@ -21,15 +21,15 @@ libraryDependencies ++= ( ) libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-json" % "2.3.1" % Test, - "org.specs2" %% "specs2" % "2.3.13" % Test + "com.typesafe.play" %% "play-json" % "2.6.2" % Test, + "org.specs2" %% "specs2-core" % "3.9.4" % Test ) unmanagedSourceDirectories in Compile <+= (sourceDirectory in Compile, scalaBinaryVersion){ (sourceDir, version) => sourceDir / (if (version.startsWith("2.10")) "scala_2.10" else "scala_2.11") } -addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full) +addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation") From 441eb139ded597274ed538d829e304952fcea2a0 Mon Sep 17 00:00:00 2001 From: frunza Date: Sat, 3 Feb 2018 13:54:10 +0200 Subject: [PATCH 2/2] bump version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 80684a2..1aa3145 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "com.kifi" name := "json-annotation" -version := "0.2" +version := "0.3.1" scalaVersion := "2.12.4"