Merge tag 'checker-framework-3.39.0-eisop1' of https://github.com/eis…

…op/checker-framework into checker-framework-3.39.0-eisop1

.editorconfig

@@ -32,11 +32,13 @@ 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
-ij_java_align_multiline_parameters = false

.github/renovate.json

@@ -2,16 +2,16 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
-    ":automergeAll",
+    ":automergeDisabled",
     ":automergeRequireAllStatusChecks",
     "schedule:nonOfficeHours",
     ":disableDependencyDashboard"
   ],
   "timezone": "America/Los_Angeles",
   "packageRules": [
     {
-      "matchPackageNames": ["aws-java-sdk-bom"],
-      "schedule": ["* 23 28 * * "]
+      "matchPackageNames": ["com.amazonaws:aws-java-sdk-bom"],
+      "schedule": ["on the last day of the month"]
     }
   ]
 }

.github/renovate.json-README

@@ -1,2 +1,18 @@
+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"],
+      "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 * *"]
+Or, more likely, the problems were with
+      "matchPackageNames": ["aws-java-sdk-bom"],
+which I used for both of the above.

.gitignore

@@ -13,32 +13,29 @@ 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
@@ -80,6 +77,17 @@ manual003.gif
 manual003.png
 manual004.gif
 manual004.png
+
+# 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
@@ -96,18 +104,6 @@ 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
-
-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
@@ -147,6 +143,17 @@ 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/constant-propagation/Out.txt
@@ -162,14 +169,3 @@ checker/jtreg/multipleexecutions/Main.class
 
 # Source is copied from elsewhere.
 checker-qual-android/src
-
-# 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/

.travis-build.sh

@@ -58,6 +58,7 @@ case  $GROUP  in
         "$SCRIPTDIR/test-cftests-nonjunit.sh"
         "$SCRIPTDIR/test-cftests-inference.sh"
         "$SCRIPTDIR/test-misc.sh"
+        "$SCRIPTDIR/test-typecheck.sh"
         "$SCRIPTDIR/test-plume-lib.sh"
         "$SCRIPTDIR/test-daikon.sh"
         "$SCRIPTDIR/test-guava.sh"

.travis.yml

@@ -78,7 +78,7 @@ before_script:
 # The fcntl line works around a bug where Travis truncates logs and fails.
 script:
 - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
-- REMOTE_ORIGIN_URL=`git config --get remote.origin.url`
+- REMOTE_ORIGIN_URL=$(git config --get remote.origin.url)
 - echo "THIS_REPO=${THIS_REPO}"
 - echo "JDKVER=${JDKVER}"
 - echo "GROUP=${GROUP}"
@@ -97,16 +97,16 @@ script:
   echo "Using docker image: " $DOCKERIMAGE &&
   docker run -v $HOME/.gradle:/root/.gradle -v $HOME/.m2:/root/.m2 $DOCKERIMAGE /bin/bash -c "true &&
      if [ $TRAVIS_EVENT_TYPE = pull_request ] ; then
-       git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO || git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO
+       git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO || (sleep 1m && git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO)
        cd $THIS_REPO
        git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge
        git checkout -qf $TRAVIS_PULL_REQUEST_SHA
        git config user.email [email protected]
        git config user.name Noone Cares
        git remote add theupstream https://github.com/$TRAVIS_REPO_SLUG.git
-       git pull theupstream $TRAVIS_BRANCH || git pull theupstream $TRAVIS_BRANCH
+       git pull theupstream $TRAVIS_BRANCH || (sleep 1m && git pull theupstream $TRAVIS_BRANCH)
      else
-       git clone --quiet -b $TRAVIS_BRANCH $REMOTE_ORIGIN_URL $THIS_REPO || git clone --quiet -b $TRAVIS_BRANCH $REMOTE_ORIGIN_URL $THIS_REPO
+       git clone --quiet -b $TRAVIS_BRANCH $REMOTE_ORIGIN_URL $THIS_REPO || (sleep 1m && git clone --quiet -b $TRAVIS_BRANCH $REMOTE_ORIGIN_URL $THIS_REPO)
        cd $THIS_REPO
        git checkout -qf $TRAVIS_COMMIT
      fi &&

README.md

@@ -1,11 +1,11 @@
-# The Checker Framework:  pluggable type-checking for Java
+# The EISOP Checker Framework:  pluggable type-checking for Java
 
-Please see the Checker Framework manual
+Please see the EISOP Checker Framework manual
 ([HTML](https://eisop.github.io/cf/manual/),
 [PDF](https://eisop.github.io/cf/manual/checker-framework-manual.pdf)).
 
 The history of releases and changes is in file
 [docs/CHANGELOG.md](docs/CHANGELOG.md).
 
 Documentation for Checker Framework developers
-is in directory `docs/developer/`.
+is in directory [docs/developer/](docs/developer/).