From 0a83f422061368f8e3e4cdf5172ab59d712c7666 Mon Sep 17 00:00:00 2001 From: Md Armughanuddin <52311490+armughan11@users.noreply.github.com> Date: Sat, 2 Sep 2023 01:10:05 +0530 Subject: [PATCH 1/3] Added Codecov to CI Pipeline (#820) --- .github/workflows/continuous-integration.yml | 11 ++++++++--- build.gradle | 1 - code-coverage-report/build.gradle | 14 -------------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 11bcff71e7..c642b22c03 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -58,15 +58,20 @@ jobs: with: arguments: shellcheck if: runner.os == 'Linux' - - name: Report jacoco coverage + - name: Aggregate jacoco coverage + id: jacoco_report uses: gradle/gradle-build-action@v2 env: ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }} - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} with: - arguments: coveralls + arguments: codeCoverageReport continue-on-error: true if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.21.1' && github.repository == 'uber/NullAway' + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + with: + files: ./code-coverage-report/build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml + if: steps.jacoco_report.outcome == 'success' - name: Test publishToMavenLocal flow env: ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }} diff --git a/build.gradle b/build.gradle index db827fa246..704951e51c 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ plugins { id "com.diffplug.spotless" version "6.20.0" id "net.ltgt.errorprone" version "3.1.0" apply false id "com.github.johnrengelman.shadow" version "8.1.1" apply false - id "com.github.kt3k.coveralls" version "2.12.0" apply false id "me.champeau.jmh" version "0.7.1" apply false id "com.github.ben-manes.versions" version "0.47.0" id "com.felipefzdz.gradle.shellcheck" version "1.4.6" diff --git a/code-coverage-report/build.gradle b/code-coverage-report/build.gradle index 9b4f755322..e9d3da6bcd 100644 --- a/code-coverage-report/build.gradle +++ b/code-coverage-report/build.gradle @@ -18,7 +18,6 @@ plugins { id 'java' id 'jacoco' - id 'com.github.kt3k.coveralls' } // Use JDK 17 for this module, via a toolchain. We need JDK 17 since this module @@ -71,19 +70,6 @@ def codeCoverageReport = tasks.register('codeCoverageReport', JacocoReport) { } } -coveralls { - jacocoReportPath = "build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml" - afterEvaluate { - sourceDirs = sourcesPath.incoming.artifactView { lenient(true) }.files as List - } -} - -def coverallsTask = tasks.named('coveralls') - -coverallsTask.configure { - dependsOn 'codeCoverageReport' -} - // These dependencies indicate which projects have tests or tested code we want to include // when computing overall coverage. We aim to measure coverage for all code that actually ships // in a Maven artifact (so, e.g., we do not measure coverage for the jmh module) From 75db7db0fbedadeeffc84adab465b6889f85883b Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Fri, 1 Sep 2023 15:53:19 -0400 Subject: [PATCH 2/3] Prepare for release 0.10.13. --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 4 ++-- gradle.properties | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d212b7999e..4ae9128a84 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ Changelog ========= +Version 0.10.13 +--------------- +* Allow library models to define custom stream classes (#807) +* Avoid suggesting castToNonNull fixes in certain cases (#799) +* Ensure castToNonNull insertion/removal suggested fixes do not remove comments (#815) +* Support for JSpecify's 0.3.0 annotation [experimental] + - Generics checks for method overriding (#755) + - Make GenericsChecks methods static (#805) + - Add visitors for handling different types in generic type invariance check (#806) +* Build / CI tooling for NullAway itself: + - Bump versions for some dependencies (#800) + - Update to WALA 1.6.2 (#798) + - Update to Error Prone 2.21.1 (#797) + - Enable contract checking when building NullAway (#802) + - Bump Error Prone Gradle Plugin version (#804) + - Modify JMH Benchmark Workflow For Shellcheck (#813) + - Bump gradle maven publish plugin from 0.21.0 to 0.25.3 (#810) + - Use Spotless to enforce consistent formatting for Gradle build scripts (#809) + - Remove unnecessary compile dependence for jar-infer-cli (#816) + - Added Codecov to CI Pipeline (#820) + Version 0.10.12 --------------- Note: This is the first release built with Java 11. In particular, running diff --git a/README.md b/README.md index c6a3f1d54c..fddfe7a4f6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ plugins { } dependencies { - annotationProcessor "com.uber.nullaway:nullaway:0.10.12" + annotationProcessor "com.uber.nullaway:nullaway:0.10.13" // Optional, some source of nullability annotations. // Not required on Android if you use the support @@ -75,7 +75,7 @@ The configuration for an Android project is very similar to the Java case, with ```gradle dependencies { - annotationProcessor "com.uber.nullaway:nullaway:0.10.12" + annotationProcessor "com.uber.nullaway:nullaway:0.10.13" errorprone "com.google.errorprone:error_prone_core:2.4.0" errorproneJavac "com.google.errorprone:javac:9+181-r4173-1" } diff --git a/gradle.properties b/gradle.properties index f797e050a0..e71fc1059b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ org.gradle.caching=true org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m GROUP=com.uber.nullaway -VERSION_NAME=0.10.13-SNAPSHOT +VERSION_NAME=0.10.13 POM_DESCRIPTION=A fast annotation-based null checker for Java From b7f1326ac70cec267c59ef91827903d8800b10df Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Fri, 1 Sep 2023 16:18:27 -0400 Subject: [PATCH 3/3] Prepare next development version. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e71fc1059b..ee5f44742d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ org.gradle.caching=true org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m GROUP=com.uber.nullaway -VERSION_NAME=0.10.13 +VERSION_NAME=0.10.14-SNAPSHOT POM_DESCRIPTION=A fast annotation-based null checker for Java