diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 15:59:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 15:59:07 +0000 |
| commit | d1c3afb0ff60e9218bf217679ff0434b2db9027f (patch) | |
| tree | 699fa4fd695344ba7d46d5681b7d020c6feeb59d | |
| parent | 9b606109cb3bec0187604941889749a996e13dde (diff) | |
| parent | 448b15e92363f3b7b4113f6e508f0b06923eae5a (diff) | |
| download | error_prone-android-mainline-12.0.0_r98.tar.gz | |
Snap for 7924065 from 448b15e92363f3b7b4113f6e508f0b06923eae5a to mainline-art-releaseandroid-mainline-12.0.0_r98android-mainline-12.0.0_r69android-mainline-12.0.0_r42android-mainline-12.0.0_r115android12-mainline-art-release
Change-Id: Id04957622c4fbba92554b48fab2ce22d1dc913bc
55 files changed, 190 insertions, 144 deletions
@@ -49,17 +49,21 @@ license { java_import { name: "error_prone_annotations", host_supported: true, - jars: ["error_prone/error_prone_annotations-2.4.0.jar"], + jars: ["error_prone/error_prone_annotations-2.8.1.jar"], + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], } java_import { name: "error_prone_core", host_supported: true, jars: [ - "checkerframework/dataflow-2.5.3.jar", - "checkerframework/javacutil-2.5.3.jar", - "error_prone/error_prone_core-2.3.2-with-dependencies.jar", - "error_prone/error_prone_annotations-2.4.0.jar", + "checkerframework/dataflow-errorprone-3.15.0.jar", + "checkerframework/javacutil-3.15.0.jar", + "error_prone/error_prone_core-2.8.1-with-dependencies.jar", + "error_prone/error_prone_annotations-2.8.1.jar", "javac/javac-9+181-r4173-1.jar", "jFormatString/jFormatString-3.0.0.jar", ], @@ -69,7 +73,7 @@ java_import { name: "error_prone_test_helpers", host_supported: true, jars: [ - "error_prone/error_prone_test_helpers-2.3.2.jar", + "error_prone/error_prone_test_helpers-2.8.1.jar", "jimfs/jimfs-1.1.jar", ], } @@ -0,0 +1,7 @@ +# TODO(b/198224074): auto-generate this file using bp2build. + +java_import( + name = "error_prone_annotations", + jars = ["error_prone/error_prone_annotations-2.8.1.jar"], + visibility = ["//visibility:public"], +) diff --git a/checkerframework/METADATA b/checkerframework/METADATA index 89e814b..bb2a793 100644 --- a/checkerframework/METADATA +++ b/checkerframework/METADATA @@ -11,12 +11,12 @@ third_party { } url { type: ARCHIVE - value: "http://repo1.maven.org/maven2/org/checkerframework/dataflow/2.5.3/dataflow-2.5.3-sources.jar" + value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/3.15.0/dataflow-errorprone-3.15.0-sources.jar" } url { type: ARCHIVE - value: "http://repo1.maven.org/maven2/org/checkerframework/javacutil/2.5.3/javacutil-2.5.3-sources.jar" + value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar" } - version: "2.5.3" - last_upgrade_date { year: 2018 month: 10 day: 14} + version: "3.15.0" + last_upgrade_date { year: 2021 month: 8 day: 18} } diff --git a/checkerframework/dataflow-2.5.3-sources.jar b/checkerframework/dataflow-2.5.3-sources.jar Binary files differdeleted file mode 100644 index 490c982..0000000 --- a/checkerframework/dataflow-2.5.3-sources.jar +++ /dev/null diff --git a/checkerframework/dataflow-2.5.3-sources.jar.asc b/checkerframework/dataflow-2.5.3-sources.jar.asc deleted file mode 100644 index b9e68aa..0000000 --- a/checkerframework/dataflow-2.5.3-sources.jar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAABAgAGBQJbOnWZAAoJELFmmKSt9NY4SBoIAIFgbLiQsNTRyxV/3jxZoZp4 -GUB5y4NqcI1976JqZBcEOAvaL1VWibFrrnbf2V8+vV1QiNs1hO0XH8ITgFcJjQPD -INHlI6z+CZgUqoHMqVIF+6WotlXdJD0dGlq7HkLEqqIoTv31yGpFgxmAwu3eIT/D -yxOayfSuSCjYiJw/qaWGcuIKNVmVr2INTCeGirggDCebTKLWu3mD2IEYUFFatjMG -xFwlAs1h42Xj8fAKQ9qDL8x9U/FOKFJ8AeQBf5ywD2B5S4zzlmzCBtxR7NDjt5qp -8X4Akn9NFzh8V2dytvNm7kkmummZ0XxnQFBQvATEKb92DW65xRwH6E/tbx6cdfU= -=nsvQ ------END PGP SIGNATURE----- diff --git a/checkerframework/dataflow-2.5.3-sources.jar.sha1 b/checkerframework/dataflow-2.5.3-sources.jar.sha1 deleted file mode 100644 index 0720ac1..0000000 --- a/checkerframework/dataflow-2.5.3-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -06742c4bc0168b46d40f691497d845bd8c7baed2
\ No newline at end of file diff --git a/checkerframework/dataflow-2.5.3.jar b/checkerframework/dataflow-2.5.3.jar Binary files differdeleted file mode 100644 index 7a93aaf..0000000 --- a/checkerframework/dataflow-2.5.3.jar +++ /dev/null diff --git a/checkerframework/dataflow-2.5.3.jar.asc b/checkerframework/dataflow-2.5.3.jar.asc deleted file mode 100644 index b9aecaf..0000000 --- a/checkerframework/dataflow-2.5.3.jar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAABAgAGBQJbOnWSAAoJELFmmKSt9NY4/qEH/1JXhR+0CJi0Ndp4SIalm25f -U4AF3tKn7D2O5gKkbjHu6cljpiuLRh8L6PIX4tXsSp5F73nhPKgYRAhLunoAfQyt -IFzn9bS38GqLSVzcC4CduCY1JeitPOXM6KG5fFJJchryy9z4w2ayh5XTmEbWvNFg -EFc/2HJ7H51Bn0G247XSfKFHepeWDPt7siP5qjJjp6AlpaJb/ToYwj/mGEeAKm38 -j1y/jNGJiTfeLWtr55rCn/5IIXDT1Cp4S1hkDbEBkqrVf9e0gvbujro9NNjt7SEs -+k+ac7utiirqp1F2/vo/0QwEygdDI+q6RFk9vS7YclUJoa7InaQdxqalrtpBNiU= -=E805 ------END PGP SIGNATURE----- diff --git a/checkerframework/dataflow-2.5.3.jar.sha1 b/checkerframework/dataflow-2.5.3.jar.sha1 deleted file mode 100644 index 85c152e..0000000 --- a/checkerframework/dataflow-2.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -edf284e0838290d661b22483ecf648065e7ec440
\ No newline at end of file diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar b/checkerframework/dataflow-errorprone-3.15.0-sources.jar Binary files differnew file mode 100644 index 0000000..0550a67 --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc new file mode 100644 index 0000000..6b011f7 --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.64 + +iQEcBAABAgAGBQJgzR/bAAoJELFmmKSt9NY4gcsH/3P/tCkzmoShP7gQiksDrvQd +dKKOt5WBZEcAeeGy21vIqSgZjM18XPOpZh7lpbzfbCESx417eU8TpbJKqi+4M6lq +7CNwLgebweErD8ow2EUflC8o7VtudIZK9Xs0y3A+qiJJfMfxoJFE7dx2tNEaGROO +yAibfhX2Hn+QfjyzuAFJDO3Dl2E1a8PN7AkV5+pPNnIvmlv/15s8c97vaESHaqYD +PyCMeOO/J5B4eRSix8870Df4pDbYpLFj61Am0uDRLIxwN5S8mjqhHRW7ScVL7mx/ +hhbDz0HCnAUtCG22bcJVErC7iimB/ViGMMRwyUfvkbg3N//ZQtmVfYo8fLEOG9Y= +=VFpP +-----END PGP SIGNATURE----- diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1 b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1 new file mode 100644 index 0000000..e4dbe72 --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1 @@ -0,0 +1 @@ +7ecc58b5dfd0332b96e3146f02bc3bb54d098767
\ No newline at end of file diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar b/checkerframework/dataflow-errorprone-3.15.0.jar Binary files differnew file mode 100644 index 0000000..44d8e6b --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0.jar diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar.asc b/checkerframework/dataflow-errorprone-3.15.0.jar.asc new file mode 100644 index 0000000..963e301 --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.64 + +iQEcBAABAgAGBQJgzR/bAAoJELFmmKSt9NY4tbgH/2ElRkNYUbVKkn7ZvvppCB9+ +MPpqQCSP19dYVWEvAXD75s7NKIBjlhLsId6nisUysncZer/H8UzHFOonV8AEfXKP +C1GGwbXgk9ISAdwQ5n+MDqE0AGh19snPAf09Qz9YtgnsLJHZHZNz/a/BuVwkcC3y +zpVSKjenIigmmVDIbxjqMejqPpUu/Xukxu1vz6Yq1fg4VMtQk3lggUGxsEQUS+bf +VgV8Cl/C8q2xLklZ1x8iNWzd5HgXTOGNAhJ0wXoy5cUkUgsP1VazCLd418xiR4+q +IYjjGgDfVjduDRkRXuComJDdDQvKnaOl6PfdlsyFbEmlW5cCkRneoHcV8tMUT3s= +=BP9M +-----END PGP SIGNATURE----- diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar.sha1 b/checkerframework/dataflow-errorprone-3.15.0.jar.sha1 new file mode 100644 index 0000000..75cca97 --- /dev/null +++ b/checkerframework/dataflow-errorprone-3.15.0.jar.sha1 @@ -0,0 +1 @@ +7004cda299790fb01db2cc452242d7657a232ae5
\ No newline at end of file diff --git a/checkerframework/javacutil-2.5.3-sources.jar b/checkerframework/javacutil-2.5.3-sources.jar Binary files differdeleted file mode 100644 index 9a63478..0000000 --- a/checkerframework/javacutil-2.5.3-sources.jar +++ /dev/null diff --git a/checkerframework/javacutil-2.5.3-sources.jar.asc b/checkerframework/javacutil-2.5.3-sources.jar.asc deleted file mode 100644 index 2ea3dad..0000000 --- a/checkerframework/javacutil-2.5.3-sources.jar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAABAgAGBQJbOnWDAAoJELFmmKSt9NY4WRcH/R5NFsKe8kB49tyT/MNIy8IG -XXoORzIPLWgPlGwiU5Cw+jUmNLq/hMXCUf0KPc8Fut+3RGpJZhINEfyK4E3XmbuX -q6wUcD5CUD1ne7xJWRUCne+TDj6ZJru2x+aimodsN5AWo0z8DTKu6AwkPIbqJv7j -2mh1NOXui1XXBQumI7Kt0lkStG9oC+w/PgQ+DF10ahU9HP/xkZMEDVYJsphaGyFz -Z0xOoEeFRS42WNIEB/ei1bPleFCXfpyY9dcHUCK0HxAAZP+wQO8Yt282Coukxw8y -5+nYakyKWdbS94Zm1BML6dBM/FIfRrSO1BGb9ZTJw47wKjXVNIAInSiTN4Sz6jM= -=ZP0C ------END PGP SIGNATURE----- diff --git a/checkerframework/javacutil-2.5.3-sources.jar.sha1 b/checkerframework/javacutil-2.5.3-sources.jar.sha1 deleted file mode 100644 index 1b930ce..0000000 --- a/checkerframework/javacutil-2.5.3-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5ab2a7e55df797e43cb5169727adf17b6f90d135
\ No newline at end of file diff --git a/checkerframework/javacutil-2.5.3.jar b/checkerframework/javacutil-2.5.3.jar Binary files differdeleted file mode 100644 index 4a324a8..0000000 --- a/checkerframework/javacutil-2.5.3.jar +++ /dev/null diff --git a/checkerframework/javacutil-2.5.3.jar.asc b/checkerframework/javacutil-2.5.3.jar.asc deleted file mode 100644 index b714d7b..0000000 --- a/checkerframework/javacutil-2.5.3.jar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAABAgAGBQJbOnV9AAoJELFmmKSt9NY4n28H/09k63Pe4/ZHedcR1EOPHu7z -T9L2oLxq2TQarFhDZAbyRfXEUtsL25HiY42JKcczcYIUcknSnmrtcl+aVfm0MjfR -8LAL06mDi3dwFEYJJQbJaDCIjIEmY5qnDUna+FDTG5SsGWeYXqIYKevfIoELZM1B -wsgo7EvSX6JNHOO801Q1nEBT7smKWvB8ATvIFXhIM5z9WWRh3xF4aUFtForEG/d2 -JXQLOBLf/XNBvtUuqEOhmBnGUJxIFXbBHimBNhZEQORPe6wXn/fAum+BUho+DPIa -OP5n3XS26Tg61eMBaLZgpmwmnKwwBdoHCkVvJlCvl8OB9S9LKDmN8nNpIMmoMp0= -=x03N ------END PGP SIGNATURE----- diff --git a/checkerframework/javacutil-2.5.3.jar.sha1 b/checkerframework/javacutil-2.5.3.jar.sha1 deleted file mode 100644 index 05d5eb6..0000000 --- a/checkerframework/javacutil-2.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c545ca6fc7a57e3bc65d46e8e9438376f0db35ea
\ No newline at end of file diff --git a/checkerframework/javacutil-3.15.0-sources.jar b/checkerframework/javacutil-3.15.0-sources.jar Binary files differnew file mode 100644 index 0000000..564a49e --- /dev/null +++ b/checkerframework/javacutil-3.15.0-sources.jar diff --git a/checkerframework/javacutil-3.15.0-sources.jar.asc b/checkerframework/javacutil-3.15.0-sources.jar.asc new file mode 100644 index 0000000..45e2adc --- /dev/null +++ b/checkerframework/javacutil-3.15.0-sources.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.64 + +iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4wGEIAKaN/1b7enYbrfsaZshrhpsA +F+Hmi21YY3Cl0hVITcToHW0Sj3TzZ42mEFq1Z+S7uEbtHc1lICogMPOWefTXHbwm +UHVI2iGNHgIumMzdgwngZPvQflKYVJs5N10gXpw74Bk+nQ+E41cZxvnIXurqDKj+ +QXLcE2j5VqE6VhNns8g1usbdZBwe5l9YUJ5R8z6pRolcg7sGitfymUs8kh2h4Arm +hXelZ7Q86pzhSaUbyio5VH2lI7uCCybaEyxUZycWgPQ9GatJbS80JZ3hlZ4J67oq +CrGy7tPxjQ1NkAB85wPjeRfyrfavP60FCn6ELyR7LR9qU1taB8F8QcwBX0jgrgc= +=ONLI +-----END PGP SIGNATURE----- diff --git a/checkerframework/javacutil-3.15.0-sources.jar.sha1 b/checkerframework/javacutil-3.15.0-sources.jar.sha1 new file mode 100644 index 0000000..482bd0a --- /dev/null +++ b/checkerframework/javacutil-3.15.0-sources.jar.sha1 @@ -0,0 +1 @@ +ba716714cb8fe068fbaab8e87c8d6c62f10d3777
\ No newline at end of file diff --git a/checkerframework/javacutil-3.15.0.jar b/checkerframework/javacutil-3.15.0.jar Binary files differnew file mode 100644 index 0000000..601ca3d --- /dev/null +++ b/checkerframework/javacutil-3.15.0.jar diff --git a/checkerframework/javacutil-3.15.0.jar.asc b/checkerframework/javacutil-3.15.0.jar.asc new file mode 100644 index 0000000..26a21a3 --- /dev/null +++ b/checkerframework/javacutil-3.15.0.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.64 + +iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4V2UIAJr9s2wBkWrf6x03MlTOs87j +iZSSaWXVpbZiu/ZDBVCoZiW6NgE5N0E7rbgCqb2HFNXvfLt3sD9JcENVpilGBnVE +slIStEfhZAdzOMlGGBFsiKbzqjHxUMtdk69/MVlaYFpbNxRWakA6I+ORwouN2AXC +1tzBSqN8QOgaSenN6JSdAVd8mf4ctiBXqntG2+zE49CjxD31W945TG3o2fm493ph +8VxnM/h1ZMaBYboG5o+ERt06kg13djOAWgqCo10at3lSQlUqMZg+oZODUtJ22kBv +gdBCHAwGdTaK46UZXjpxichVmGs9urrICjlAXy9T3qc5/ZzGY18i9xITcqr1fXg= +=BSMt +-----END PGP SIGNATURE----- diff --git a/checkerframework/javacutil-3.15.0.jar.sha1 b/checkerframework/javacutil-3.15.0.jar.sha1 new file mode 100644 index 0000000..8ed9c68 --- /dev/null +++ b/checkerframework/javacutil-3.15.0.jar.sha1 @@ -0,0 +1 @@ +6bab34878391ed9af57cfa3dbfa56082e89d25b1
\ No newline at end of file diff --git a/error_prone/METADATA b/error_prone/METADATA index 3c63920..7ce0737 100644 --- a/error_prone/METADATA +++ b/error_prone/METADATA @@ -10,12 +10,8 @@ third_party { } url { type: ARCHIVE - value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.3.2/error_prone_core-2.3.2-with-dependencies.jar" + value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.8.1/error_prone_core-2.8.1-with-dependencies.jar" } - url { - type: ARCHIVE - value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.3.2/error_prone_core-2.3.2-with-dependencies.jar" - } - version: "2.3.2" - last_upgrade_date { year: 2020 month: 11 day: 3} + version: "2.8.1" + last_upgrade_date { year: 2021 month: 8 day: 18} } diff --git a/error_prone/error_prone_annotations-2.4.0.jar b/error_prone/error_prone_annotations-2.4.0.jar Binary files differdeleted file mode 100644 index 902c7b1..0000000 --- a/error_prone/error_prone_annotations-2.4.0.jar +++ /dev/null diff --git a/error_prone/error_prone_annotations-2.4.0.jar.asc b/error_prone/error_prone_annotations-2.4.0.jar.asc deleted file mode 100644 index 3ede198..0000000 --- a/error_prone/error_prone_annotations-2.4.0.jar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYZ4ACgkQmiWcfuY2 -xe2bABAApUalU975u4yqmvDhxxwv9OIZTEUlatLKO/Xz8vDzSoOtlIkRwkrIMqsL -yYp49cIE8AbQcSXvkEaIZJ+DggqWm4gr4kNihqmDP4IQmURjQomLJt38FWty4AHE -gK3LpeCud7QU2RvzHMgAxTkeZMsciibGjKqOGpNiAXhHvfHEpGiWEBXDhMeyvant -cFqbSY7maYbITIk81vWXB5e2pYj3yoCmfCAuNj3LGXFjIkDbHiCK+XtDJWObKzut -jPj/L2Xgv7zb5q7vRoZv50qMhwBF3jscqwpb8Pt/8NUn778OsRF1miKmMmWX3fny -HxRVum5Ljt4o13QUbYA4fR64DSArsBAmdhHU+ELQzCpKINe68af2nlKuiobVv5N3 -dTS5a/ONUGU9hvHmjsrSZoYUaE+A53k9ieycuBhQZz1jh/pk9o+oBwjFtJvuPBpR -Be7Fr/efA//SBcxNGP3XW4rLPXZc26gEqarYYPUk3NiKBIBZCS8s/QrfKdu9Oc1f -BeVVTFJORQDgKFIxrHX9cCDj/r+VmSA9aKqRw5IV2t5jK1FWUuS/velvvpttULZW -WhgS9igjFWW1K1Uig4FFX1u9i/3Y7rQuutXNODnO4Xhol5x+IPsycOduBxIZ41PU -AOJdhxNlGg6nz3smk+hh6HjyaVo71WSymnVRMONAZv1PcfJqOrE= -=TpCl ------END PGP SIGNATURE----- diff --git a/error_prone/error_prone_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_annotations-2.4.0.jar.sha1 deleted file mode 100644 index 23f0094..0000000 --- a/error_prone/error_prone_annotations-2.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32ecccc595e4e4d813a80ee9e3ab5813d65874eb
\ No newline at end of file diff --git a/error_prone/error_prone_annotations-2.8.1.jar b/error_prone/error_prone_annotations-2.8.1.jar Binary files differnew file mode 100644 index 0000000..106baea --- /dev/null +++ b/error_prone/error_prone_annotations-2.8.1.jar diff --git a/error_prone/error_prone_annotations-2.8.1.jar.asc b/error_prone/error_prone_annotations-2.8.1.jar.asc new file mode 100644 index 0000000..cde03d1 --- /dev/null +++ b/error_prone/error_prone_annotations-2.8.1.jar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlQ8ACgkQmiWcfuY2 +xe3oBhAAhrXJHf/gqz65a9Ol/Vo/yanBBvDRX3lwUEd3hPgd5FaTUOZIoRlJT4a+ +HMgbM02jNPNs3ZDKqkt8DG8jfpYTdIoNiDpD1wNDwuwmqrhztaGQ5KKS2imPcMSc +Ub6oGwiFQV4ryEaMM8fB8Bc1+Ok+D2o7mPd2jnfUGFuQW3sWzLMEij4XktkudxUl +eRWvfVFy2pwlcv1r91F1NC3JoCLBwXDc/Vd0GIlI/PC4HQouKrIvAxUOr1aj/qQK +Dfq3VvKtqgGKdhzkFPd23P3u+dVK/pZ96LJYieVVfjO7BS0m75q9IoJVSBvUoNL7 +/+qS2TaIUONgHLvNq8jXG1XnfN5qewicKlYSLquYy33NDmsyyswvcEZLQugN9hHe +MIHFjRvK6sn/OcSMHTgQ5bj0Uh7RQ0MxzsXMfV+qAhg5YxvsabPiOIAGU2FnaU3f +B/OBF0/wsgiI2dCatZ+dU4U3SCgjU2KT6w+hItaLW+RSWgZlDtZrD824bWhwszun ++Gr0cyuKzJjwsdc6UhcS7vqckQTv9BTdUhjrsdKE9k0GDk5J/tzJD8kTRtUfbYZh +wDqFbTMVNAjfTaghhWTQdqPkv5iguJICIFPKQtQLrPaeHFBuOtqeDkdAAqqLtvYK +c5rQ2k5ys7S6ZTy3OPdgR6sqhPGnbliUncK5VSIYRp8HnLUygXg= +=8x6+ +-----END PGP SIGNATURE----- diff --git a/error_prone/error_prone_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_annotations-2.8.1.jar.sha1 new file mode 100644 index 0000000..cb2b645 --- /dev/null +++ b/error_prone/error_prone_annotations-2.8.1.jar.sha1 @@ -0,0 +1 @@ +bbfa4bdfe7377126947f1469bc7b0bbb4d9dbb95
\ No newline at end of file diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar b/error_prone/error_prone_core-2.3.2-with-dependencies.jar Binary files differdeleted file mode 100644 index 046faee..0000000 --- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar +++ /dev/null diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc b/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc deleted file mode 100644 index 6fa70a7..0000000 --- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9L3AACgkQkS0sDsza -VcCwCwwAjR2NzT2eWnueWlW/BbnGjFa8mdQNKzmt6dJwM81ZEhOp7sjnIRWbnVj4 -2fPAWKRO0VkBj3yViY0I93fwt+/O4jr0c7vfeMOGOZ7UNVTQUbZz1cxgf90UXkSL -AZWE416ezcfVglR/V/d5/8NtHojH6uTePJozt/K0N+GFMkRvEaaLZ/s/ooy0NUHk -SYsgsKFZpX5PvhOypCraiUEcMNQIXPv10oIFIr5Vv8Gvv0a25y9vhIT7XQih65vC -8dtK9M3ma8R1/QRsgRyMTHuFqcqmp+oHN01g68nS3C8kUnKz1IG9asSZ/XDmVFW7 -xgs70faB7Lc0w8RzO+LOaZ16YGMdii/ImFLsuZ89qrZBRhdeCc+2L1lCutixDC4W -XMjT4341TE3s8mQqCqIo81hdjxBnnA0HSsNlFGJE0+AEBQB/R9VbbD223HBiT/3x -jP0Ypu+2qbw+JNrpic/zXKYl7aQ+kOLOKqIKmfIRoNRW5lrVYVVzCwUJMmL0g79l -fI9gsh+L -=mr8i ------END PGP SIGNATURE----- diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1 deleted file mode 100644 index 66890cf..0000000 --- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecc5f1035d25598942789de7b34e826d020557bb
\ No newline at end of file diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar b/error_prone/error_prone_core-2.8.1-with-dependencies.jar Binary files differnew file mode 100644 index 0000000..b0ab3b1 --- /dev/null +++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc new file mode 100644 index 0000000..9a7d497 --- /dev/null +++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlZYACgkQmiWcfuY2 +xe3YHw/+Jf0H26yaSz/kqn7qv+nMP2BBz3d9SD44kLZFNKorsTeSHjgQ7VGDJ4bQ +G+1bQVX5r2rB/OVQRKCNMoE8Jznnz9+tzEUNBhjvBykpUIrKN705BJGBegrOcAa2 +Nda42UYTMnGtdxc8VLb1iQB6eRS6yJNwgfoBvnTzHQiOh5gGdCvxjzSlyVN9pFUx +0tkI6KUZvA3jiPOsZYvegkYbmmmm5JYkgp2BP5n6tU7wIm9MxetyBjbCk4mMVMst +zXrhnVuqAtTp8LjCiJDzIneGyfXZ041Z/skcm4EwfFNga98NynP3gIB9Tp9J7GmX +7sZKqEuPLyfI67J3pUKaDDc8HdTyKFVf7lBZvwf+w2TaUQkVAPyv95Ug+w6YbYvn +LBcHq/cfRRhY/1EPBs/SK2gOnloVpcB1XKLJR+eTBF/GYGcUfuUqTUUkae7oc1gd +GHbW6qi1SjhhtHswyKxkEJPLqNlLm46c5YqSwwk9Q3EsY2RkM0kXVLxlNg//MWrI +RFubSY6WsPqPXIqAwQCrYAIffIbBanBMCi+YSstnKQp36SY6+xUeaVjbPv1AvmCI +50/cW3Yl0oNnVbvT9Y+eiUD2R3W2ZF1lQYTLv1RsTTWvGWw3YKgaEQxQEkIUefds +hkWwWklRR+nJHneMvDskFnyAx+7dKcN7y+ZGMechuTQ6FYRFIjc= +=gvtA +-----END PGP SIGNATURE----- diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1 new file mode 100644 index 0000000..b67c43c --- /dev/null +++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1 @@ -0,0 +1 @@ +e050e357440d8bb832183816c4f4fc8b2feeea26
\ No newline at end of file diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar b/error_prone/error_prone_test_helpers-2.3.2.jar Binary files differdeleted file mode 100644 index 825b179..0000000 --- a/error_prone/error_prone_test_helpers-2.3.2.jar +++ /dev/null diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.asc b/error_prone/error_prone_test_helpers-2.3.2.jar.asc deleted file mode 100644 index 92213ce..0000000 --- a/error_prone/error_prone_test_helpers-2.3.2.jar.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9LagACgkQkS0sDsza -VcBvTQwAoKDBdanv5a0mnSj/eGaODZXoq6KRkQmWAut1+Z1FlbwGLwEoB0D1wDsW -oCqFvfp8gu1nZWh/VFH/JImqmPKdFW8rM0+EvNK3w+sh2gJEjL+bYJ8/SIwr2B8z -i56NuDtXRIXTYXo7cLDMCg5sldqGwOnyZr/L9HkKS3ZD/FEI+a2fhTu9ety7EYI9 -bBNLKh+KMv7SBpRRuW6CTcNl17FV1lbMLRN+UKS2NZpKY7zWbJad9ANXLfNp5Cnu -WPZbX9DZgIbktARdRjUpBihDiisqjkzrrQZciiPvTRHiyywG07dECDGMRR9xxuuD -lsNFE7HL7eO/bJZKOSKazDFhten7SmxLQd8ieTtpNp9PS7VUnY7hGJjS/+1pzU5x -E9WFmUrVFuyf06ZpXervn7h+myDMrO7ohB9clipT9In4LOlPvy8oviKQGx49BRMK -mz194g/RlYOGWSl3Or98qndlQZcKFI4oN8zuMznDmfHvzKvNrfmCZ/UaOiRojfFM -63am+Wz5 -=ZpSE ------END PGP SIGNATURE----- diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.sha1 b/error_prone/error_prone_test_helpers-2.3.2.jar.sha1 deleted file mode 100644 index 966875d..0000000 --- a/error_prone/error_prone_test_helpers-2.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f67ad60cdad7412996bf20559461f31745b9dfa8
\ No newline at end of file diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar b/error_prone/error_prone_test_helpers-2.8.1.jar Binary files differnew file mode 100644 index 0000000..9771492 --- /dev/null +++ b/error_prone/error_prone_test_helpers-2.8.1.jar diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.asc b/error_prone/error_prone_test_helpers-2.8.1.jar.asc new file mode 100644 index 0000000..fbae2b3 --- /dev/null +++ b/error_prone/error_prone_test_helpers-2.8.1.jar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlSgACgkQmiWcfuY2 +xe3JfA//dDa2vy0XjV67wdGUa93SCxxmlhw45UxfguX8DG54+0T5SSHgv5oIJH+2 +Uynr9m9ZWlX4yXvUJ9FfRXZmGyzUK0A9SRV6eQQhqpfmqih/b92Sk2IDNJImhAcq +BJQ6XWhyOEYoTB+NV5pgy3318JxLbF8NIUa1HGMjfCu9ZAQZmv+5W0+v+CehvLJU +6/QW3Nwo/AlcPVr63u/CLanrmyZd5rNkMnJt0he4nMqfswqFY0Zi3YQjSWCu5raD +4XT9KFeGz38RlpkCuCDAiQDLd2Mw/jtA0lw8oL7qIjrVNIzZ+oT7Nv7MV3wkvGWD +P1bdeP+/L/E5hnNtOCSJPK3vdVvH7O1WB18RFVIyonzBFZVqIhYji/A5di+h3uRV +bRQEXbw3eJLcMGUK3b4HIx2uIzEQxpVNDWViNSapPASUeaXSYEQWTW1dQPnJulOK +ia7Vk6see4RQnX7A3OVXkCf8+q3ko5UZuTBV5M7a59QLiWH6ZyLpe7lJht/encXZ +VrQKLokpFesqO+AxPsRgImaCCb94WkJi9ViHvBGlJz23bXsXGIbrWmlc/g0e3pRF +CMlRSZpeX2jnoIcDkAjJB0s+2OWRI4XQUZjL7w4c/C1pR084lrdYQDe1OvGXsIQ9 +ycDqR9pti6l3ECf2epZTp5VOhXF2hhecWusAf8TepBx80DF9d7k= +=91bf +-----END PGP SIGNATURE----- diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.sha1 b/error_prone/error_prone_test_helpers-2.8.1.jar.sha1 new file mode 100644 index 0000000..5705fc3 --- /dev/null +++ b/error_prone/error_prone_test_helpers-2.8.1.jar.sha1 @@ -0,0 +1 @@ +e9f1223156bdb02b7ffce3e1790c996d8f8fd368
\ No newline at end of file diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar b/error_prone/error_prone_type_annotations-2.4.0.jar Binary files differdeleted file mode 100644 index ce90baf..0000000 --- a/error_prone/error_prone_type_annotations-2.4.0.jar +++ /dev/null diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.asc b/error_prone/error_prone_type_annotations-2.4.0.jar.asc deleted file mode 100644 index a354c0e..0000000 --- a/error_prone/error_prone_type_annotations-2.4.0.jar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYdcACgkQmiWcfuY2 -xe3/ig//YBmI7uXHdG8Mej6oClbClD2oA1PXlc4OLcQ+uNrSJfvatEajIxylMvxD -+P2RBCj/9/1F8KCPy6+md5eRiQ+rvoAGCKxVBLlqEnXEQhA6BSMy45dA4m1xDuvs -vyUc9ICFiZJ5qvxe4ENRKHliwjiG5wXbQj0ArKPvdZrhUhLDFTPmCV4LvrVBf5GG -bg9Ek1EHTlMXIC4GI+hSX0wrH+D2H2rxlN7jhyaXXHs7hUpzheRRWw+W3DLFvgb2 -3zMzKPHQzeYEJK180V0BXOWWQew69PgNtdebK4khEYZQT2jvngpzZ/BIpRRBUG4c -3mT0u9IoJiXAsZivz9pMuNktuCU3pCa8l3+gEQUkRFO/oAt/qT6o4iG9FPm1Uwe5 -agx6aA4Nhx6jDTw9jQXhcBT/yCagZvYdSQDWF0FBWwc8PHWCaQfXP+W+MSTXQo6l -d+KtGz74fLTj19dFVy/m7GogTsGHy0awTK1bG24HFVLwpo/a91Yl+kCkxq5JgtGE -Uw4MYB8X5+CX0PyvDjMR/cVvlg1QbRmduBCxGK2YqLjPmcRONu/Lipi5utrjPgjV -oNtJ2RNc/MYoQsDmXYcGTJ8CiijWoWeqczasoqoL2QPrZ0bquHTFFutzxKCW8gfZ -Vc7pNKZ8P/TDPKmBBuM4njp8E4O4i5xvT1tGT5HcK5tOCJvOlVQ= -=bcXN ------END PGP SIGNATURE----- diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.4.0.jar.sha1 deleted file mode 100644 index c9c6d2a..0000000 --- a/error_prone/error_prone_type_annotations-2.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -101b970285e1e464d0c39e4402e2395c20c70a4f
\ No newline at end of file diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar b/error_prone/error_prone_type_annotations-2.8.1.jar Binary files differnew file mode 100644 index 0000000..9e1f977 --- /dev/null +++ b/error_prone/error_prone_type_annotations-2.8.1.jar diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.asc b/error_prone/error_prone_type_annotations-2.8.1.jar.asc new file mode 100644 index 0000000..d63548d --- /dev/null +++ b/error_prone/error_prone_type_annotations-2.8.1.jar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlS0ACgkQmiWcfuY2 +xe17LQ//Xo20fPWdOawZueraYBP0Etr9x1MP3guyfnNNfBX2y2+OsK6TeWMAc17k +1nGxwe+GmVFYNxdBf3k08gBG6v3zRDiBbNb9EGz6Aq+WZGuAD0Wm5MMSPboYIvW8 +L3dhbSjrPiNmUaj9jt+BxlceYLAeWLlM7hUbjm3mZa7PZmCxePtsV3A5nLHyhsbw +kfb4AzFOCteSQvw+PyrEhqbIqHL6HCR1VkQd0VE0s4epbaLMdA4e311fhv3Y9A2D +S4ygjd5bkdmOLPTVTwZwxClcdjmFF6ccCFnU9doXrhHCHH4u1JcLc+W5JSpY8ED/ +7t6MPa18ZwXwCxHDUaONPmI6dYrAU/RiGwwgjnuKzBkJx4G6xiGAshJ3eAvR11/N +hINti3l0TgldByzLnIl9NFOvAeeK2BkazzjptbA4JYv5d1avgyxwPX21TRCtvFcV +8bWugfTFq9a/XszJHrnm4rJxwOxZyemJ3EgUHQ5ANj/+VzCOWFlDbb0WmTCdH25J +Dp2gBgNhdRvVwQQsafBA+nZjBjetN9Z/F9/hR8aSgFpXpQ4nAv5PZxFrkSF1VmtY +ZD2khBUSwtmCuRAMj7JrSuZgVSCO9nr4rT52TDf9Yfs4UBAipAvhi0wnqllHATMw +9FTY1GpK576rGN/lW5/a9S4JRxrKRYjOd/JaZjvmpT5W0Q3/1Xk= +=YFoe +-----END PGP SIGNATURE----- diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_type_annotations-2.8.1.jar.sha1 new file mode 100644 index 0000000..4c5b947 --- /dev/null +++ b/error_prone/error_prone_type_annotations-2.8.1.jar.sha1 @@ -0,0 +1 @@ +b81c055c7ba1a109a67164b597c5c51f74c7671e
\ No newline at end of file diff --git a/javac/METADATA b/javac/METADATA index 4cc6c75..9036623 100644 --- a/javac/METADATA +++ b/javac/METADATA @@ -12,5 +12,5 @@ third_party { value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar" } version: "9+181-r4173-1" - last_upgrade_date { year: 2020 month: 11 day: 3} + last_upgrade_date { year: 2021 month: 8 day: 18} } diff --git a/soong/error_prone.go b/soong/error_prone.go index ef416f5..d3c4409 100644 --- a/soong/error_prone.go +++ b/soong/error_prone.go @@ -22,11 +22,11 @@ func init() { // These values are set into build/soong/java/config/config.go so that soong doesn't have any // references to external/error_prone, which may not always exist. config.ErrorProneClasspath = []string{ - "external/error_prone/error_prone/error_prone_core-2.3.2-with-dependencies.jar", - "external/error_prone/error_prone/error_prone_annotations-2.4.0.jar", - "external/error_prone/error_prone/error_prone_type_annotations-2.4.0.jar", - "external/error_prone/checkerframework/dataflow-2.5.3.jar", - "external/error_prone/checkerframework/javacutil-2.5.3.jar", + "external/error_prone/error_prone/error_prone_core-2.8.1-with-dependencies.jar", + "external/error_prone/error_prone/error_prone_annotations-2.8.1.jar", + "external/error_prone/error_prone/error_prone_type_annotations-2.8.1.jar", + "external/error_prone/checkerframework/dataflow-errorprone-3.15.0.jar", + "external/error_prone/checkerframework/javacutil-3.15.0.jar", "external/error_prone/jFormatString/jFormatString-3.0.0.jar", } @@ -53,6 +53,7 @@ func init() { "-Xep:DoNotCall:ERROR", "-Xep:EqualsNaN:ERROR", "-Xep:EqualsWrongThing:ERROR", + "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", "-Xep:ForOverride:ERROR", "-Xep:FormatStringAnnotation:ERROR", "-Xep:FunctionalInterfaceMethodChanged:ERROR", @@ -80,7 +81,6 @@ func init() { "-Xep:LiteByteStringUtf8:ERROR", "-Xep:LoopConditionChecker:ERROR", "-Xep:MissingTestCall:ERROR", - "-Xep:MockitoCast:ERROR", "-Xep:MockitoUsage:ERROR", "-Xep:MoreThanOneInjectableConstructor:ERROR", "-Xep:MustBeClosedChecker:ERROR", @@ -90,9 +90,6 @@ func init() { "-Xep:OptionalEquality:ERROR", "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", "-Xep:PackageInfo:ERROR", - "-Xep:PreconditionsCheckNotNull:ERROR", - "-Xep:PreconditionsCheckNotNullPrimitive:ERROR", - "-Xep:PredicateIncompatibleType:ERROR", "-Xep:PrivateSecurityContractProtoAccess:ERROR", "-Xep:ProtoFieldNullComparison:ERROR", "-Xep:ProtoStringFieldReferenceEquality:ERROR", @@ -122,21 +119,34 @@ func init() { "-Xep:ArrayHashCode:WARN", "-Xep:ArrayToString:WARN", "-Xep:ArraysAsListPrimitiveArray:WARN", + "-Xep:BadAnnotationImplementation:WARN", "-Xep:BadShiftAmount:WARN", "-Xep:ComparableType:WARN", "-Xep:ComplexBooleanConstant:WARN", + "-Xep:CollectionToArraySafeParameter:WARN", "-Xep:ConditionalExpressionNumericPromotion:WARN", + "-Xep:DangerousLiteralNull:WARN", + "-Xep:DurationFrom:WARN", + "-Xep:DurationTemporalUnit:WARN", + "-Xep:EqualsHashCode:WARN", "-Xep:EqualsReference:WARN", "-Xep:FormatString:WARN", + "-Xep:FromTemporalAccessor:WARN", "-Xep:GetClassOnAnnotation:WARN", "-Xep:GetClassOnClass:WARN", "-Xep:GuardedBy:WARN", "-Xep:HashtableContains:WARN", "-Xep:IdentityBinaryExpression:WARN", + "-Xep:IdentityHashMapBoxing:WARN", + "-Xep:InstantTemporalUnit:WARN", "-Xep:InvalidTimeZoneID:WARN", + "-Xep:InvalidZoneId:WARN", + "-Xep:IsInstanceIncompatibleType:WARN", "-Xep:IsLoggableTagLength:WARN", + "-Xep:JUnitParameterMethodNotFound:WARN", "-Xep:MathRoundIntLong:WARN", "-Xep:MislabeledAndroidString:WARN", + "-Xep:MisusedDayOfYear:WARN", "-Xep:MissingSuperCall:WARN", "-Xep:MisusedWeekYear:WARN", "-Xep:ModifyingCollectionWithItself:WARN", @@ -144,16 +154,24 @@ func init() { "-Xep:NullTernary:WARN", "-Xep:OverridesJavaxInjectableMethod:WARN", "-Xep:ParcelableCreator:WARN", + "-Xep:PeriodFrom:WARN", + "-Xep:PreconditionsInvalidPlaceholder:WARN", + "-Xep:ProtoBuilderReturnValueIgnored:WARN", "-Xep:ProtocolBufferOrdinal:WARN", + "-Xep:ProtoFieldNullComparison:WARN", "-Xep:RandomModInteger:WARN", "-Xep:RectIntersectReturnValueIgnored:WARN", + "-Xep:RemovedInJDK11:WARN", "-Xep:ReturnValueIgnored:WARN", + "-Xep:SelfAssignment:WARN", "-Xep:SelfComparison:WARN", "-Xep:SelfEquals:WARN", "-Xep:SizeGreaterThanOrEqualsZero:WARN", "-Xep:StringBuilderInitWithChar:WARN", "-Xep:TryFailThrowable:WARN", + "-Xep:UnnecessaryCheckNotNull:WARN", "-Xep:UnusedCollectionModifiedInPlace:WARN", + "-Xep:XorPower:WARN", // Errorprone default severity WARNING // "-Xep:AmbiguousMethodReference:WARN", @@ -395,6 +413,23 @@ func init() { // b/170172949 "-Xep:MissingOverride:OFF", "-Xep:UnnecessaryParentheses:OFF", + // This triggers on android R classes, disable until we can ignore + // the generated R classes + "-Xep:MutablePublicArray:OFF", + // These checks crash + "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:OFF", + "-Xep:InvalidLink:OFF", + // DoNotCall is a check with severity ERROR. Errorprone + // adds some hardcoded methods to be considered @DoNotCall, + // and they cause findings in external/junit. Disable this + // hardcoded list until we can exclude external code from errorprone. + "-XepOpt:DoNotCallChecker:CheckThirdPartyMethods=false", + // Commonly triggers for stubbed methods + "-Xep:DoNotCallSuggester:OFF", + "-Xep:MissingSummary:OFF", + // This check increates the `platformprotos` module's build + // time by ~15 minutes + "-Xep:SameNameButDifferent:OFF", } config.ErrorProneFlags = []string{ @@ -20,10 +20,10 @@ EP_TYPE_ANNO_JAR_URL="${JAR_REPO}/error_prone_type_annotations/${EP_VERSION}/err EP_TEST_HELPERS_JAR_URL="${JAR_REPO}/error_prone_test_helpers/${EP_VERSION}/error_prone_test_helpers-${EP_VERSION}.jar" JAVAC_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}.jar" JAVAC_SOURCES_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}-sources.jar" -CF_DATAFLOW_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/dataflow/${CF_VERSION}/dataflow-${CF_VERSION}.jar" -CF_DATAFLOW_SOURCES_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/dataflow/${CF_VERSION}/dataflow-${CF_VERSION}-sources.jar" -CF_JAVACUTIL_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar" -CF_JAVACUTIL_SOURCES_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar" +CF_DATAFLOW_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}.jar" +CF_DATAFLOW_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}-sources.jar" +CF_JAVACUTIL_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar" +CF_JAVACUTIL_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar" TOOLS_DIR=$(dirname $0) function update_jar { @@ -68,7 +68,7 @@ if [ "${CF_VERSION}" != '' ]; then update_jar "${CF_VERSION}" "${CF_JAVACUTIL_JAR_URL}" "${TOOLS_DIR}/checkerframework" update_jar "${CF_VERSION}" "${CF_JAVACUTIL_SOURCES_JAR_URL}" "${TOOLS_DIR}/checkerframework" perl -pi -e "\ - s|\"(external/error_prone/checkerframework/dataflow).*\"|\"\\1-${CF_VERSION}.jar\"|;\ + s|\"(external/error_prone/checkerframework/dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;\ s|\"(external/error_prone/checkerframework/javacutil).*\"|\"\\1-${CF_VERSION}.jar\"|;\ " "$TOOLS_DIR/soong/error_prone.go" fi |