diff --git a/.travis.yml b/.travis.yml index 1c6c490..965f2b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,17 @@ language: scala scala: - - 2.12.0 + - 2.12.1 - 2.11.8 jdk: - oraclejdk8 script: | - if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then - sbt ++$TRAVIS_SCALA_VERSION clean coverage test - else - sbt ++$TRAVIS_SCALA_VERSION clean test - fi + sbt ++$TRAVIS_SCALA_VERSION clean coverage test after_success: | - if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then - sbt ++$TRAVIS_SCALA_VERSION coverageReport coveralls - fi + sbt ++$TRAVIS_SCALA_VERSION coverageReport coveralls cache: directories: - $HOME/.ivy2/cache - - $HOME/.sbt/boot/ + - $HOME/.sbt/boot/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index eff36b2..3399d2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v1.0.0 (2017-01-16) + +* 1.0 Release +* Updated `monix` to v2.1.2 + ## v0.1.1 (2016-11-03) * Cross-compile for scala 2.11 and 2.12 diff --git a/README.md b/README.md index ed303d1..3a9b4b2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ SBT Configuration: ```scala -libraryDependencies += "org.sangria-graphql" %% "sangria-monix" % "0.1.1" +libraryDependencies += "org.sangria-graphql" %% "sangria-monix" % "1.0.0" ``` ## License diff --git a/build.sbt b/build.sbt index 34a1652..9757394 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,13 @@ name := "sangria-monix" organization := "org.sangria-graphql" -version := "0.1.2-SNAPSHOT" +version := "1.0.0" description := "Sangria monix integration" 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.0" -crossScalaVersions := Seq("2.11.8", "2.12.0") +scalaVersion := "2.12.1" +crossScalaVersions := Seq("2.11.8", "2.12.1") scalacOptions ++= Seq("-deprecation", "-feature") @@ -19,10 +19,10 @@ scalacOptions ++= { } libraryDependencies ++= Seq( - "org.sangria-graphql" %% "sangria-streaming-api" % "0.1.1", - "io.monix" %% "monix-execution" % "2.0.6", - "io.monix" %% "monix-reactive" % "2.0.6", - "org.scalatest" %% "scalatest" % "3.0.0" % "test" + "org.sangria-graphql" %% "sangria-streaming-api" % "1.0.0", + "io.monix" %% "monix-execution" % "2.1.2", + "io.monix" %% "monix-reactive" % "2.1.2", + "org.scalatest" %% "scalatest" % "3.0.1" % "test" ) git.remoteRepo := "git@github.com:sangria-graphql/sangria-monix.git" diff --git a/project/plugins.sbt b/project/plugins.sbt index d1372fd..692b056 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.4") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")