Skip to content

Commit

Permalink
Merge branch 'master' into update/scalatest-3.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
yanns committed Sep 9, 2020
2 parents cdbd5cd + 83030c3 commit bc5a3cd
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 6 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/release-drafter.yml
@@ -0,0 +1,16 @@
name: Release Drafter

on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .java-version
@@ -0,0 +1 @@
1.8
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,8 +2,8 @@

**sangria-relay** is a library to help construct a sangria server supporting react-relay. [Sangria](http://sangria-graphql.org/) is a scala [GraphQL](http://facebook.github.io/graphql/) library.

[![Build Status](https://travis-ci.org/sangria-graphql-org/sangria-relay.svg?branch=master)](https://travis-ci.org/sangria-graphql-org/sangria-relay)
[![Coverage Status](http://coveralls.io/repos/sangria-graphql-org/sangria-relay/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql-org/sangria-relay?branch=master)
[![Build Status](https://travis-ci.org/sangria-graphql/sangria-relay.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria-relay)
[![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria-relay/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria-relay?branch=master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-relay_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-relay_2.11)
[![License](http://img.shields.io/:license-Apache%202-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
[![Join the chat at https://gitter.im/sangria-graphql/sangria](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sangria-graphql/sangria?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Expand Up @@ -19,7 +19,7 @@ scalacOptions ++= {
}

libraryDependencies ++= Seq(
"org.sangria-graphql" %% "sangria" % "2.0.0-RC1",
"org.sangria-graphql" %% "sangria" % "2.0.0",
"org.scalatest" %% "scalatest" % "3.1.4" % Test)

// Publishing
Expand All @@ -41,8 +41,8 @@ startYear := Some(2015)
organizationHomepage := Some(url("https://github.com/sangria-graphql"))
developers := Developer("OlegIlyenko", "Oleg Ilyenko", "", url("https://github.com/OlegIlyenko")) :: Nil
scmInfo := Some(ScmInfo(
browseUrl = url("https://github.com/sangria-graphql-org/sangria-relay.git"),
connection = "scm:git:git@github.com:sangria-graphql-org/sangria-relay.git"
browseUrl = url("https://github.com/sangria-graphql/sangria-relay.git"),
connection = "scm:git:git@github.com:sangria-graphql/sangria-relay.git"
))

// nice *magenta* prompt!
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
@@ -1 +1 @@
version in ThisBuild := "2.0.0-SNAPSHOT"
version in ThisBuild := "2.0.1-SNAPSHOT"

0 comments on commit bc5a3cd

Please sign in to comment.