Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Scala 2.11 and Update Scala versions #27

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# folders
.bsp
.idea
target
lib
Expand Down
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: scala
scala:
- 2.11.12
- 2.12.10
- 2.13.0
- 2.12.12
- 2.13.4
jdk:
- openjdk8
- openjdk11

script: |
sbt ++$TRAVIS_SCALA_VERSION clean coverage test
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[Sangria](http://sangria-graphql.org/) [argonaut](http://argonaut.io) marshalling.

[![Build Status](https://travis-ci.org/sangria-graphql/sangria-argonaut.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria-argonaut) [![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria-argonaut/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria-argonaut?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-argonaut_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-argonaut_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-argonaut.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria-argonaut)
[![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria-argonaut/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria-argonaut?branch=master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-argonaut_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria-argonaut_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-argonaut" % "1.0.0"
libraryDependencies += "org.sangria-graphql" %% "sangria-argonaut" % "<latest version>"
```

## License
Expand Down
19 changes: 5 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,14 @@ description := "Sangria argonaut 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.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-marshalling-api" % "1.0.5",
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=1.3.10
sbt.version=1.4.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.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")