Merge branch 'series/2.x' into spelling

ghostdogpr · Feb 12, 2025 · 7757cb0 · 7757cb0
2 parents 0da9e50 + 276a2ab
commit 7757cb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/compatibility.yaml b/.github/workflows/compatibility.yaml
@@ -8,21 +8,23 @@ on:
       - apollo-compatibility/**
       - federation/**
       - adapters/quick/**
+      - .github/workflows/compatibility.yaml
 
 jobs:
   compatibility:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'adopt'
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Run assembly

diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@ val javaTimeVersion           = "2.6.0"
 val jsoniterVersion           = "2.33.2"
 val laminextVersion           = "0.17.0"
 val magnoliaScala2Version     = "1.1.10"
-val magnoliaScala3Version     = "1.3.11"
+val magnoliaScala3Version     = "1.3.12"
 val pekkoHttpVersion          = "1.1.0"
 val playVersion               = "3.0.6"
 val playJsonVersion           = "3.0.4"
@@ -31,7 +31,7 @@ val zioInteropCats3Version    = "23.1.0.3"
 val zioInteropReactiveVersion = "2.0.2"
 val zioConfigVersion          = "4.0.3"
 val zqueryVersion             = "0.7.6"
-val zioJsonVersion            = "0.7.16"
+val zioJsonVersion            = "0.7.17"
 val zioHttpVersion            = "3.0.1"
 val zioOpenTelemetryVersion   = "3.1.1"