diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc135d172f..4790fce69e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Set up JDK ${{ matrix.java }}" - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Set up GraalVM" - uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 + uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8 with: java-version: '21' distribution: 'graalvm' @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Set up JDK 17" - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/check-android-compatibility.yml b/.github/workflows/check-android-compatibility.yml index 2e4fc39005..f1943682f8 100644 --- a/.github/workflows/check-android-compatibility.yml +++ b/.github/workflows/check-android-compatibility.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 11 - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: 'temurin' java-version: '11' diff --git a/.github/workflows/check-api-compatibility.yml b/.github/workflows/check-api-compatibility.yml index 8cfdec18c1..4fcb03fbc7 100644 --- a/.github/workflows/check-api-compatibility.yml +++ b/.github/workflows/check-api-compatibility.yml @@ -25,7 +25,7 @@ jobs: path: 'gson-old-japicmp' - name: Set up JDK 11 - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: 'temurin' java-version: '11' @@ -48,7 +48,7 @@ jobs: mvn --batch-mode --fail-at-end --no-transfer-progress package japicmp:cmp -DskipTests - name: Upload API differences artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 # Run on workflow success (in that case differences report might include added methods and classes) # or when API compatibility check failed if: success() || ( failure() && steps.check-compatibility.outcome == 'failure' ) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index f703376dfb..e79c986b8f 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -18,7 +18,7 @@ jobs: fuzz-seconds: 600 dry-run: false - name: Upload Crash - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 if: failure() && steps.build.outcome == 'success' with: name: artifacts diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b00ad7c5cc..3b851d66fb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 17 - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: 'temurin' java-version: '17' @@ -36,7 +36,7 @@ jobs: # Initializes the CodeQL tools for scanning - name: Initialize CodeQL - uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 + uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 with: languages: ${{ matrix.language }} # Run all security queries and maintainability and reliability queries @@ -50,4 +50,4 @@ jobs: mvn compile --batch-mode --no-transfer-progress - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 + uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java index bfd82db358..3dcf73729a 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonReader.java +++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java @@ -675,7 +675,7 @@ int doPeek() throws IOException { if (peekStack == JsonScope.EMPTY_ARRAY) { return peeked = PEEKED_END_ARRAY; } - // fall-through to handle ",]" + // fall-through to handle ",]" case ';': case ',': // In lenient mode, a 0-length literal in an array means 'null'. @@ -1775,7 +1775,7 @@ private char readEscapeCharacter() throws IOException { } lineNumber++; lineStart = pos; - // fall-through + // fall-through case '\'': if (strictness == Strictness.STRICT) { diff --git a/gson/src/main/java/com/google/gson/stream/JsonWriter.java b/gson/src/main/java/com/google/gson/stream/JsonWriter.java index 70b0157b24..42fc24cf55 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonWriter.java +++ b/gson/src/main/java/com/google/gson/stream/JsonWriter.java @@ -810,7 +810,7 @@ private void beforeValue() throws IOException { if (strictness != Strictness.LENIENT) { throw new IllegalStateException("JSON must have only one top-level value."); } - // fall-through + // fall-through case EMPTY_DOCUMENT: // first in document replaceTop(NONEMPTY_DOCUMENT); break; diff --git a/pom.xml b/pom.xml index 9e8cb74ff8..ab695f90bd 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.43.0 + 2.44.2 @@ -201,7 +201,7 @@ org.apache.maven.plugins maven-artifact-plugin - 3.5.3 + 3.6.0 @@ -474,7 +474,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.23.0 + 0.23.1 ${gson.isTestModule} diff --git a/proto/pom.xml b/proto/pom.xml index 18f6faec90..3b9faa1231 100644 --- a/proto/pom.xml +++ b/proto/pom.xml @@ -31,7 +31,7 @@ 2025-01-30T22:50:39Z - 4.29.2 + 4.29.3 true diff --git a/test-shrinker/pom.xml b/test-shrinker/pom.xml index eff79bf678..e4d4479a56 100644 --- a/test-shrinker/pom.xml +++ b/test-shrinker/pom.xml @@ -188,7 +188,7 @@ but it appears that can be ignored --> com.android.tools r8 - 8.5.35 + 8.7.18