[pull] master from opprop:master

.editorconfig

@@ -0,0 +1,44 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+
+[{*.sh,gradlew}]
+end_of_line = lf
+
+[{*.bat,*.cmd}]
+end_of_line = crlf
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.java]
+# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
+# $ means "static"
+ij_java_imports_layout = $*,|,*
+indent_size = 4
+tab_width = 4
+max_line_length = 100
+ij_continuation_indent_size = 8
+ij_any_spaces_around_additive_operators = true
+ij_any_spaces_around_assignment_operators = true
+ij_any_spaces_around_bitwise_operators = true
+ij_any_spaces_around_equality_operators = true
+ij_any_spaces_around_lambda_arrow = true
+ij_any_spaces_around_logical_operators = true
+ij_any_spaces_around_multiplicative_operators = true
+ij_any_spaces_around_relational_operators = true
+ij_any_spaces_around_shift_operators = true
+ij_java_align_multiline_parameters = false
+ij_java_if_brace_force = always
+ij_java_indent_case_from_switch = true
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_java_class_count_to_use_import_on_demand = 9999
+ij_java_space_after_colon = true
+ij_java_space_before_colon = true
+ij_java_ternary_operation_signs_on_next_line = true
+ij_java_use_single_class_imports = true
+ij_java_wrap_long_lines = true

.github/ISSUE_TEMPLATE

@@ -1,10 +1,6 @@
 Thanks for submitting an issue.
-As explained in the instructions for submitting an issue at https://checkerframework.org/manual/#reporting-bugs, please include at least the following information.
-
-The commands you ran, so that we can paste them into a command terminal.  Please don't omit any steps, including installing software or setting environment varibales.  Please include `-version -verbose -AprintAllQualifiers` in the javac options.  If you ran the Checker Framework from an IDE, reproduce the problem from the command line; if you cannot, report the bug to the IDE integration.
-
-A transcript of all the output (as text, not a screenshot).
-
-What you expected to happen instead.  It can be helpful to explain your reasoning or reference a section of the manual.
-
-Files that are used by the commands you ran.  If you cannot share the code, please create a test case that reproduces the problem.
+As explained in the instructions for submitting an issue at https://eisop.github.io/cf/manual/#reporting-bugs, please include four pieces of information:
+ * commands (that can be cut-and-pasted into a command shell),
+ * inputs,
+ * outputs, and
+ * expectation.

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+updates:
+- package-ecosystem: "gradle"
+  directory: "/docs/examples/errorprone/"
+  schedule:
+    interval: "daily"
+
+- package-ecosystem: "gradle"
+  directory: "/docs/examples/lombok/"
+  schedule:
+    interval: "daily"
+
+- package-ecosystem: "maven"
+  directory: "/docs/examples/MavenExample/"
+  schedule:
+    interval: "daily"
+
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"

.github/renovate.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":automergeDisabled",
+    ":automergeRequireAllStatusChecks",
+    "schedule:nonOfficeHours",
+    ":disableDependencyDashboard"
+  ],
+  "timezone": "America/Los_Angeles",
+  "packageRules": [
+    {
+      "matchPackageNames": ["com.amazonaws:aws-java-sdk-bom"],
+      "schedule": ["before 3am on the first day of the month"]
+    }
+  ]
+}

.github/renovate.json-README

@@ -0,0 +1,15 @@
+This works:
+
+  "packageRules": [
+    {
+      "matchPackageNames": ["com.amazonaws:aws-java-sdk-bom"],
+      "schedule": ["before 3am on the first day of the month"]
+    }
+  ]
+
+===========================================================================
+
+This schedule doesn't work:  Renovate accepts it but updates the dependency every day.
+      "schedule": ["on the last day of the month"]
+This schedule doesn't work:  Renovate accepts it but updates the dependency every day.
+      "schedule": ["* 23 28 * *"]

.github/workflows/gradle-wrapper-validation.yml-DISABLED

@@ -0,0 +1,13 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  validation:
+    name: "Gradle wrapper validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.gitignore

@@ -13,52 +13,57 @@ tags
 *.swp
 *.orig
 .DS_Store
+
 # Eclipse files
 .metadata
 .classpath
 .project
 .externalToolBuilders
 .settings
 dot_files
+
 # Intellij files
 .idea
 
+# VS Code files
+.vscode
+
 Makefile.user
 local.properties
 
-# ant tab completion cache file
-.ant-targets-build.xml
-
 # build files
 api
 build
 dist
 docs/tmpapi/
-stubparser/docs/api
-# Don't want to ignore .jar files in checker/lib/ nor in gradle/wrapper
-# *.jar
-checker/jdk/jdk*.jar
-checker/jdk/**/*.class
 *.pyc
 checker/build-temp
