Skip to content

Commit

Permalink
Drop Scala 2.11 support, and Update Scala versions
Browse files Browse the repository at this point in the history
  • Loading branch information
sh0hei committed Feb 9, 2021
1 parent 459d171 commit 53b90de
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,4 +1,5 @@
# folders
.bsp
.idea
target
lib
Expand Down
7 changes: 3 additions & 4 deletions .travis.yml
@@ -1,10 +1,9 @@
language: scala
scala:
- 2.13.0
- 2.12.10
- 2.11.12
- 2.13.4
- 2.12.12
jdk:
- openjdk8
- openjdk11

script: |
sbt ++$TRAVIS_SCALA_VERSION clean coverage test
Expand Down
8 changes: 6 additions & 2 deletions README.md
@@ -1,11 +1,15 @@
[Sangria](http://sangria-graphql.org/) [monix](https://monix.io) integration.

[![Build Status](https://travis-ci.org/sangria-graphql/sangria-monix.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria-monix) [![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria-monix/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria-monix?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-monix_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-monix_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)
[![Build Status](https://travis-ci.org/sangria-graphql/sangria-monix.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria-monix)
[![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria-monix/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria-monix?branch=master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-monix_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-monix_2.12)
[![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)

SBT Configuration:

```scala
libraryDependencies += "org.sangria-graphql" %% "sangria-monix" % "1.0.0"
libraryDependencies += "org.sangria-graphql" %% "sangria-monix" % "<latest version>"
```

## License
Expand Down
18 changes: 4 additions & 14 deletions build.sbt
Expand Up @@ -6,23 +6,13 @@ 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.13.0"
crossScalaVersions := Seq("2.11.12", "2.12.10", scalaVersion.value)
scalaVersion := "2.13.4"
crossScalaVersions := Seq("2.12.12", scalaVersion.value)

scalacOptions ++= Seq("-deprecation", "-feature")

scalacOptions ++= {
if (scalaVersion.value startsWith "2.11")
Seq("-target:jvm-1.7")
else
Seq("-target:jvm-1.8")
}
javacOptions ++= {
if (scalaVersion.value startsWith "2.11")
Seq("-source", "7", "-target", "7")
else
Seq("-source", "8", "-target", "8")
}
scalacOptions += "-target:jvm-1.8"
javacOptions ++= Seq("-source", "8", "-target", "8")

libraryDependencies ++= Seq(
"org.sangria-graphql" %% "sangria-streaming-api" % "1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Expand Up @@ -10,5 +10,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

0 comments on commit 53b90de

Please sign in to comment.