diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 877ff176e6..e86d87cc61 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -19,18 +19,19 @@ jobs: - os: ubuntu-latest java: 17 epVersion: 2.14.0 - - os: macos-latest - java: 11 - epVersion: 2.30.0 + # last version of Error Prone that supports Java 11 - os: ubuntu-latest java: 11 - epVersion: 2.30.0 + epVersion: 2.31.0 + - os: macos-latest + java: 17 + epVersion: 2.32.0 - os: windows-latest - java: 11 - epVersion: 2.30.0 + java: 17 + epVersion: 2.32.0 - os: ubuntu-latest java: 17 - epVersion: 2.30.0 + epVersion: 2.32.0 fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -61,7 +62,7 @@ jobs: ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }} run: ./gradlew codeCoverageReport continue-on-error: true - if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.30.0' && github.repository == 'uber/NullAway' + if: runner.os == 'Linux' && matrix.java == '17' && matrix.epVersion == '2.32.0' && github.repository == 'uber/NullAway' - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 with: @@ -74,6 +75,6 @@ jobs: ORG_GRADLE_PROJECT_VERSION_NAME: '0.0.0.1-LOCAL' ORG_GRADLE_PROJECT_RELEASE_SIGNING_ENABLED: 'false' run: ./gradlew publishToMavenLocal - if: matrix.java == '11' + if: matrix.java == '17' - name: Check that Git tree is clean after build and test run: ./.buildscript/check_git_clean.sh diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 13263c2095..87d8a43d0d 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.14.0" // Latest released Error Prone version that we've tested with -def latestErrorProneVersion = "2.30.0" +def latestErrorProneVersion = "2.32.0" // Default to using latest tested Error Prone version def defaultErrorProneVersion = latestErrorProneVersion def errorProneVersionToCompileAgainst = defaultErrorProneVersion