+checker/bin/.do-like-javac
+checker/bin/.scc/
+checker/bin-devel/.html-tools
 checker/bin-devel/.plume-scripts
-checker/bin-devel/.run-google-java-format
 checker/bin-devel/dockerdir
 checker/src/main/resources/git.properties
+# These tests are generated from those in checker/tests/calledmethods-lombok during the build.
+# They must be in the tests/ directory rather than the build/ directory so that
+# CheckerFrameworkPerDirectoryTest can be used.
+checker/tests/calledmethods-delomboked
 
 # manual files
-bib
+plume-bib
 *.synctex.gz
 manual.aux
 manual.blg
 manual.dvi
+manual.fdb_latexmk
+manual.fls
 manual.haux
 manual.html
 manual.htoc
+manual.image.log
 manual.image.out
 manual.image.tex
 manual.image.tex.new
-manual.image.log
 manual.log
 manual.out
 manual.pdf
@@ -72,71 +77,96 @@ manual003.gif
 manual003.png
 manual004.gif
 manual004.png
-docs/manual/contributors.txt
-docs/manual/figures/*.eps
-docs/manual/figures/*.pdf
-docs/manual/figures/*.png
-docs/manual/figures/signature-types-with-canonicalname.dia
-docs/manual/*.png
-docs/manual/*.svg
+
+# dataflow manual
+dataflow/manual/dataflow.aux
+dataflow/manual/dataflow.dvi
+dataflow/manual/dataflow.log
+dataflow/manual/dataflow.out
+dataflow/manual/dataflow.pdf
+
+docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/service/PersonalBlogService.class
+docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/struts/action/ReadAction.class
+docs/tutorial/sourcefiles.zip
 docs/examples/**/*.class
 docs/examples/MavenExample/Out.txt
+docs/examples/MavenExample-framework-all/Out.txt
 docs/examples/errorprone/.gradle/
 docs/examples/errorprone/Out.txt
-docs/examples/lombok/Out.txt
 docs/examples/lombok/.gradle/
+docs/examples/lombok/Out.txt
 docs/examples/lombok/lombok.config
