Skip to content

Commit

Permalink
Release v1.0.0-RC3
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegIlyenko committed Nov 5, 2016
1 parent a629458 commit ed14687
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 23 deletions.
37 changes: 27 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
language: scala
scala:
- "2.11.7"
jdk:
- oraclejdk7
before_script:
- mkdir -p $HOME/.sbt/launchers/0.13.9/
- curl -L -o $HOME/.sbt/launchers/0.13.9/sbt-launch.jar http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.9/sbt-launch.jar
script: "sbt clean coverage test"
after_success: "sbt coveralls"
sudo: false
language: scala
scala:
- 2.11.8
- 2.12.0
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="
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v1.0.0-RC3 (2016-11-05)

* Cross compile to scala 2.12 and scala 2.11
* Updated sangria to v1.0.0-RC3

## v1.0.0-RC2 (2016-10-10)

* Updated sangria to v1.0.0-RC2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
SBT Configuration:

```scala
libraryDependencies += "org.sangria-graphql" %% "sangria-relay" % "1.0.0-RC2"
libraryDependencies += "org.sangria-graphql" %% "sangria-relay" % "1.0.0-RC3"
```

More info and the documentation can be found in the project home page:
Expand Down
23 changes: 14 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
name := "sangria-relay"
organization := "org.sangria-graphql"
version := "1.0.0-RC3-SNAPSHOT"
version := "1.0.0-RC3"

description := "Sangria Relay Support"
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"
scalacOptions ++= Seq(
"-target:jvm-1.7",
"-deprecation",
"-feature")
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" % "1.0.0-RC2",
"org.scalatest" %% "scalatest" % "2.2.6" % "test"
)
"org.sangria-graphql" %% "sangria" % "1.0.0-RC3",
"org.scalatest" %% "scalatest" % "3.0.0" % "test")

git.remoteRepo := "git@github.com:sangria-graphql/sangria-relay.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.11
sbt.version=0.13.13
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

0 comments on commit ed14687

Please sign in to comment.