Merge pull request #196 from sangria-graphql/scala_3

cross-compile to scala 3

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.17, 2.13.8]
+        scala: [2.12.17, 2.13.8, 3.2.0]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -127,6 +127,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.2.0)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
+
+      - name: Inflate target directories (3.2.0)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

build.sbt

@@ -1,26 +1,42 @@
+import com.typesafe.tools.mima.core._
+
 name := "sangria-relay"
 organization := "org.sangria-graphql"
-mimaPreviousArtifacts := Set("org.sangria-graphql" %% "sangria-relay" % "2.1.0")
 
 description := "Sangria Relay Support"
 homepage := Some(url("https://sangria-graphql.github.io/"))
 licenses := Seq(
   "Apache License, ASL Version 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0"))
 
+val isScala3 = Def.setting(
+  CrossVersion.partialVersion(scalaVersion.value).exists(_._1 == 3)
+)
+
 // sbt-github-actions needs configuration in `ThisBuild`
-ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.8")
-ThisBuild / scalaVersion := crossScalaVersions.value.last
+ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.8", "3.2.0")
+ThisBuild / scalaVersion := crossScalaVersions.value.tail.head
 ThisBuild / githubWorkflowBuildPreamble ++= List(
   WorkflowStep.Sbt(List("mimaReportBinaryIssues"), name = Some("Check binary compatibility")),
   WorkflowStep.Sbt(List("scalafmtCheckAll"), name = Some("Check formatting"))
 )
 
-scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8")
+scalacOptions ++= Seq("-deprecation", "-feature")
+scalacOptions += { if (isScala3.value) "-Xtarget:8" else "-target:jvm-1.8" }
 javacOptions ++= Seq("-source", "8", "-target", "8")
 
 libraryDependencies ++= Seq(
-  "org.sangria-graphql" %% "sangria" % "3.2.0",
-  "org.scalatest" %% "scalatest" % "3.2.13" % Test)
+  "org.sangria-graphql" %% "sangria" % "3.4.0",
+  "org.scalatest" %% "scalatest" % "3.2.14" % Test)
+
+mimaPreviousArtifacts := {
+  if (isScala3.value) Set.empty
+  else Set("org.sangria-graphql" %% "sangria-relay" % "2.1.0")
+}
+mimaBinaryIssueFilters ++= Seq(
+  ProblemFilters.exclude[IncompatibleResultTypeProblem](
+    "sangria.relay.Connection.definitionWithEdge$default$5"),
+  ProblemFilters.exclude[IncompatibleMethTypeProblem]("sangria.relay.Connection.definitionWithEdge")
+)
 
 // Publishing
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")

src/main/scala/sangria/relay/Connection.scala

@@ -4,7 +4,7 @@ import sangria.execution.UserFacingError
 import sangria.relay.util.Base64
 import sangria.schema._
 
-import scala.annotation.implicitNotFound
+import scala.annotation.{implicitNotFound, tailrec}
 import scala.concurrent.{ExecutionContext, Future}
 import scala.language.higherKinds
 import scala.reflect.ClassTag
@@ -25,6 +25,7 @@ object Connection {
     val All = Before :: After :: First :: Last :: Nil
   }
 