+docs/manual/*.png
+docs/manual/*.svg
+docs/manual/contributors.txt
+docs/manual/figures/*.eps
+docs/manual/figures/*.pdf
+docs/manual/figures/*.png
+docs/manual/figures/signature-types-with-canonicalname.dia
 docs/manual/manual.html-e
-docs/tmpapi/
 
-# dataflow manual
-dataflow/manual/dataflow.aux
-dataflow/manual/dataflow.dvi
-dataflow/manual/dataflow.log
-dataflow/manual/dataflow.out
-dataflow/manual/dataflow.pdf
+# release tmps
+tmp
+
+# Maven files
+target/
+*.ipr
+*.iws
+*.iml
+/.gradle/
+
+## Tests
 
 checker/tests/command-line/issue618/TwoCheckers.class
 checker/tests/command-line/issue618/out.txt
 checker/tests/nullness-extra/*.class
 checker/tests/nullness-extra/compat/Out.txt
 checker/tests/nullness-extra/compat/javax/annotation/Nullable.class
 checker/tests/nullness-extra/compat/lib/Lib.class
-checker/tests/nullness-extra/multiple-errors/*.class
-checker/tests/nullness-extra/multiple-errors/Out.txt
-checker/tests/nullness-extra/package-anno/Out.txt
-checker/tests/nullness-extra/package-anno/test/*.class
-checker/tests/nullness-extra/shorthand/NullnessRegexWithErrors.class
-checker/tests/nullness-extra/shorthand/Out.txt
+checker/tests/nullness-extra/issue3597/testpkg/Issue3597A.class
+checker/tests/nullness-extra/issue3597/testpkg/Issue3597B.class
 checker/tests/nullness-extra/issue502/Issue502.class
 checker/tests/nullness-extra/issue502/Out.txt
+checker/tests/nullness-extra/issue5174/*.class
+checker/tests/nullness-extra/issue5174/Out.txt
 checker/tests/nullness-extra/issue594/Out.txt
 checker/tests/nullness-extra/issue607/Issue607.class
 checker/tests/nullness-extra/issue607/Issue607Interface.class
 checker/tests/nullness-extra/issue607/Issue607SuperClass.class
-checker/tests/nullness/generics/*.class
-checker/tests/nullness-temp/*.java
+checker/tests/nullness-extra/multiple-errors/*.class
+checker/tests/nullness-extra/multiple-errors/Out.txt
+checker/tests/nullness-extra/package-anno/Out.txt
+checker/tests/nullness-extra/package-anno/test/*.class
+checker/tests/nullness-extra/shorthand/NullnessRegexWithErrors.class
+checker/tests/nullness-extra/shorthand/Out.txt
 checker/tests/nullness-temp/*.class
+checker/tests/nullness-temp/*.java
+checker/tests/nullness/generics/*.class
+
+# Some tests produce output into the tests/ directory instead of the build/ directory.
+checker/tests/ainfer-index/annotated/
+checker/tests/ainfer-index/inference-output/
+checker/tests/ainfer-nullness/annotated/
+checker/tests/ainfer-nullness/inference-output/
+checker/tests/ainfer-testchecker/annotated/
+checker/tests/ainfer-testchecker/inference-output/
+checker/tests/ainfer-resourceleak/annotated/
+checker/tests/ainfer-resourceleak/inference-output/
+framework/tests/returnsreceiverdelomboked/
+
+dataflow/tests/busyexpr/Out.txt
+dataflow/tests/busyexpr/*.class
+dataflow/tests/cfgconstruction/*.class
+dataflow/tests/constant-propagation/Out.txt
+dataflow/tests/constant-propagation/*.class
+dataflow/tests/issue3447/Out.txt
+dataflow/tests/issue3447/*.class
+dataflow/tests/live-variable/Out.txt
+dataflow/tests/live-variable/*.class
+dataflow/tests/reachingdef/Out.txt
+dataflow/tests/reachingdef/*.class
 
 checker/jtreg/multipleexecutions/Main.class
 
 # Source is copied from elsewhere.
-checker-qual/src
 checker-qual-android/src
-
-framework/tests/whole-program-inference/annotated/
-/framework/tests/returnsreceiverdelomboked/
-
-docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/service/PersonalBlogService.class
-docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/struts/action/ReadAction.class
-docs/tutorial/sourcefiles.zip
-
-# release tmps
-tmp
-
-# Maven files
-target/
-*.ipr
-*.iws
-*.iml
-/.gradle/

.lgtm.yml

@@ -16,4 +16,4 @@ extraction:
     - (cd ${LGTM_WORKSPACE}/annotation-tools/annotation-file-utilities; ./gradlew assemble)
     index:
       build_command:
-      - ./gradlew assemble --console=plain --warning-mode=all --no-daemon
+      - ./gradlew assemble --console=plain --warning-mode=all

.travis-build.sh

@@ -29,22 +29,18 @@ fi
 ### Build the Checker Framework
 ###
 
-if [ -d "/tmp/plume-scripts" ] ; then
-  (cd /tmp/plume-scripts && git pull -q)
-else
-  (cd /tmp && git clone --depth 1 -q https://github.com/plume-lib/plume-scripts.git)
-fi
-# For debugging
-/tmp/plume-scripts/ci-info typetools
-eval $(/tmp/plume-scripts/ci-info typetools)
-
 export CHECKERFRAMEWORK="${CHECKERFRAMEWORK:-$(pwd -P)}"
 echo "CHECKERFRAMEWORK=$CHECKERFRAMEWORK"
 
 ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 SCRIPTDIR=$ROOTDIR/checker/bin-devel/
 
-source "$SCRIPTDIR/build.sh"
+# For debugging
+(cd "$CHECKERFRAMEWORK" && ./gradlew getPlumeScripts)
+"${SCRIPTDIR}/plume-scripts/ci-info" eisop
+eval $("${SCRIPTDIR}/plume-scripts/ci-info" eisop)
+
+source "$SCRIPTDIR/clone-related.sh"
 
 ###
 ### Run the test
@@ -56,11 +52,13 @@ echo "In checker-framework/.travis-build.sh GROUP=$GROUP"
 
 case  $GROUP  in
     all)
-        # Run cftests-junit and cftests-nonjunit separately, because cftests-all it takes too long to run on Travis under JDK 11.
+        # Run cftests-junit, cftests-nonjunit, and cftests-inference separately,
+        # because cftests-all takes too long to run on Travis.
         "$SCRIPTDIR/test-cftests-junit.sh"
         "$SCRIPTDIR/test-cftests-nonjunit.sh"
+        "$SCRIPTDIR/test-cftests-inference.sh"
         "$SCRIPTDIR/test-misc.sh"
-        "$SCRIPTDIR/test-cf-inference.sh"
+        "$SCRIPTDIR/test-typecheck.sh"
         "$SCRIPTDIR/test-plume-lib.sh"
         "$SCRIPTDIR/test-daikon.sh"
         "$SCRIPTDIR/test-guava.sh"