Release v0.1.1

.travis.yml

@@ -1,10 +1,27 @@
- language: scala
- scala:
-   - "2.11.8"
- jdk:
-   - oraclejdk7
- script: "sbt clean coverage test"
- after_success: "sbt coveralls"
- env:
-   global:
-     secure: "ko5RdiI9X097LZxOOFjWimFcV04D/CISaVpEKMzWkvrBQI+DTmVTyzudZD+azLnCXFVxgNbQ71Fuc0JaB1pgVRcfAuYC5ySlUtk1h4zpscZRAldPvtFRK+bM+nVF+dbhhcRQgZ3o1PLpAdxX+g4g/VAy3Oj50eDHmNERRMwtTHWdGUZAwPa3Bur/LVGWxhgmQbsu8R+PbN4zniTxO24a0jQKbPQ5ilT8YKTLEqLJrhKsMX1fhZxVXwMJjHmzvdELvwWiqPO8nvUgz7egrjwtaWF7OkRmT9/MyIeLJELhr+reuh/gj46bQCbHEEov0P0kD1nSPMfhW0tQKgBm9s/9iwp+XcGfgZlB2ZjRPyLCyLun/IC8V5qrK4LeWCJYiCUJhdMK8TcDMvknz7JfBGjjE1Bww57i8LNN5xzyUZhKtUBjjEoLZwBewfIEmSuVGlwrrRPgJks5hiThAt0dzV1RPHr46nJtTxowLWDjA9gVQLDu5tv4+yFZVrowWhfuV5HfOg4yRf7ebFlVlKsHrKxOXQjykCoZJuPLAhAzWxzKSd/MMJ3RGw6ja8arG9w91Wpd4L7yLELrmBuXeKwUIGL64uDBsZ3dx81B2Oj8X2kJBc9ZF25xBhFV0mWHaqRw6mqfXowCaLSrb89+1BGauBmbNblkeGEKm/5NFHmcw5QIUL8="
+language: scala
+scala:
+  - 2.12.0
+  - 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
+
+after_success: |
+  if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then
+    sbt ++$TRAVIS_SCALA_VERSION coveralls
+  fi
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt/boot/
+
+env:
+  global:
+    secure: "ko5RdiI9X097LZxOOFjWimFcV04D/CISaVpEKMzWkvrBQI+DTmVTyzudZD+azLnCXFVxgNbQ71Fuc0JaB1pgVRcfAuYC5ySlUtk1h4zpscZRAldPvtFRK+bM+nVF+dbhhcRQgZ3o1PLpAdxX+g4g/VAy3Oj50eDHmNERRMwtTHWdGUZAwPa3Bur/LVGWxhgmQbsu8R+PbN4zniTxO24a0jQKbPQ5ilT8YKTLEqLJrhKsMX1fhZxVXwMJjHmzvdELvwWiqPO8nvUgz7egrjwtaWF7OkRmT9/MyIeLJELhr+reuh/gj46bQCbHEEov0P0kD1nSPMfhW0tQKgBm9s/9iwp+XcGfgZlB2ZjRPyLCyLun/IC8V5qrK4LeWCJYiCUJhdMK8TcDMvknz7JfBGjjE1Bww57i8LNN5xzyUZhKtUBjjEoLZwBewfIEmSuVGlwrrRPgJks5hiThAt0dzV1RPHr46nJtTxowLWDjA9gVQLDu5tv4+yFZVrowWhfuV5HfOg4yRf7ebFlVlKsHrKxOXQjykCoZJuPLAhAzWxzKSd/MMJ3RGw6ja8arG9w91Wpd4L7yLELrmBuXeKwUIGL64uDBsZ3dx81B2Oj8X2kJBc9ZF25xBhFV0mWHaqRw6mqfXowCaLSrb89+1BGauBmbNblkeGEKm/5NFHmcw5QIUL8="

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.1 (2016-11-19)
+
+* Cross-compile for scala 2.11 and 2.12
+* Updated dependencies
+
 ## v0.1.0 (2016-10-08)
 
 * Initial release

README.md

@@ -5,7 +5,7 @@
 SBT Configuration:
 
 ```scala
-libraryDependencies += "org.sangria-graphql" %% "sangria-rxscala" % "0.1.0"
+libraryDependencies += "org.sangria-graphql" %% "sangria-rxscala" % "0.1.1"
 ```
 
 ## License

build.sbt

@@ -1,18 +1,27 @@
 name := "sangria-rxscala"
 organization := "org.sangria-graphql"
-version := "0.1.0-SNAPSHOT"
+version := "0.1.1"
 
 description := "Sangria RxScala 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.11.8"
+scalaVersion := "2.12.0"
+crossScalaVersions := Seq("2.11.8", "2.12.0")
+
 scalacOptions ++= Seq("-deprecation", "-feature")
 
+scalacOptions ++= {
+  if (scalaVersion.value startsWith "2.12")
+    Seq.empty
+  else
+    Seq("-target:jvm-1.7")
+}
+
 libraryDependencies ++= Seq(
-  "org.sangria-graphql" %% "sangria-streaming-api" % "0.1.0",
-  "io.reactivex" %% "rxscala" % "0.26.2",
-  "org.scalatest" %% "scalatest" % "2.2.6" % "test"
+  "org.sangria-graphql" %% "sangria-streaming-api" % "0.1.1",
+  "io.reactivex" %% "rxscala" % "0.26.4",
+  "org.scalatest" %% "scalatest" % "3.0.0" % "test"
 )
 
 git.remoteRepo := "[email protected]:sangria-graphql/sangria-rxscala.git"

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.13

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.0.4")
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")