Merge b630a78 into 18b6ab3

.github/workflows/continuous-integration.yml

@@ -66,7 +66,7 @@ jobs:
           ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }}
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build -x :jar-infer:jar-infer-lib:build -x :jar-infer:nullaway-integration-test:build -x :jar-infer:test-java-lib-jarinfer:build
+          arguments: build
         if: matrix.java == '17'
       - name: Report jacoco coverage
         uses: gradle/gradle-build-action@v2

gradle/dependencies.gradle

@@ -49,7 +49,7 @@ def versions = [
     // The version of Error Prone that NullAway is compiled and tested against
     errorProneApi          : errorProneVersionToCompileAgainst,
     support                : "27.1.1",
-    wala                   : "1.5.8",
+    wala                   : "1.6.1",
     commonscli             : "1.4",
     autoValue              : "1.9",
     autoService            : "1.0.1",

settings.gradle

@@ -18,10 +18,6 @@ include ':jar-infer:android-jarinfer-models-sdk28'
 include ':jar-infer:android-jarinfer-models-sdk29'
 include ':jar-infer:android-jarinfer-models-sdk30'
 include ':jar-infer:android-jarinfer-models-sdk31'
-include ':jar-infer:jar-infer-lib'
-include ':jar-infer:jar-infer-cli'
-include ':jar-infer:test-java-lib-jarinfer'
-include ':jar-infer:nullaway-integration-test'
 include ':jmh'
 include ':guava-recent-unit-tests'
 include ':jdk17-unit-tests'
@@ -31,4 +27,8 @@ if (JavaVersion.current() >= JavaVersion.VERSION_11) {
     include ':code-coverage-report'
     include ':sample-app'
     include ':jar-infer:test-android-lib-jarinfer'
+    include ':jar-infer:jar-infer-lib'
+    include ':jar-infer:jar-infer-cli'
+    include ':jar-infer:test-java-lib-jarinfer'
+    include ':jar-infer:nullaway-integration-test'
 }