Merge branch 'master' into dependabot/gradle/org.jetbrains-annotation…

…s-26.0.1
Netflix · Nov 6, 2024 · bcddb7c · bcddb7c
2 parents 62edd62 + 610577f
commit bcddb7c
Show file tree

Hide file tree

Showing 36 changed files with 7,040 additions and 7,061 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.1
+      - uses: actions/checkout@v4.2.2
 
       - name: Setup Java ${{ matrix.jdk-version }}
         uses: actions/setup-java@v4
@@ -28,22 +28,22 @@ jobs:
           python -m pip install --upgrade pip
           if [ -f scripts/requirements.txt ]; then pip install -r scripts/requirements.txt; fi
 
-      - uses: actions/cache@v4.1.1
+      - uses: actions/cache@v4.1.2
         id: gradle-wrapper-cache
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
           restore-keys: ${{ runner.os }}-gradlewrapper-
 
       - name: Cache Gradle packages
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.1.2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
 
       - name: Maven cache
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.1.2
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -61,13 +61,13 @@ jobs:
           ./gradlew --info --no-watch-fs publishToMavenLocal --warning-mode all
 
       - name: Clone dgs-examples-java
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v4.2.2
         with:
           repository: Netflix/dgs-examples-java
           path: build/examples/dgs-examples-java
 
       - name: Clone dgs-examples-kotlin
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v4.2.2
         with:
           repository: Netflix/dgs-examples-kotlin
           path: build/examples/dgs-examples-kotlin

diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml
@@ -9,20 +9,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.1
+      - uses: actions/checkout@v4.2.2
       - name: Setup jdk 8
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 8
-      - uses: actions/cache@v4.1.1
+      - uses: actions/cache@v4.1.2
         id: gradle-cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
           restore-keys: |
             - ${{ runner.os }}-gradle-
-      - uses: actions/cache@v4.1.1
+      - uses: actions/cache@v4.1.2
         id: gradle-wrapper-cache
         with:
           path: ~/.gradle/wrapper

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4.2.1
+      - uses: actions/checkout@v4.2.2
       - name: Set up JDK 1.8
         uses: actions/setup-java@v4
         with:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -55,7 +55,7 @@ allprojects {
     // and suggest an upgrade. The only exception currently are those defined
     // in buildSrc, most likely because the variables are used in plugins as well
     // as dependencies. e.g. KOTLIN_VERSION
-    extra["sb.version"] = "3.3.4"
+    extra["sb.version"] = "3.3.5"
     extra["kotlin.version"] = Versions.KOTLIN_VERSION
 }
 val internalBomModules by extra(