diff --git a/.travis.yml b/.travis.yml index 965f2b2..bb33cd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: scala scala: - - 2.12.1 - - 2.11.8 + - 2.12.2 + - 2.11.11 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index 59b27a2..afc83a0 100644 --- a/build.sbt +++ b/build.sbt @@ -6,8 +6,8 @@ description := "Sangria circe marshalling" homepage := Some(url("http://sangria-graphql.org")) licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) -scalaVersion := "2.12.1" -crossScalaVersions := Seq("2.11.8", "2.12.1") +scalaVersion := "2.12.2" +crossScalaVersions := Seq("2.11.11", "2.12.2") scalacOptions ++= Seq("-deprecation", "-feature") @@ -18,7 +18,7 @@ scalacOptions ++= { Seq("-target:jvm-1.7") } -val circeVersion = "0.7.0" +val circeVersion = "0.8.0" libraryDependencies ++= Seq( "org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.0", @@ -27,7 +27,7 @@ libraryDependencies ++= Seq( "io.circe" %% "circe-generic" % circeVersion % Test, "org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.0" % Test, - "org.scalatest" %% "scalatest" % "3.0.1" % Test + "org.scalatest" %% "scalatest" % "3.0.3" % Test ) git.remoteRepo := "git@github.com:sangria-graphql/sangria-circe.git" diff --git a/project/build.properties b/project/build.properties index 27e88aa..64317fd 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=0.13.15