+  @tailrec
   def isValidNodeType[Val](nodeType: OutputType[Val]): Boolean = nodeType match {
     case _: ScalarType[_] | _: EnumType[_] | _: CompositeType[_] => true
     case OptionType(ofType) => isValidNodeType(ofType)
@@ -36,7 +37,9 @@ object Connection {
       nodeType: OutputType[Val],
       edgeFields: => List[Field[Ctx, Edge[Val]]] = Nil,
       connectionFields: => List[Field[Ctx, Conn[Val]]] = Nil
-  )(implicit connEv: ConnectionLike[Conn, PageInfo, Val, Edge[Val]], classEv: ClassTag[Conn[Val]]) =
+  )(implicit
+      connEv: ConnectionLike[Conn, PageInfo, Val, Edge[Val]],
+      classEv: ClassTag[Conn[Val]]): ConnectionDefinition[Ctx, Conn[Val], Val, Edge[Val]] =
     definitionWithEdge[Ctx, DefaultPageInfo, Conn, Val, Edge[Val]](
       name,
       nodeType,
@@ -48,7 +51,7 @@ object Connection {
       nodeType: OutputType[Val],
       edgeFields: => List[Field[Ctx, E]] = Nil,
       connectionFields: => List[Field[Ctx, Conn[Val]]] = Nil,
-      pageInfoType: OutputType[P] = DefaultPageInfo.pageInfoType
+      pageInfoType: Option[OutputType[P]] = None
   )(implicit
       connEv: ConnectionLike[Conn, P, Val, E],
       classEv: ClassTag[Conn[Val]],
@@ -80,9 +83,10 @@ object Connection {
         List[Field[Ctx, Conn[Val]]](
           Field(
             "pageInfo",
-            pageInfoType,
+            pageInfoType.getOrElse(DefaultPageInfo.pageInfoType[Ctx, P]),
             Some("Information to aid in pagination."),
-            resolve = ctx => connEv.pageInfo(ctx.value)),
+            resolve = ctx => connEv.pageInfo(ctx.value)
+          ),
           Field(
             "edges",
             OptionType(ListType(OptionType(edgeType))),
@@ -208,7 +212,7 @@ case class DefaultPageInfo(
 
 object DefaultPageInfo {
   def pageInfoType[Ctx, P <: PageInfo: ClassTag]: ObjectType[Ctx, P] =
-    ObjectType(
+    ObjectType[Ctx, P](
       "PageInfo",
       "Information about pagination in a connection.",
       () =>

src/main/scala/sangria/relay/Node.scala

@@ -15,7 +15,8 @@ trait Node {
 }
 
 object Node {
-  implicit def identifiableNodeType[Ctx, T](implicit ev: IdentifiableNode[Ctx, T]) =
+  implicit def identifiableNodeType[Ctx, T](implicit
+      ev: IdentifiableNode[Ctx, T]): PossibleType[Node, T] =
     PossibleType.create[Node, T]
 
   val GlobalIdFieldName = "id"

src/test/scala/sangria/relay/ConnectionSpec.scala

@@ -54,7 +54,7 @@ class ConnectionSpec extends AnyWordSpec with Matchers with AwaitSupport {
   val UserType: ObjectType[Repo, User] = ObjectType(
     "User",
     () =>
-      fields(
+      fields[Repo, User](
         Field("name", OptionType(StringType), resolve = _.value.name),
         Field(
           "pets",
@@ -170,13 +170,15 @@ class ConnectionSpec extends AnyWordSpec with Matchers with AwaitSupport {
     }
 
     "Not allow list node type" in {
-      an[IllegalArgumentException] should be thrownBy
-        Connection.definition[Repo, Connection, Seq[Pet]]("Pet", ListType(PetType))
-
-      an[IllegalArgumentException] should be thrownBy
-        Connection.definition[Repo, Connection, Option[Seq[Pet]]](
-          "Pet",
-          OptionType(ListType(PetType)))
+      assertTypeError("""
+        |Connection.definition[Repo, Connection, Seq[Pet]]("Pet", ListType(PetType))
+        |""".stripMargin)
+
+      assertTypeError("""
+        |Connection.definition[Repo, Connection, Option[Seq[Pet]]](
+        |          "Pet",
+        |          OptionType(ListType(PetType)))
+        |""".stripMargin)
     }
   }
 }

src/test/scala/sangria/relay/ConnectionWithCustomPageInfoSpec.scala

@@ -26,7 +26,8 @@ class ConnectionWithCustomPageInfoSpec extends AnyWordSpec with Matchers with Aw
     */
   case class CustomConnection[T](pageInfo: CustomPageInfo, edges: Seq[Edge[T]])
 
-  implicit def customConnectionLike[T] =
+  implicit
+  def customConnectionLike[T]: ConnectionLike[CustomConnection, CustomPageInfo, T, Edge[T]] =
     new ConnectionLike[CustomConnection, CustomPageInfo, T, Edge[T]] {
       override def pageInfo(conn: CustomConnection[T]): CustomPageInfo = conn.pageInfo
       override def edges(conn: CustomConnection[T]): Seq[Edge[T]] = conn.edges
@@ -74,7 +75,7 @@ class ConnectionWithCustomPageInfoSpec extends AnyWordSpec with Matchers with Aw
   val TaskType: ObjectType[Repo, Task] = ObjectType(
     "Task",
     () =>
-      fields(
+      fields[Repo, Task](
         Field("id", StringType, resolve = _.value.id),
         Field("userId", StringType, resolve = _.value.userId),
         Field("description", StringType, resolve = _.value.description)
@@ -85,7 +86,7 @@ class ConnectionWithCustomPageInfoSpec extends AnyWordSpec with Matchers with Aw
     ObjectType(
       "CustomPageInfo",
       () =>
-        fields(
+        fields[Repo, CustomPageInfo](
           Field(
             "hasNextPage",
             BooleanType,
@@ -118,7 +119,7 @@ class ConnectionWithCustomPageInfoSpec extends AnyWordSpec with Matchers with Aw
     Connection.definitionWithEdge[Repo, CustomPageInfo, CustomConnection, Task, Edge[Task]](
       name = "Task",
       nodeType = TaskType,
-      pageInfoType = customPageInfoType
+      pageInfoType = Some(customPageInfoType)
     )
 
   private object Args {
@@ -129,7 +130,7 @@ class ConnectionWithCustomPageInfoSpec extends AnyWordSpec with Matchers with Aw
   val UserType: ObjectType[Repo, User] = ObjectType(
     "User",
     () =>
-      fields(
+      fields[Repo, User](
         Field("id", StringType, resolve = _.value.id),
         Field("name", StringType, resolve = _.value.name),
         Field(

src/test/scala/sangria/relay/ConnectionWithEdgeSpec.scala

@@ -59,15 +59,15 @@ class ConnectionWithEdgeSpec extends AnyWordSpec with Matchers with AwaitSupport
   val UserType: ObjectType[Repo, User] = ObjectType(
     "User",
     () =>
-      fields(
+      fields[Repo, User](
         Field("id", StringType, resolve = _.value.id),
         Field("name", StringType, resolve = _.value.name)
       ))
 
   val AccountType: ObjectType[Repo, Account] = ObjectType(
     "Account",
     () =>
-      fields(
+      fields[Repo, Account](
         Field("id", StringType, resolve = _.value.id),
         Field("number", StringType, resolve = _.value.number),
         Field(
@@ -94,7 +94,7 @@ class ConnectionWithEdgeSpec extends AnyWordSpec with Matchers with AwaitSupport
   val RoleType: ObjectType[Repo, Role] = ObjectType(
     "Role",
     () =>
-      fields(
+      fields[Repo, Role](
         Field("id", StringType, resolve = _.value.id),
         Field("display", StringType, resolve = _.value.display)
       ))

src/test/scala/sangria/relay/util/DebugUtil.scala

@@ -82,7 +82,7 @@ object DebugUtil {
       }
     }
 
-  private implicit val conf = myPrettifier
+  private implicit val conf: Prettifier = myPrettifier
 
   def prettyRender(obj: Any) = obj.pretty