Merge branch 'master' into update/sbt-scalafix-0.9.34

.github/workflows/ci.yml

@@ -41,19 +41,37 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@11)
+        id: download-java-temurin-11
+        if: matrix.java == 'temurin@11'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 11
+
       - name: Setup Java (temurin@11)
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 11
+          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+
+      - name: Download Java (temurin@17)
+        id: download-java-temurin-17
+        if: matrix.java == 'temurin@17'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 17
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 17
+          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -111,19 +129,37 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@11)
+        id: download-java-temurin-11
+        if: matrix.java == 'temurin@11'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 11
+
       - name: Setup Java (temurin@11)
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 11
+          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+
+      - name: Download Java (temurin@17)
+        id: download-java-temurin-17
+        if: matrix.java == 'temurin@17'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 17
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 17
+          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v2

.mergify.yml

@@ -1,10 +1,27 @@
+# This file was automatically generated by sbt-typelevel-mergify using the
+# mergifyGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the mergify configuration
+# to meet your needs, then regenerate this file.
 
 pull_request_rules:
-  - name: automatically merge scala-steward's PRs
-    conditions:
-      - author=scala-steward
-      - body~=labels:.*semver-patch.*
-      - status-success=build
-    actions:
-      merge:
-        method: merge
+- name: merge scala-steward's PRs
+  conditions:
+  - author=scala-steward
+  - or:
+    - body~=labels:.*early-semver-patch
+    - body~=labels:.*early-semver-minor
+  - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11, rootJS)
+  - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11, rootJVM)
+  - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@17, rootJVM)
+  actions:
+    merge: {}
+- name: Label genTestsAggregate PRs
+  conditions:
+  - files~=^target/genTestsAggregate/
+  actions:
+    label:
+      add:
+      - genTestsAggregate
+      remove: []

core/src/main/scala/clue/ApolloClient.scala

@@ -574,7 +574,12 @@ class ApolloClient[F[_], S, CP, CE](
     }
 
     def emitError(json: Json): F[Unit] = {
-      val error = new ResponseException(json.hcursor.get[List[Json]]("errors").getOrElse(Nil))
+      // Should `json` be the full response with an `errors` field or just the actual errors?
+      // Above in `onMessage` we strip them out
+      //       case Right(StreamingMessage.FromServer.DataJson(subscriptionId, data, errors)) =>
+      // and pass just the errors to `emitError`
+//      val error = new ResponseException(json.hcursor.get[List[Json]]("errors").getOrElse(Nil))
+      val error = new ResponseException(json.asArray.fold(List(json))(_.toList))
       // TODO When an Error message is received, we terminate the stream and halt the subscription. Do we want that?
       queue.offer(error.asLeft)
     }

project/Settings.scala

@@ -6,16 +6,16 @@ object Settings {
 
   object LibraryVersions {
     val cats                     = "2.7.0"
-    val catsEffect               = "3.3.5"
+    val catsEffect               = "3.3.7"
     val circe                    = "0.14.1"
     val disciplineMUnit          = "1.0.9"
-    val fs2                      = "3.2.4"
+    val fs2                      = "3.2.5"
     val grackle                  = "0.1.9"
-    val http4s                   = "0.23.9"
+    val http4s                   = "0.23.10"
     val http4sDom                = "0.2.0"
     val http4sJDKClient          = "0.5.0"
     val jawn                     = "1.3.2"
-    val log4Cats                 = "2.1.1"
+    val log4Cats                 = "2.2.0"
     val monocle                  = "3.1.0"
     val munit                    = "0.7.29"
     val scalaFix                 = scalafix.sbt.BuildInfo.scalafixVersion

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("edu.gemini"     % "sbt-lucuma-lib"    % "0.6.0")
+addSbtPlugin("edu.gemini"     % "sbt-lucuma-lib"    % "0.6.3")
 addSbtPlugin(("ch.epfl.scala" % "sbt-scalafix"      % "0.9.33").cross(CrossVersion.for3Use2_13))
 addSbtPlugin("com.eed3si9n"   % "sbt-projectmatrix" % "0.9.0")