Updates for Scala 2.13

.travis.yml

@@ -1,14 +1,15 @@
 language: scala
 scala:
-  - 2.12.7
-  - 2.11.11
+  - 2.11.12
+  - 2.12.10
+  - 2.13.0
 jdk:
-  - oraclejdk8
+  - openjdk8
   - openjdk11
 
 matrix:
   exclude:
-    - scala: 2.11.11
+    - scala: 2.11.12
       jdk: openjdk11
 
 script: |

README.md

@@ -2,7 +2,7 @@
 
 [Sangria](http://sangria-graphql.org/) is a scala [GraphQL](http://facebook.github.io/graphql/) library.
 
-[![Build Status](https://travis-ci.org/sangria-graphql/sangria.svg?branch=master)](https://travis-ci.org/sangria-graphql/sangria) [![Coverage Status](http://coveralls.io/repos/sangria-graphql/sangria/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql/sangria?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria_2.11) [![License](http://img.shields.io/:license-Apache%202-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) [![Scaladocs](https://www.javadoc.io/badge/org.sangria-graphql/sangria_2.12.svg?label=docs)](https://www.javadoc.io/doc/org.sangria-graphql/sangria_2.12) [![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-org/sangria.svg?branch=master)](https://travis-ci.org/sangria-graphql-org/sangria) [![Coverage Status](http://coveralls.io/repos/sangria-graphql-org/sangria/badge.svg?branch=master&service=github)](http://coveralls.io/github/sangria-graphql-org/sangria?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.sangria-graphql/sangria_2.11) [![License](http://img.shields.io/:license-Apache%202-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) [![Scaladocs](https://www.javadoc.io/badge/org.sangria-graphql/sangria_2.12.svg?label=docs)](https://www.javadoc.io/doc/org.sangria-graphql/sangria_2.12) [![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:
 

build.sbt

@@ -1,61 +1,62 @@
 name := "sangria"
 organization := "org.sangria-graphql"
-version := "1.4.3-SNAPSHOT"
+mimaPreviousArtifacts := Set("org.sangria-graphql" %% "sangria" % "1.4.2")
 
 description := "Scala GraphQL implementation"
 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.7"
-crossScalaVersions := Seq("2.11.11", "2.12.7")
+scalaVersion := "2.13.0"
+crossScalaVersions := Seq("2.11.12", "2.12.10", scalaVersion.value)
 
 scalacOptions ++= Seq(
   "-deprecation",
   "-feature",
-  "-Xlint:-missing-interpolator,-unused,_")
+  "-Xlint:-missing-interpolator,_")
 
 scalacOptions ++= {
-  if (scalaVersion.value startsWith "2.12")
-    Seq.empty
-  else
+  if (scalaVersion.value startsWith "2.11")
     Seq("-target:jvm-1.7")
+  else
+    Seq.empty
 }
 
 testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oF")
 
 libraryDependencies ++= Seq(
   // AST Parser
-  "org.parboiled" %% "parboiled" % "2.1.4",
+  "org.parboiled" %% "parboiled" % "2.1.8",
 
   // AST Visitor
-  "org.sangria-graphql" %% "macro-visit" % "0.1.1",
+  "org.sangria-graphql" %% "macro-visit" % "0.1.2",
 
   // Marshalling
-  "org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.3",
+  "org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.4",
 
   // Streaming
-  "org.sangria-graphql" %% "sangria-streaming-api" % "1.0.0",
+  "org.sangria-graphql" %% "sangria-streaming-api" % "1.0.1",
 
   // Macros
   "org.scala-lang" % "scala-reflect" % scalaVersion.value,
 
   // Testing
-  "org.scalatest" %% "scalatest" % "3.0.5" % "test",
-  "org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.1" % Test,
-  "org.sangria-graphql" %% "sangria-spray-json" % "1.0.1" % Test,
-  "org.sangria-graphql" %% "sangria-argonaut" % "1.0.0" % Test,
-  "org.sangria-graphql" %% "sangria-ion" % "1.0.0" % Test,
-  "org.sangria-graphql" %% "sangria-monix" % "1.0.0" % Test,
-  "org.sangria-graphql" %% "sangria-rxscala" % "1.0.0" % Test,
-  "eu.timepit" %% "refined" % "0.9.2" % Test,
+  "co.fs2" %% "fs2-core" % "2.0.1" % Test,
+  "org.scalatest" %% "scalatest" % "3.0.8" % Test,
+  "org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.2" % Test,
+  "org.sangria-graphql" %% "sangria-spray-json" % "1.0.2" % Test,
+  "org.sangria-graphql" %% "sangria-argonaut" % "1.0.1" % Test,
+  "org.sangria-graphql" %% "sangria-ion" % "2.0.0" % Test,
+  "org.sangria-graphql" %% "sangria-monix" % "2.0.0" % Test,
+  "eu.timepit" %% "refined" % "0.9.10" % Test,
 
   // CATs
-  "net.jcazevedo" %% "moultingyaml" % "0.4.0" % Test,
+  "net.jcazevedo" %% "moultingyaml" % "0.4.1" % Test,
   "io.github.classgraph" % "classgraph" % "4.0.6" % Test
 )
 
 // Publishing
-
+releaseCrossBuild := true
+releasePublishArtifactsAction := PgpKeys.publishSigned.value
 publishMavenStyle := true
 publishArtifact in Test := false
 pomIncludeRepository := (_ ⇒ false)
@@ -69,8 +70,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/sangria.git"),
-  connection = "scm:git:git@github.com:sangria-graphql/sangria.git"
+  browseUrl = url("https://github.com/sangria-graphql-org/sangria.git"),
+  connection = "scm:git:git@github.com:sangria-graphql-org/sangria.git"
 ))
 
 // nice *magenta* prompt!

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.3.3

project/plugins.sbt

@@ -0,0 +1,10 @@
+resolvers += Resolver.url(
+  "typesafe sbt-plugins",
+  url("https://dl.bintray.com/typesafe/sbt-plugins")
+)(Resolver.ivyStylePatterns)
+
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")