Merge pull request #4 from typetools/master

Updating fork

LICENSE.txt

@@ -13,10 +13,9 @@ the parts that you might want to include with your own program.
    (The text of this license also appears below.)  This applies to the
    checker-qual*.jar and all the files that appear in it:  every file in a
    qual/ directory, plus utility files FormatUtil.java,
-   I18nFormatUtil.java, NullnessUtil.java, Opt.java,
-   PurityUnqualified.java, RegexUtil.java, SignednessUtil.java, and
-   UnitsTools.java.  It also applies to other utility files
-   (SignednessUtilExtra.java) and to the cleanroom implementations of
+   I18nFormatUtil.java, NullnessUtil.java, Opt.java, PurityUnqualified.java,
+   RegexUtil.java, SignednessUtil.java, SignednessUtilExtra.java, and
+   UnitsTools.java.  It also applies to the cleanroom implementations of
    third-party annotations (in checker/src/testannotations/ and in
    framework/src/main/java/org/jmlspecs/).
 

azure-pipelines.yml

@@ -10,25 +10,53 @@ pr:
 
 
 jobs:
-- job: all_tests_jdk8
+- job: junit_tests_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - misc_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: ./checker/bin-devel/test-cftests-all.sh
-    displayName: test-cftests-all.sh
-- job: all_tests_jdk11
+  - bash: ./checker/bin-devel/test-cftests-junit.sh
+    displayName: test-cftests-junit.sh
+- job: junit_tests_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: ./checker/bin-devel/test-cftests-all.sh
-    displayName: test-cftests-all.sh
+  - bash: ./checker/bin-devel/test-cftests-junit.sh
+    displayName: test-cftests-junit.sh
+- job: nonjunit_tests_jdk8
+  dependsOn:
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk8:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-cftests-nonjunit.sh
+    displayName: test-cftests-nonjunit.sh
+- job: nonjunit_tests_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk11:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-cftests-nonjunit.sh
+    displayName: test-cftests-nonjunit.sh
 - job: misc_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8-plus:latest
@@ -47,6 +75,11 @@ jobs:
   - bash: ./checker/bin-devel/test-misc.sh
     displayName: test-misc.sh
 - job: cf_inference_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - cf_inference_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8:latest
@@ -65,6 +98,11 @@ jobs:
   - bash: ./checker/bin-devel/test-cf-inference.sh
     displayName: test-cf-inference.sh
 - job: daikon_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - daikon_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8:latest
@@ -83,6 +121,11 @@ jobs:
   - bash: ./checker/bin-devel/test-daikon.sh
     displayName: test-daikon.sh
 - job: guava_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - guava_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8:latest
@@ -103,6 +146,11 @@ jobs:
   - bash: ./checker/bin-devel/test-guava.sh
     displayName: test-guava.sh
 - job: plume_lib_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - plume_lib_jdk11
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk8:latest
@@ -120,19 +168,24 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
-- job: downstream_jdk11
+- job: downstream_jdk8
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - downstream_jdk11
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: mdernst/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-downstream.sh
     displayName: test-downstream.sh
-- job: downstream_jdk8
+- job: downstream_jdk11
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: mdernst/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25

build.gradle

@@ -4,7 +4,7 @@ plugins {
     // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow (v5 requires Gradle 5)
     id 'com.github.johnrengelman.shadow' version '6.0.0'
     // https://plugins.gradle.org/plugin/de.undercouch.download
-    id "de.undercouch.download" version "4.1.0"
+    id "de.undercouch.download" version "4.1.1"
     id 'java'
     // https://github.com/tbroyer/gradle-errorprone-plugin
     id "net.ltgt.errorprone" version "1.2.1"
@@ -641,10 +641,10 @@ subprojects {
         // Add tasks to run various checkers on all the main source sets.
         // These pass and are run by nonJunitTests.
         createCheckTypeTask(project.name, 'org.checkerframework.checker.interning.InterningChecker', 'Interning')
-        createCheckTypeTask(project.name, 'org.checkerframework.checker.nullness.NullnessChecker', 'NullnessSkipSome', ['-AskipUses=com.sun.*', '-AskipDefs=org.checkerframework.checker.*|org.checkerframework.common.*|org.checkerframework.framework.*'])
+        createCheckTypeTask(project.name, 'org.checkerframework.checker.nullness.NullnessChecker', 'NullnessOnlyAnnotatedFor', ['-AskipUses=com.sun.*', '-AuseConservativeDefaultsForUncheckedCode=source'])
         createCheckTypeTask(project.name, 'org.checkerframework.framework.util.PurityChecker', 'Purity')
         createCheckTypeTask(project.name, 'org.checkerframework.checker.signature.SignatureChecker', 'Signature')
-        // These do not yet pass.  TODO: Make them pass.
+        // These pass on some subprojects, which nonJunitTests runs.  TODO: Incrementally add @AnnotatedFor on classes.
         createCheckTypeTask(project.name, 'org.checkerframework.checker.nullness.NullnessChecker', 'Nullness', ['-AskipUses=com.sun.*'])
 
 
@@ -806,7 +806,13 @@ subprojects {
         // Create a nonJunitTests task per project
         tasks.create(name: 'nonJunitTests', group: 'Verification') {
             description 'Run all Checker Framework tests except for the Junit tests.'
-            dependsOn('checkInterning', 'checkNullnessSkipSome', 'checkPurity', 'checkSignature')
+            dependsOn('checkInterning', 'checkPurity', 'checkSignature')
+            if (project.name.is('framework') || project.name.is('checker')) {
+                dependsOn('checkNullnessOnlyAnnotatedFor')
+            } else {
+                dependsOn('checkNullness')
+            }
+
             if (project.name.is('framework') || project.name.is('checker')) {
                 dependsOn('checkCompilerMessages', 'jtregTests')
             }

changelog.txt

@@ -1,11 +1,18 @@
-Version 3.?.?, August 3, 2020
+Version 3.6.0, August 3, 2020
+
+Added a new option `-Aversion` to print the version of the Checker Framework.
 
 The Interning Checker supports method annotations @EqualsMethod and
 @CompareToMethod.  Place them on methods like equals(), compareTo(), and
 compare() to permit certain uses of == on non-interned values.
 
 Added an overloaded version of NullnessUtil.castNonNull that takes an error message.
 
+Implementation details:
+
+commonAssignmentCheck() now takes an additional argument.  Type system
+authors must update their overriding implementations.
+
 ---------------------------------------------------------------------------
 
 Version 3.5.0, July 1, 2020

checker-qual-android/build.gradle

@@ -10,6 +10,7 @@ task copySources(type: Copy, dependsOn: ':checker-qual:copySources') {
     }
     from files('../checker-qual/src/main')
     include "**/*.java"
+    exclude "**/SignednessUtilExtra.java"
     into file('src/main')
 
     // Not read only because "replaceAnnotations" tasks writes to the files.

checker-qual/build.gradle

@@ -28,7 +28,7 @@ task copySources(type: Copy) {
     include "**/Opt.java"
     include "**/RegexUtil.java"
     include "**/SignednessUtil.java"
-    // include "**/SignednessUtilExtra.java"
+    include "**/SignednessUtilExtra.java"
     include "**/UnitsTools.java"
 
     // Make files read only.