diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2a023bfe2e..9e83f401e0 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,16 +21,16 @@ jobs: epVersion: 2.4.0 - os: macos-latest java: 11 - epVersion: 2.19.1 + epVersion: 2.20.0 - os: ubuntu-latest java: 11 - epVersion: 2.19.1 + epVersion: 2.20.0 - os: windows-latest java: 11 - epVersion: 2.19.1 + epVersion: 2.20.0 - os: ubuntu-latest java: 17 - epVersion: 2.19.1 + epVersion: 2.20.0 fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -76,7 +76,7 @@ jobs: with: arguments: coveralls continue-on-error: true - if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.19.1' && github.repository == 'uber/NullAway' + if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.20.0' && github.repository == 'uber/NullAway' - name: Test publishToMavenLocal flow env: ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }} diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8c8d72a613..961df9b844 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.4.0" // Latest released Error Prone version that we've tested with -def latestErrorProneVersion = "2.19.1" +def latestErrorProneVersion = "2.20.0" // Default to using latest tested Error Prone version, except on Java 8, where 2.10.0 is the last version // that works def defaultErrorProneVersion = JavaVersion.current() >= JavaVersion.VERSION_11 ? latestErrorProneVersion : "2.10.0" diff --git a/jar-infer/jar-infer-lib/src/test/java/com/uber/nullaway/jarinfer/JarInferTest.java b/jar-infer/jar-infer-lib/src/test/java/com/uber/nullaway/jarinfer/JarInferTest.java index dda6aaf47b..897e96e2ed 100644 --- a/jar-infer/jar-infer-lib/src/test/java/com/uber/nullaway/jarinfer/JarInferTest.java +++ b/jar-infer/jar-infer-lib/src/test/java/com/uber/nullaway/jarinfer/JarInferTest.java @@ -170,7 +170,7 @@ private void testAnnotationInAarTemplate( * @param result Map of 'method signatures' to their 'inferred list of NonNull parameters'. * @param expected Map of 'method signatures' to their 'expected list of NonNull parameters'. */ - private boolean verify(Map> result, HashMap> expected) { + private boolean verify(Map> result, Map> expected) { for (Map.Entry> entry : result.entrySet()) { String mtd_sign = entry.getKey(); Set ddParams = entry.getValue();