Skip to content

Build for scala 2.13. Drop support for scala 2.11 #11

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.

Sign up for GitHub

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

Open
hughsimpson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Build for scala 2.13. Drop support for scala 2.11 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name := projectName

organization := "com.github.jarlakxen"

crossScalaVersions := Seq("2.12.7", "2.11.12")
crossScalaVersions := Seq("2.13.1", "2.12.9")

scalaVersion := crossScalaVersions.value.head

Expand Down Expand Up @@ -41,14 +41,14 @@ scalacOptions ++= Seq(
resolvers ++= Seq(Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots"))

// ··· Project Dependencies ···
val sangriaV = "1.4.+"
val sangriaCirceV = "1.2.1"
val akkaHttpV = "10.1.+"
val akkaHttpCircleV = "1.22.+"
val circeV = "0.10.+"
val sangriaV = "2.0.0-M1"
val sangriaCirceV = "1.3.0"
val akkaHttpV = "10.1.10"
val akkaHttpCircleV = "1.28.+"
val circeV = "0.12.1"
val slf4JV = "1.7.25"
val logbackV = "1.2.3"
val scalatestV = "3.0.5"
val scalatestV = "3.0.8"

libraryDependencies ++= Seq(
// --- GraphQL --
Expand All @@ -64,6 +64,7 @@ libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % slf4JV,
"ch.qos.logback" % "logback-classic" % logbackV % Test,
// --- Testing ---
"com.typesafe.akka" %% "akka-testkit" % "2.5.25" % Test,
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % Test,
"org.scalatest" %% "scalatest" % scalatestV % Test
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.6
sbt.version=1.3.4
2 changes: 2 additions & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
// addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.7")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")

addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
2 changes: 1 addition & 1 deletion src/main/scala/com/github/jarlakxen/drunk/GraphQLClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import backend.{AkkaBackend, AkkaConnectionBackend, AkkaHttpBackend}
import extensions.{GraphQLExtensions, NoExtensions}
import io.circe._
import io.circe.parser._
import sangria._
import sangria.{ ast => _, _ }
import sangria.ast.Document
import sangria.introspection._
import sangria.marshalling.circe._
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "2.5.0"
version in ThisBuild := "2.6.0"