Skip to content
This repository has been archived by the owner on Oct 26, 2020. It is now read-only.

Updates for Scala 2.13 #1

Merged
merged 26 commits into from
Oct 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9658565
adapt build.sbt and fix compilation errors
jtjeferreira Jul 17, 2019
9f5f316
remove unicode arrows
jtjeferreira Jul 17, 2019
e0b20ff
Update build for 2.13.0
travisbrown Aug 6, 2019
14690b2
Remove Monix and RxScala-based streaming tests for now
travisbrown Aug 6, 2019
f59ff56
Disambiguate for 2.13
travisbrown Aug 6, 2019
7b4f816
Un-overload implicit conversion (see SI-11662)
travisbrown Aug 6, 2019
100b529
Replace Monix with fs2 in BatchExecutor tests
travisbrown Aug 6, 2019
17b69f6
Replace Monix's AtomicInt with AtomicInteger
travisbrown Aug 6, 2019
cf5dc6b
Use unordered comparison for ProjectedNames in tests
travisbrown Aug 6, 2019
53a5e8d
Fix tests for Parboiled2 updates
travisbrown Aug 6, 2019
8e06500
Fix some tests that depended on map traversal order
travisbrown Aug 6, 2019
296e2b7
Update fs2 dependency for tests
travisbrown Sep 16, 2019
5ffabea
Revert "Remove Monix and RxScala-based streaming tests for now"
travisbrown Sep 16, 2019
06ba4ed
Reinstate Monix streaming tests
travisbrown Sep 16, 2019
5232dfb
Update snapshot versions
travisbrown Sep 16, 2019
e269710
Add MiMa
travisbrown Sep 16, 2019
1cfc641
Update version to reflect bincompat status
travisbrown Sep 16, 2019
c25d6bd
Update Scala versions
travisbrown Sep 16, 2019
1f4980e
Update to Sangria module releases
travisbrown Oct 25, 2019
5d5828b
Update sbt and plugins
travisbrown Oct 25, 2019
8ff6ea1
Change badge links to point to temporary GitHub org
travisbrown Oct 25, 2019
d7af403
Change SCM links in POM
travisbrown Oct 25, 2019
c0ca0fa
Add sbt-release
travisbrown Oct 25, 2019
165dcfb
Update fs2 test dependency
travisbrown Oct 25, 2019
ede9193
Update Refined test dependency
travisbrown Oct 25, 2019
123c986
Use new test scope format for consistency
travisbrown Oct 25, 2019
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
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
47 changes: 24 additions & 23 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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!
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.2.3
sbt.version=1.3.3
2 changes: 0 additions & 2 deletions project/coverage.sbt

This file was deleted.

10 changes: 10 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Loading