Skip to content

Commit

Permalink
Merge branch 'master' into bump-checker-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
msridhar authored Sep 1, 2023
2 parents a6afe84 + b7f1326 commit a68660e
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 21 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
}
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 0 additions & 14 deletions code-coverage-report/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<String>
}
}

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)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.14-SNAPSHOT

POM_DESCRIPTION=A fast annotation-based null checker for Java

Expand Down

0 comments on commit a68660e

Please sign in to comment.