Merge pull request #1051 from scala-steward/update/scala3-library-3.3.1

Update scala3-library to 3.3.1
sangria-graphql · Sep 11, 2023 · 618b47a · 618b47a
2 parents dbeb663 + bf9da4e
commit 618b47a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12.18, 2.13.11, 3.3.1]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -105,12 +105,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3.3.1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3.3.1)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ import com.typesafe.tools.mima.core._
 val isScala3 = Def.setting(scalaBinaryVersion.value == "3")
 
 // sbt-github-actions needs configuration in `ThisBuild`
-ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.11", "3.3.0")
+ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.11", "3.3.1")
 ThisBuild / scalaVersion := crossScalaVersions.value.tail.head
 ThisBuild / githubWorkflowBuildPreamble ++= List(
   WorkflowStep.Sbt(List("mimaReportBinaryIssues"), name = Some("Check binary compatibility")),

diff --git a/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveEnumTypeMacro.scala b/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveEnumTypeMacro.scala
@@ -3,12 +3,9 @@ package sangria.macros.derive
 import scala.quoted._
 import sangria.schema.EnumType
 
-import scala.annotation.experimental
-
 object DeriveEnumTypeMacro extends DeriveMacroSupport {
 
   // Supports Scala 2 style enumeration only
-  @experimental
   def deriveEnumType[T: Type](configSeq: Expr[Seq[DeriveEnumSetting]])(using
       Quotes): Expr[EnumType[T]] = {
     import quotes.reflect._
@@ -94,7 +91,6 @@ object DeriveEnumTypeMacro extends DeriveMacroSupport {
     }
   }
 
-  @experimental
   private def collectEnumValues[T](using quotes: Quotes)(using Type[T])(
       values: List[quotes.reflect.Symbol],
       config: Seq[MacroDeriveEnumSetting]): List[Expr[sangria.schema.EnumValue[T]]] = {

diff --git a/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveInputObjectTypeMacro.scala b/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveInputObjectTypeMacro.scala
@@ -6,11 +6,9 @@ import sangria.schema.{Field, InputField}
 import sangria.marshalling.ToInput
 import sangria.schema.WithoutInputTypeTags
 import sangria.schema.InputType
-import scala.annotation.experimental
 import scala.annotation.tailrec
 
 object DeriveInputObjectTypeMacro {
-  @experimental
   def deriveInputObjectType[T](using Quotes, Type[T])(
       config: Expr[Seq[DeriveInputObjectSetting]]) = {
     val Varargs(configSeq) = config
@@ -22,7 +20,6 @@ object DeriveInputObjectTypeMacro {
 // Quotes instance in the class directly
 private class DeriveInputObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSupport {
 
-  @experimental
   def deriveInputObjectType[T](using targetType: Type[T])(
       config: Seq[Expr[DeriveInputObjectSetting]]) = {
     import globalQuotes.reflect._
@@ -78,7 +75,6 @@ private class DeriveInputObjectTypeMacro(using globalQuotes: Quotes) extends Der
     }
   }
 
-  @experimental
   private def collectFields[T](using targetType: Type[T])(config: Seq[MacroSetting])
       : Either[List[(PositionPointer, String)], List[Expr[InputField[_]]]] =
     import globalQuotes.reflect._

diff --git a/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveObjectTypeMacro.scala b/modules/derivation/src/main/scala-3/sangria/macros/derive/DeriveObjectTypeMacro.scala
@@ -14,8 +14,6 @@ import sangria.schema.{
 
 import scala.concurrent.Future
 
-import scala.annotation.experimental
-
 import scala.quoted._
 import sangria.schema.InterfaceType
 import scala.reflect.ClassTag
@@ -26,7 +24,6 @@ import scala.annotation.tailrec
 
 object DeriveObjectTypeMacro {
 
-  @experimental
   def deriveContextObjectType[Ctx, CtxVal, Val](using Quotes)(using
       ctx: Type[Ctx],
       ctxVal: Type[CtxVal],
@@ -36,7 +33,6 @@ object DeriveObjectTypeMacro {
     new DeriveObjectTypeMacro().deriveObjectType(ctx, Some(ctxVal -> fn), v, configSeq)
   }
 
-  @experimental
   def deriveNormalObjectType[Ctx, Val](using Quotes)(using
       ctx: Type[Ctx],
       v: Type[Val]
@@ -50,7 +46,6 @@ object DeriveObjectTypeMacro {
 // Quotes instance in the class directly
 class DeriveObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSupport {
 
-  @experimental
   def deriveObjectType[Ctx, CtxVal, Val](
       ctxType: Type[Ctx],
       ctxValType: Option[(Type[CtxVal], Expr[Ctx => CtxVal])],
@@ -101,7 +96,6 @@ class DeriveObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSuppo
     }
   }
 
-  @experimental
   private def collectFields[Ctx, T, Val, CtxVal](
       config: Seq[MacroDeriveObjectSetting],
       ctxType: Type[Ctx],
@@ -262,7 +256,6 @@ class DeriveObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSuppo
     }
   }
 
-  @experimental
   private def findActualFieldType[T](fieldType: globalQuotes.reflect.TypeRepr) =
     import globalQuotes.reflect._
     if (isSupertype[Future[_]](fieldType) && fieldType.typeArgs.nonEmpty)
@@ -286,7 +279,6 @@ class DeriveObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSuppo
     import quotes.reflect._
     subtype <:< TypeRepr.of[T]
 
-  @experimental
   private def fieldWithArguments[Ctx, CtxVal, Val](
       config: Seq[MacroDeriveObjectSetting],
       member: KnownMember,
@@ -361,7 +353,6 @@ class DeriveObjectTypeMacro(using globalQuotes: Quotes) extends DeriveMacroSuppo
       }
   }
 
-  @experimental
   private def createArg(config: Seq[MacroDeriveObjectSetting], member: KnownMember)(
       arg: globalQuotes.reflect.Symbol) =
     import globalQuotes.reflect._