diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5dcb0b0f0e..2473f17ba3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,16 +21,16 @@ jobs: epVersion: 2.10.0 - os: macos-latest java: 11 - epVersion: 2.25.0 + epVersion: 2.26.1 - os: ubuntu-latest java: 11 - epVersion: 2.25.0 + epVersion: 2.26.1 - os: windows-latest java: 11 - epVersion: 2.25.0 + epVersion: 2.26.1 - os: ubuntu-latest java: 17 - epVersion: 2.25.0 + epVersion: 2.26.1 fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -63,7 +63,7 @@ jobs: with: arguments: codeCoverageReport continue-on-error: true - if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.25.0' && github.repository == 'uber/NullAway' + if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.26.1' && github.repository == 'uber/NullAway' - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 with: diff --git a/build.gradle b/build.gradle index 5ccd8b0ed6..43ca0ba5be 100644 --- a/build.gradle +++ b/build.gradle @@ -27,11 +27,11 @@ buildscript { } } plugins { - id "com.diffplug.spotless" version "6.23.3" + id "com.diffplug.spotless" version "6.25.0" id "net.ltgt.errorprone" version "3.1.0" apply false id "com.github.johnrengelman.shadow" version "8.1.1" apply false id "me.champeau.jmh" version "0.7.1" apply false - id "com.github.ben-manes.versions" version "0.50.0" + id "com.github.ben-manes.versions" version "0.51.0" id "com.felipefzdz.gradle.shellcheck" version "1.4.6" } @@ -118,7 +118,7 @@ spotless { } } spotlessPredeclare { - java { googleJavaFormat('1.18.1') } + java { googleJavaFormat('1.19.2') } groovyGradle { greclipse() } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index b51850c996..bf767fc131 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -19,7 +19,7 @@ import org.gradle.util.VersionNumber // The oldest version of Error Prone that we support running on def oldestErrorProneVersion = "2.10.0" // Latest released Error Prone version that we've tested with -def latestErrorProneVersion = "2.25.0" +def latestErrorProneVersion = "2.26.1" // Default to using latest tested Error Prone version def defaultErrorProneVersion = latestErrorProneVersion def errorProneVersionToCompileAgainst = defaultErrorProneVersion diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49177..e6441136f3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4baf5a11d4..381baa9cef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME