Skip to content

Commit

Permalink
Release v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegIlyenko committed Jan 16, 2017
1 parent 0ae2042 commit f920661
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 19 deletions.
14 changes: 4 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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/
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v1.0.0 (2017-01-16)

* 1.0 Release

## v0.3.2 (2016-11-03)

* Cross-compile for scala 2.11 and 2.12
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
SBT Configuration:

```scala
libraryDependencies += "org.sangria-graphql" %% "sangria-spray-json" % "0.3.2"
libraryDependencies += "org.sangria-graphql" %% "sangria-spray-json" % "1.0.0"
```

## License
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name := "sangria-spray-json"
organization := "org.sangria-graphql"
version := "0.3.3-SNAPSHOT"
version := "1.0.0"

description := "Sangria spray-json 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.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")

Expand All @@ -19,11 +19,11 @@ scalacOptions ++= {
}

libraryDependencies ++= Seq(
"org.sangria-graphql" %% "sangria-marshalling-api" % "0.2.2",
"io.spray" %% "spray-json" % "1.3.2",
"org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.0",
"io.spray" %% "spray-json" % "1.3.3",

"org.sangria-graphql" %% "sangria-marshalling-testkit" % "0.2.3" % "test",
"org.scalatest" %% "scalatest" % "3.0.0" % "test"
"org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.0" % "test",
"org.scalatest" %% "scalatest" % "3.0.1" % "test"
)

git.remoteRepo := "git@github.com:sangria-graphql/sangria-spray-json.git"
Expand Down
2 changes: 1 addition & 1 deletion 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.4.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")

0 comments on commit f920661

Please sign in to comment.