Merge pull request sangria-graphql#383 from sangria-graphql/scala_3

Cross-compile to scala 3

Author: yanns

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.20, 2.13.16]
+        scala: [2.12.20, 2.13.16, 3.3.4]
         java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.16]
+        scala: [3.3.4]
         java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -108,6 +108,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.3.4)
+        uses: actions/download-artifact@v4
+        with:
+          name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}
+
+      - name: Inflate target directories (3.3.4)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

.scalafmt.conf

@@ -2,6 +2,12 @@ version = 3.9.4
 
 runner.dialect = scala213
 
+fileOverride {
+  "glob:**/src/main/scala-3/**" {
+    runner.dialect = scala3
+  }
+}
+
 maxColumn = 100
 
 // Vertical alignment is pretty, but leads to bigger diffs

build.sbt

@@ -16,8 +16,10 @@ inThisBuild(
   )
 )
 
+val isScala3 = Def.setting(scalaBinaryVersion.value == "3")
+
 // Build
-ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.16")
+ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.4")
 ThisBuild / scalaVersion := crossScalaVersions.value.last
 ThisBuild / githubWorkflowBuildPreamble ++= List(
   WorkflowStep.Sbt(List("scalafmtCheckAll"), name = Some("Check formatting"))
@@ -124,7 +126,10 @@ def newProject(name: String) =
 
 lazy val commonSettings = Seq(
   scalacOptions ++= Seq("-deprecation", "-feature"),
-  scalacOptions += "-target:jvm-1.8",
+  scalacOptions ++= {
+    if (scalaVersion.value.startsWith("2.12")) Seq.empty
+    else Seq("-release", "8")
+  },
   javacOptions ++= Seq("-source", "8", "-target", "8")
 )
 

core/src/main/scala/sangria/federation/v1/Federation.scala

@@ -1,9 +1,10 @@
 package sangria.federation.v1
 
 import sangria.ast
-import sangria.marshalling.InputUnmarshaller
+import sangria.marshalling.{FromInput, InputUnmarshaller}
 import sangria.renderer.SchemaFilter
 import sangria.schema._
+import sangria.util.tag.@@
 
 object Federation {
   import Query._
@@ -43,8 +44,8 @@ object Federation {
               "Query" -> Map(
                 "_service" -> (_ => _Service(sdl)),
                 "_entities" -> (ctx =>
-                  ctx.withArgs(representationsArg) { anys =>
-                    Action.sequence(anys.map { any =>
+                  ctx.withArgs(representationsArg) { (anys: Seq[_Any[Node]]) =>
+                    Action.sequence(anys.map { (any: _Any[Node]) =>
                       val typeName = any.__typename
                       val resolver = resolversMap.getOrElse(
                         typeName,

core/src/main/scala/sangria/federation/v2/Federation.scala

@@ -1,6 +1,7 @@
 package sangria.federation.v2
 
 import sangria.ast
+import sangria.federation.v2._Any
 import sangria.federation.v2.Directives.{ComposeDirective, Link}
 import sangria.marshalling.InputUnmarshaller
 import sangria.renderer.SchemaFilter
@@ -128,8 +129,8 @@ object Federation {
               "Query" -> Map(
                 "_service" -> (_ => _Service(sdl)),
                 "_entities" -> (ctx =>
-                  ctx.withArgs(representationsArg) { anys =>
-                    Action.sequence(anys.map { any =>
+                  ctx.withArgs(representationsArg) { (anys: Seq[_Any[Node]]) =>
+                    Action.sequence(anys.map { (any: _Any[Node]) =>
                       val typeName = any.__typename
                       val resolver = resolversMap.getOrElse(
                         typeName,

core/src/test/scala/sangria/federation/package.scala

@@ -11,7 +11,7 @@ package object federation {
   val spec: String = "https://specs.apollo.dev/federation/v2.3"
 
   def beCompatibleWith(expectedSchema: Schema[_, _]): Matcher[Schema[_, _]] =
-    Matcher { schema: Schema[_, _] =>
+    Matcher { (schema: Schema[_, _]) =>
       val changes = schema.compare(expectedSchema)
 
       MatchResult(
@@ -24,7 +24,7 @@ package object federation {
   private def pretty(v: Vector[_]): String = v.mkString("\n - ", "\n - ", "")
 
   def importFederationDirective(name: String): Matcher[Schema[_, _]] =
-    Matcher { schema: Schema[_, _] =>
+    Matcher { (schema: Schema[_, _]) =>
       val links = schema.astDirectives.filter(d => d.name == "link")
       val link = links.find(d =>
         d.arguments.exists(arg => arg.name == "url" && arg.value == ast.StringValue(spec)))
@@ -61,7 +61,7 @@ package object federation {
     }
 
   def renderLike(expected: String): Matcher[ast.Directive] =
-    Matcher { directive: ast.Directive =>
+    Matcher { (directive: ast.Directive) =>
       val rendered = QueryRenderer.renderPretty(directive)
       be(expected)(rendered)
     }

core/src/test/scala/sangria/federation/tracing/ApolloFederationTracingSpec.scala

@@ -8,7 +8,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
 import reports.Trace
 import sangria.execution.Executor
-import sangria.macros.LiteralGraphQLStringContext
+import sangria.macros._
 import sangria.marshalling.ScalaInput
 import sangria.marshalling.circe._
 

core/src/test/scala/sangria/federation/v1/FederationSpec.scala

@@ -10,7 +10,7 @@ import sangria.ast.Document
 import sangria.execution.{Executor, VariableCoercionError}
 import sangria.federation._
 import sangria.federation.v1.Directives.Key
-import sangria.macros.LiteralGraphQLStringContext
+import sangria.macros._
 import sangria.parser.QueryParser
 import sangria.renderer.QueryRenderer
 import sangria.schema._

core/src/test/scala/sangria/federation/v2/ComposeDirectiveSpec.scala

@@ -6,7 +6,7 @@ import sangria.ast
 import sangria.federation.importFederationDirective
 import sangria.federation.v2.ComposeDirectiveSpec.{helloDirective, initialSchema, myDirective}
 import sangria.federation.v2.Directives.{ComposeDirective, Link}
-import sangria.macros.LiteralGraphQLStringContext
+import sangria.macros._
 import sangria.renderer.SchemaRenderer
 import sangria.schema._
 import sangria.util.tag.@@

core/src/test/scala/sangria/federation/v2/FederationSpec.scala

@@ -9,7 +9,7 @@ import sangria.execution.deferred.{DeferredResolver, Fetcher, HasId}
 import sangria.execution.{Executor, VariableCoercionError}
 import sangria.federation._
 import sangria.federation.v2.Directives.Key
-import sangria.macros.LiteralGraphQLStringContext
+import sangria.macros._
 import sangria.parser.QueryParser
 import sangria.renderer.{QueryRenderer, SchemaRenderer}
 import sangria.schema._