Skip to content

Commit

Permalink
Merge pull request #6 from agourlay/update-dependencies
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
OlegIlyenko authored May 13, 2017
2 parents 322b367 + 3e66843 commit 00ee8f3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala
scala:
- 2.12.1
- 2.11.8
- 2.12.2
- 2.11.11
jdk:
- oraclejdk8

Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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",
Expand All @@ -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 := "[email protected]:sangria-graphql/sangria-circe.git"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15

0 comments on commit 00ee8f3

Please sign in to comment.