Snap for 8730993 from 448b15e92363f3b7b4113f6e508f0b06923eae5a to mainline-tzdata3-release
Change-Id: I0afd10ad5bc8fb89897b46ee438d8a9e481730b7
diff --git a/Android.bp b/Android.bp
index 496770a..4de3662 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,30 +14,42 @@
package {
default_applicable_licenses: ["external_error_prone_license"],
- default_visibility: ["//external/error_prone"],
}
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
// See: http://go/android-license-faq
-// The below licenses are not used in this project. They are mentioned
-// in reference to components not stored here.
-// "SPDX-license-identifier-BSD",
-// "SPDX-license-identifier-CPL-1.0",
-// "SPDX-license-identifier-EPL",
-// "SPDX-license-identifier-LGPL",
license {
name: "external_error_prone_license",
- package_name: "Google Error Prone",
visibility: [":__subpackages__"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["error_prone/LICENSE"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-CPL-1.0",
+ "SPDX-license-identifier-EPL",
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-GPL-2.0",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-MIT",
+ ],
+ // large-scale-change unable to identify any license_text files
}
java_import {
name: "error_prone_annotations",
host_supported: true,
- visibility: ["//visibility:public"],
- jars: ["error_prone/error_prone_annotations-2.11.0.jar"],
- min_sdk_version : "29",
+ jars: ["error_prone/error_prone_annotations-2.8.1.jar"],
apex_available: [
"//apex_available:anyapex",
"//apex_available:platform",
@@ -45,32 +57,25 @@
}
java_import {
- name: "error_prone_core_jars",
- host_supported: true,
- jars: [
- "error_prone/error_prone_core-2.11.0-with-dependencies.jar",
- "error_prone/error_prone_annotations-2.11.0.jar",
- ],
-}
-
-java_library {
name: "error_prone_core",
host_supported: true,
- visibility: ["//visibility:public"],
- static_libs: [
- "error_prone_checkerframework_dataflow_errorprone",
- "error_prone_core_jars",
- "error_prone_javac",
- "error_prone_jFormatString",
+ jars: [
+ "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",
],
}
java_import {
name: "error_prone_test_helpers",
host_supported: true,
- visibility: ["//visibility:public"],
jars: [
- "error_prone/error_prone_test_helpers-2.11.0.jar",
+ "error_prone/error_prone_test_helpers-2.8.1.jar",
"jimfs/jimfs-1.1.jar",
],
}
+
+subdirs = ["soong"]
diff --git a/BUILD b/BUILD
new file mode 100644
index 0000000..eeb2541
--- /dev/null
+++ b/BUILD
@@ -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/Android.bp b/checkerframework/Android.bp
deleted file mode 100644
index bd43afd..0000000
--- a/checkerframework/Android.bp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["external_error_prone_checkerframework_license"],
-}
-
-license {
- name: "external_error_prone_checkerframework_license",
- package_name: "Google Error Prone checkerframework",
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
- "SPDX-license-identifier-MIT",
- ],
- license_text: ["LICENSE"],
-}
-
-java_import {
- name: "error_prone_checkerframework_dataflow_errorprone",
- host_supported: true,
- jars: ["dataflow-errorprone-3.21.2.jar"],
-}
-
-// This is effectively dataflow-nullaway library
-java_library_host {
- name: "error_prone_checkerframework_dataflow_nullaway",
- visibility: ["//external/nullaway"],
- jarjar_rules: "nullaway-jarjar-rules.txt",
- static_libs: ["error_prone_checkerframework_dataflow_errorprone"],
-}
diff --git a/checkerframework/LICENSE b/checkerframework/LICENSE
index 827585f..a462db4 100644
--- a/checkerframework/LICENSE
+++ b/checkerframework/LICENSE
@@ -1,42 +1,45 @@
-The Checker Framework
-Copyright 2004-present by the Checker Framework developers
+The Checker Framework is licensed under the GNU General Public License,
+version 2 (GPL2), with the classpath exception. The text of this license
+appears below. This is the same license used for OpenJDK.
+A few parts of the Checker Framework have more permissive licenses.
-Most of the Checker Framework is licensed under the GNU General Public
-License, version 2 (GPL2), with the classpath exception. The text of this
-license appears below. This is the same license used for OpenJDK.
+ * The annotations are licensed under the MIT License. (The text of this
+ license appears below.) More specifically, all the parts of the Checker
+ Framework that you might want to include with your own program use the
+ MIT License. This is the checker-qual.jar file and all the files that
+ appear in it: every file in a qual/ directory, plus NullnessUtils.java
+ and RegexUtil.java. In addition, the cleanroom implementations of
+ third-party annotations, which the Checker Framework recognizes as
+ aliases for its own annotations, are licensed under the MIT License.
-A few parts of the Checker Framework have more permissive licenses, notably
-the parts that you might want to include with your own program.
+ * The Maven plugin is dual-licensed (you may use whichever you prefer)
+ under GPL2 and the Apache License, version 2.0 (Apache2). The text of
+ Apache2 appears in file maven-plugin/LICENSE.txt. Maven itself uses
+ Apache2.
- * The annotations and utility files are licensed under the MIT License.
- (The text of this license also appears below.) This applies to
- checker-qual*.jar and checker-util.jar and all the files that appear in
- them, which is all files in checker-qual and checker-util directories.
- It also applies to the cleanroom implementations of
- third-party annotations (in checker/src/testannotations/,
- framework/src/main/java/org/jmlspecs/, and
- framework/src/main/java/com/google/).
+ * The Eclipse plugin is dual-licensed (you may use whichever you prefer)
+ under GPL2 and the Eclipse Public License Version 1.0 (EPL). EPL
+ appears http://www.eclipse.org/org/documents/epl-v10.php. Eclipse
+ itself uses EPL.
-The Checker Framework includes annotations for some libraries. Those in
-.astub files use the MIT License. Those in https://github.com/typetools/jdk
-(which appears in the annotated-jdk directory of file checker.jar) use the
-GPL2 license.
+Some external libraries that are included with the Checker Framework have
+different licenses.
-Some external libraries that are included with the Checker Framework
-distribution have different licenses. Here are some examples.
-
- * JavaParser is dual licensed under the LGPL or the Apache license -- you
- may use it under whichever one you want. (The JavaParser source code
+ * javaparser is licensed under the LGPL. (The javaparser source code
contains a file with the text of the GPL, but it is not clear why, since
- JavaParser does not use the GPL.) See
- https://github.com/typetools/stubparser .
+ javaparser does not use the GPL.) See file javaparser/COPYING.LESSER
+ and the source code of all its files.
- * Annotation Tools (https://github.com/typetools/annotation-tools) uses
- the MIT license.
+ * junit is licensed under the Common Public License v1.0 (see
+ http://www.junit.org/license), with parts (Hamcrest) licensed under the
+ BSD License (see LICENSE.txt in checkers/tests/junit.jar ).
- * Libraries in plume-lib (https://github.com/plume-lib/) are licensed
- under the MIT License.
+ * plume-lib is licensed under the MIT License.
+
+The Checker Framework includes annotations for several libraries, in
+directory checkers/jdk/. The only one that uses a different license than
+the GPL is Google Guava, which uses Apache2.
===========================================================================
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index e9f340a..bb2a793 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -11,12 +11,12 @@
}
url {
type: ARCHIVE
- value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/3.21.2/dataflow-errorprone-3.21.2-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: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
}
- version: "3.21.2"
- last_upgrade_date { year: 2022 month: 2 day: 14}
+ version: "3.15.0"
+ last_upgrade_date { year: 2021 month: 8 day: 18}
}
diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar b/checkerframework/dataflow-errorprone-3.15.0-sources.jar
new file mode 100644
index 0000000..0550a67
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar
Binary files differ
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
new file mode 100644
index 0000000..44d8e6b
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0.jar
Binary files differ
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/dataflow-errorprone-3.21.2-sources.jar b/checkerframework/dataflow-errorprone-3.21.2-sources.jar
deleted file mode 100644
index 3581c00..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc b/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc
deleted file mode 100644
index 4bb9a6a..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.68
-
-iQEcBAABAgAGBQJh+YPpAAoJELFmmKSt9NY4aKkIAI3J8GVAkmGh43brn0pkBBMY
-VKWnjJbnG6EIiEQ2MjM+k6ZhRjhAUf+fYdcV04QCj8mu0+BQFKwzgj2eGzlJ+gxM
-H7cucnKqIX+pQstr1AINRXFMh/WCMEU24ftM3CFYgiJf0p944oGJtcuT1ve4aJWg
-aZpu+pWu6wIyL7/7ET9DZ4DMfFniK0a2AVsVEcJmA3czx0FRJL8UcQvuxCYTdtRJ
-3PK6/dZRGb+cqyZPG8p/gDpxF215zWg1aw1UpmAKNWWhoioX7JGC2CVR1tlmS389
-iA2q80BuAMibd4mTnflHF9R57cO2vCjYs4BmAiiqTesmwKj0vPmVxAcAr1mMk10=
-=xH0H
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1 b/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1
deleted file mode 100644
index e02b395..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1e699b6978054bab6e978868fa76686977622637
\ No newline at end of file
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar b/checkerframework/dataflow-errorprone-3.21.2.jar
deleted file mode 100644
index b780b3e..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar.asc b/checkerframework/dataflow-errorprone-3.21.2.jar.asc
deleted file mode 100644
index fc93247..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.68
-
-iQEcBAABAgAGBQJh+YPpAAoJELFmmKSt9NY4/Z4H/252NY7ats4kOuzp1m0Ji+Fi
-e4bZq48yfCbhbKqKtl5y3aFowrTmLzaY2/YGotZ3eMTnZtG59pVjhrqV04XhG4mM
-Mjh9P56uSOSBherl648TrIYc7Clz2os3OCDjoaoEfzy5VCuA0OVKq2URjKDjrM3B
-Om5rIdFGdi6Er5RL7svXtjEcvVMvg0TEMBZAhmKikR4wkG/g1FTO6zs0xermINo7
-Vswvi639D/HLfhpTs9lWfaUZk6cb+WNmkwx7+F3r8AbtyBby51/hSk6GIDAyic7q
-CLVUXg9xR2pFRGza2s/kdZl9EOAEMEQFNGO2V44hWc/XX5pY3pkdeqHlSV+nv7s=
-=mA14
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar.sha1 b/checkerframework/dataflow-errorprone-3.21.2.jar.sha1
deleted file mode 100644
index 16db4fd..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0596b27bcfcdfb2e68ea53c55abb6b2be9991b7c
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.15.0-sources.jar b/checkerframework/javacutil-3.15.0-sources.jar
new file mode 100644
index 0000000..564a49e
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0-sources.jar
Binary files differ
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
new file mode 100644
index 0000000..601ca3d
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0.jar
Binary files differ
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/checkerframework/nullaway-jarjar-rules.txt b/checkerframework/nullaway-jarjar-rules.txt
deleted file mode 100644
index b8b72a2..0000000
--- a/checkerframework/nullaway-jarjar-rules.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Replace all errorprone packages with nullaway packages
-rule org.checkerframework.errorprone.** org.checkerframework.nullaway.@1
diff --git a/error_prone/METADATA b/error_prone/METADATA
index fe93c0a..7ce0737 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,8 +10,8 @@
}
url {
type: ARCHIVE
- value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.11.0/error_prone_core-2.11.0-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"
}
- version: "2.11.0"
- last_upgrade_date { year: 2022 month: 2 day: 14}
+ version: "2.8.1"
+ last_upgrade_date { year: 2021 month: 8 day: 18}
}
diff --git a/error_prone/error_prone_annotations-2.11.0.jar b/error_prone/error_prone_annotations-2.11.0.jar
deleted file mode 100644
index bec7656..0000000
--- a/error_prone/error_prone_annotations-2.11.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.11.0.jar.asc b/error_prone/error_prone_annotations-2.11.0.jar.asc
deleted file mode 100644
index e6e8e96..0000000
--- a/error_prone/error_prone_annotations-2.11.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSekACgkQmiWcfuY2
-xe0iHg//TcYXZFyLsObcxRq7n8CZ+byPJzytaddqts4buPlp1CDP6gUnKSQhHcnn
-IqVkLvNT8vylpNffqpVLHG6TVtwBln3iiFzIa+6pXLsZW2bPcWvFX2M6mKNeD39b
-lzIU2n9pOBsmGUi4uehajknAMtOi3tjeoOaqCQbjiH/lAfICwIO95MgoAO6rRA/0
-CrhuDgmhi/CoVfkxGRejnaXhKsrolr0CWr06Y78VEgciAJ/UqHWkIrf2oEoD6bdn
-IPnV2JsXqlsXHyoZcfw9f9k6r+CJh0oo8sUMSbx/mTwNdKCzw1wsQ6ZKrAuRlAuw
-IogI225Yp4DJaefs7/MKdJEhC2vHPajUZOVY3lFr3WHrVI0mt6/PKkCOCQ2VJSlr
-xwOZ5/mGFm8r4OnwTKgPnIXrKIyOPqiD/lsrGy1tTVvMlYd0cv6HlW/U7d9tlTCg
-caYEtoxR1Y14OMYQY8uL5Yoqr29Dq6lpSURVy0FtCqyxoDwnf7sxM8pHku/8FsC3
-G1pUu8k75mFV6aLtlYB3H1OxnIRLLvrRK5qkcWEhZngMjLmqQ5C4BfE2Ojnqeghe
-gawvFsp7rJEZPL0vzoEgGwcABIVs+FMFX/wbOb5vgUy3tU8niIaXnro43IsIGD+/
-nceva2aRKdfIYcsHJs1BqnC7U3Ony+hGrZM09dY5gCiPDgsYjlo=
-=gxdE
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.11.0.jar.sha1 b/error_prone/error_prone_annotations-2.11.0.jar.sha1
deleted file mode 100644
index d319352..0000000
--- a/error_prone/error_prone_annotations-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5a0ace696d3f8b1c1d8cc036d8c03cc0cbe6b69
\ 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
new file mode 100644
index 0000000..106baea
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.8.1.jar
Binary files differ
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.11.0-with-dependencies.jar b/error_prone/error_prone_core-2.11.0-with-dependencies.jar
deleted file mode 100644
index 1007701..0000000
--- a/error_prone/error_prone_core-2.11.0-with-dependencies.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc
deleted file mode 100644
index 31d8568..0000000
--- a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSqQACgkQmiWcfuY2
-xe3vMA/+NDnhFX2fwdGEoUbfszqN/yEtAicCeoiG8TwUA4QmJB1Htmf8+9U2SjO2
-Sgw7sJRGB6G9TR62oR0d0xmmYA92yha7v47jgli4zZd+zB+EcI9Lx4eh4l0WtWOM
-ldeeU5Fcztp72JQ9La7dIfcmIf0isdWMvVe381EFNqQ0DqMeArzuHNRrGOY04vKT
-1JxgDSMH8jhjP2kTqXlfPisoV0iizef2PuImFSvJ1mktbYyvJBu9uYZWTmyD1dwh
-bkuh9NZWXi5bHV0FAjKuUq9SxL3OpQc63rg7oz1WG513XanFDBpGVUIhETttgcOC
-JtbPxqy1C3jLT4JEtPlbw5/D3VBIufuEIlJCrDlL+nYmQGxo8T0v8SSq7nE2AhHz
-UqiNB2o1dDOEJc7Cdyj6ZKLmlsGwQfZg5FW4jJS8UA00t8//OOH85TFvr4YpxOWY
-vXncUXau5EEhhIacEzs6yPUMeU3xjjGCr/Zd9tu1RrRnlF8iC5tJxl5faO2kLbv4
-8UtRMnI+dzHnx7g8XBA9NdKZfdUMj6zqa9X1oYLElRXQb3f+Tjykw1pVcF6TIZ+n
-NJIFRSWTe7RbKHr3GeHzHUHZfIyW10HK3fCpOo64Jrr2uXm3U7zgaz2J7JP7ExuH
-AN8dGgG1wDTY1ifzLDJYMyB/5N5034rbWhfwNZMnKV+0qeCHMy8=
-=6+Xp
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1
deleted file mode 100644
index 310674f..0000000
--- a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eac2380d91c632aaa762c35b6c2e7456a155c992
\ 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
new file mode 100644
index 0000000..b0ab3b1
--- /dev/null
+++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar
Binary files differ
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.11.0.jar b/error_prone/error_prone_test_helpers-2.11.0.jar
deleted file mode 100644
index 696c86e..0000000
--- a/error_prone/error_prone_test_helpers-2.11.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_test_helpers-2.11.0.jar.asc b/error_prone/error_prone_test_helpers-2.11.0.jar.asc
deleted file mode 100644
index b19760c..0000000
--- a/error_prone/error_prone_test_helpers-2.11.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSgYACgkQmiWcfuY2
-xe1QARAAmkZ/jK0uCOISac2IUNGIdaPmksrBtyJIoMBN1e5hobEDWxedMNUl5x90
-ngBQJhKNv1Q4kyuopLrVkMRxuUQzQZBTaf8hA8QpHbhQSXPWjhc46S+VSF6o9JJO
-7W3dCwxd/1meebsFOi1sqH2r5r1l8N13J6z62dGex32qv/HpX1KQwMN3S7+rCXAI
-wVh1RSR6ZfayfTUDTgJr13mgQnRyLdFLYHRH/gtvswhmscE1B10jUvpko+2DUpQz
-6blEqGm+ple/h9vuTincTkR610mM0jZNI2hKkKPezULyfdZwV9LRV2k3K7acwv+f
-Uqkxojq3zpYxeGVD9z8TefuFegBTV6mRG65aIKk2fWgPicK2RM98T4kz2AgFPHBv
-y38TWxaXN36hEJrTxkshkFTHTC5swuXBvzHKJFJvhG+8c/01sZkcdMZmk3V8U1Yt
-tDDXfcIuIk3gviuqf+9hBaY0B4Fy3PAfOo1P0J3co/CG6OtjQ8bPXn+uu0g68hFb
-fCz5WxmbY4/YqSXHa7q3FMI8JvnhAn6NF14bumpIj2bq7jN3LkejlTYvzH1rOKv4
-iiCgFOXc7/pggQiJp7ySFHFkEN4O7evQAF/+TF8xBlgeRaNT5OVTXeVcDXUQSRLj
-kSY2KLuDGw8pIvdxwiqv6DuGPezICJ9B5mFv8IUD+PmrZGh3TTA=
-=vZ5F
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.11.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.11.0.jar.sha1
deleted file mode 100644
index e20e2cb..0000000
--- a/error_prone/error_prone_test_helpers-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a651fdd44623e35887b70313687bfecbc23dd623
\ 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
new file mode 100644
index 0000000..9771492
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.8.1.jar
Binary files differ
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.11.0.jar b/error_prone/error_prone_type_annotations-2.11.0.jar
deleted file mode 100644
index cd58836..0000000
--- a/error_prone/error_prone_type_annotations-2.11.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.11.0.jar.asc b/error_prone/error_prone_type_annotations-2.11.0.jar.asc
deleted file mode 100644
index f4a401a..0000000
--- a/error_prone/error_prone_type_annotations-2.11.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSgwACgkQmiWcfuY2
-xe2pUA//cCgg1sOriWDyHihZkvDAL3bRhQArBXauBWEqoh5dE1muNvgIfOuVFN1a
-PaXUUs0V1KzirnSw9JORgCvLm/IMH9YILQK9qTN/piRWQ61zwU0gCBCPYAllj4HJ
-aRbcWYNKj1QsKvJACOanETI5X++OEThajTYD1/L8ovICSotmesAa/1fqB60iYyDj
-xleN8336gqMbcAWoux4P0db3jBzahZPy8mYJqXM+csyTyO4pQGIRuLL8dRHcJGov
-PDBZZjgYe+nB6lfgZBC1YzbnCl9z9oQO5OG73/DI7/UHwQJ3wNLfBdPZMA2wfxfZ
-xcloamxYaTU09bp0buTRplI6sDZ+k5EvzrJpgHislNxDZ+ljhVFl9cVFKm1QBKzV
-WuWEZoL8pOrrjCSVdJzny0DWZDPnYnBKRYSbF9MZp9pBYmQnPDskSIFbGD24Z0VZ
-KQR7SUBqMqIcqWctl1YbQbQuW3eDGn/YqY2vI/Zad3DcscdnHfs2To5+zZjkdUpL
-VVUpjn8D8aJBoyd5Ta+TS5bPQP+GOul26oomUx8hFy9sFwUzfrI0zoxVITPKzCVO
-QAZwt+PK86wKjApMUCkHHxN+mJg+QVJ1rP7k3RaJl/UcS9yVduA2PrHBmBBLhQi3
-0QtW8ThaXM42We3s3Aun9jsLWU5ioq548V5N/X+6Hjql6z3podw=
-=2Wu9
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.11.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.11.0.jar.sha1
deleted file mode 100644
index 0e8fe5b..0000000
--- a/error_prone/error_prone_type_annotations-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-769ac47aa8ac186e7193731e03ce83140094f145
\ 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
new file mode 100644
index 0000000..9e1f977
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.8.1.jar
Binary files differ
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/jFormatString/Android.bp b/jFormatString/Android.bp
deleted file mode 100644
index cba341b..0000000
--- a/jFormatString/Android.bp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["external_error_prone_jFormatString_license"],
-}
-
-license {
- name: "external_error_prone_jFormatString_license",
- package_name: "Google Error Prone jFormatString",
- license_kinds: [
- "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
- ],
- license_text: ["LICENSE"],
-}
-
-java_import {
- name: "error_prone_jFormatString",
- host_supported: true,
- jars: ["jFormatString-3.0.0.jar"],
-}
diff --git a/javac/Android.bp b/javac/Android.bp
deleted file mode 100644
index d9d74b8..0000000
--- a/javac/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["external_error_prone_javac_license"],
-}
-
-license {
- name: "external_error_prone_javac_license",
- package_name: "Google Error Prone javac",
- license_kinds: ["SPDX-license-identifier-GPL-2.0-with-classpath-exception"],
- license_text: ["LICENSE"],
-}
-
-java_import {
- name: "error_prone_javac",
- host_supported: true,
- jars: ["javac-9+181-r4173-1.jar"],
-}
diff --git a/javac/METADATA b/javac/METADATA
index 7da1003..9036623 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@
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: 2022 month: 2 day: 14}
+ last_upgrade_date { year: 2021 month: 8 day: 18}
}
diff --git a/jimfs/Android.bp b/jimfs/Android.bp
index 92dc153..e69de29 100644
--- a/jimfs/Android.bp
+++ b/jimfs/Android.bp
@@ -1,30 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["external_error_prone_jimfs_license"],
-}
-
-license {
- name: "external_error_prone_jimfs_license",
- package_name: "Google Error Prone jimfs",
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["LICENSE"],
-}
-
-java_import {
- name: "error_prone_jimfs",
- host_supported: true,
- jars: ["jimfs-1.1.jar"],
-}
diff --git a/soong/error_prone.go b/soong/error_prone.go
index b2ba96d..d3c4409 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,10 +22,11 @@
// 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.11.0-with-dependencies.jar",
- "external/error_prone/error_prone/error_prone_annotations-2.11.0.jar",
- "external/error_prone/error_prone/error_prone_type_annotations-2.11.0.jar",
- "external/error_prone/checkerframework/dataflow-errorprone-3.21.2.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",
}
@@ -61,6 +62,7 @@
"-Xep:GuiceAssistedParameters:ERROR",
"-Xep:GuiceInjectOnFinalField:ERROR",
"-Xep:Immutable:ERROR",
+ "-Xep:ImmutableModification:ERROR",
"-Xep:IncompatibleArgumentType:ERROR",
"-Xep:IndexOfChar:ERROR",
"-Xep:InexactVarargsConditional:ERROR",
@@ -159,6 +161,7 @@
"-Xep:ProtoFieldNullComparison:WARN",
"-Xep:RandomModInteger:WARN",
"-Xep:RectIntersectReturnValueIgnored:WARN",
+ "-Xep:RemovedInJDK11:WARN",
"-Xep:ReturnValueIgnored:WARN",
"-Xep:SelfAssignment:WARN",
"-Xep:SelfComparison:WARN",
@@ -169,10 +172,236 @@
"-Xep:UnnecessaryCheckNotNull:WARN",
"-Xep:UnusedCollectionModifiedInPlace:WARN",
"-Xep:XorPower:WARN",
+
+ // Errorprone default severity WARNING
+ // "-Xep:AmbiguousMethodReference:WARN",
+ // "-Xep:ArgumentSelectionDefectChecker:WARN",
+ // "-Xep:ArrayAsKeyOfSetOrMap:WARN",
+ // "-Xep:AssertEqualsArgumentOrderChecker:WARN",
+ // "-Xep:AssertThrowsMultipleStatements:WARN",
+ // "-Xep:AssertionFailureIgnored:WARN",
+ // "-Xep:AutoValueFinalMethods:WARN",
+ // "-Xep:BadAnnotationImplementation:WARN",
+ // "-Xep:BadComparable:WARN",
+ // "-Xep:BadImport:WARN",
+ // "-Xep:BadInstanceof:WARN",
+ // "-Xep:BigDecimalEquals:WARN",
+ // "-Xep:BigDecimalLiteralDouble:WARN",
+ // "-Xep:BoxedPrimitiveConstructor:WARN",
+ // "-Xep:ByteBufferBackingArray:WARN",
+ // "-Xep:CannotMockFinalClass:WARN",
+ // "-Xep:CanonicalDuration:WARN",
+ // "-Xep:CatchAndPrintStackTrace:WARN",
+ // "-Xep:CatchFail:WARN",
+ // "-Xep:ClassCanBeStatic:WARN",
+ // "-Xep:ClassNewInstance:WARN",
+ // "-Xep:CloseableProvides:WARN",
+ // "-Xep:CollectionToArraySafeParameter:WARN",
+ // "-Xep:CollectorShouldNotUseState:WARN",
+ // "-Xep:ComparableAndComparator:WARN",
+ // "-Xep:DateFormatConstant:WARN",
+ // "-Xep:DefaultCharset:WARN",
+ // "-Xep:DeprecatedThreadMethods:WARN",
+ // "-Xep:DoubleBraceInitialization:WARN",
+ // "-Xep:DoubleCheckedLocking:WARN",
+ // "-Xep:EqualsGetClass:WARN",
+ // "-Xep:EqualsHashCode:WARN",
+ // "-Xep:EqualsIncompatibleType:WARN",
+ // "-Xep:EqualsUnsafeCast:WARN",
+ // "-Xep:EqualsUsingHashCode:WARN",
+ // "-Xep:ExtendingJUnitAssert:WARN",
+ // "-Xep:FallThrough:WARN",
+ // "-Xep:Finally:WARN",
+ // "-Xep:FloatCast:WARN",
+ // "-Xep:FloatingPointAssertionWithinEpsilon:WARN",
+ // "-Xep:FloatingPointLiteralPrecision:WARN",
+ // "-Xep:FragmentInjection:WARN",
+ // "-Xep:FragmentNotInstantiable:WARN",
+ // "-Xep:FutureReturnValueIgnored:WARN",
+ // "-Xep:GetClassOnEnum:WARN",
+ // "-Xep:HidingField:WARN",
+ // "-Xep:ImmutableAnnotationChecker:WARN",
+ // "-Xep:ImmutableEnumChecker:WARN",
+ // "-Xep:IncompatibleModifiers:WARN",
+ // "-Xep:InconsistentCapitalization:WARN",
+ // "-Xep:InconsistentHashCode:WARN",
+ // "-Xep:IncrementInForLoopAndHeader:WARN",
+ // "-Xep:InjectOnConstructorOfAbstractClass:WARN",
+ // "-Xep:InputStreamSlowMultibyteRead:WARN",
+ // "-Xep:InstanceOfAndCastMatchWrongType:WARN",
+ // "-Xep:IntLongMath:WARN",
+ // "-Xep:IterableAndIterator:WARN",
+ // "-Xep:JUnit3FloatingPointComparisonWithoutDelta:WARN",
+ // "-Xep:JUnit4ClassUsedInJUnit3:WARN",
+ // "-Xep:JUnitAmbiguousTestClass:WARN",
+ // "-Xep:JavaLangClash:WARN",
+ // "-Xep:JdkObsolete:WARN",
+ // "-Xep:LockNotBeforeTry:WARN",
+ // "-Xep:LogicalAssignment:WARN",
+ // "-Xep:MathAbsoluteRandom:WARN",
+ // "-Xep:MissingCasesInEnumSwitch:WARN",
+ // "-Xep:MissingFail:WARN",
+ // "-Xep:MissingOverride:WARN",
+ // "-Xep:ModifiedButNotUsed:WARN",
+ // "-Xep:ModifyCollectionInEnhancedForLoop:WARN",
+ // "-Xep:MultipleParallelOrSequentialCalls:WARN",
+ // "-Xep:MutableConstantField:WARN",
+ // "-Xep:NarrowingCompoundAssignment:WARN",
+ // "-Xep:NestedInstanceOfConditions:WARN",
+ // "-Xep:NonAtomicVolatileUpdate:WARN",
+ // "-Xep:NonOverridingEquals:WARN",
+ // "-Xep:NullableConstructor:WARN",
+ // "-Xep:NullablePrimitive:WARN",
+ // "-Xep:NullableVoid:WARN",
+ // "-Xep:ObjectToString:WARN",
+ // "-Xep:ObjectsHashCodePrimitive:WARN",
+ // "-Xep:OperatorPrecedence:WARN",
+ // "-Xep:OptionalNotPresent:WARN",
+ // "-Xep:OrphanedFormatString:WARN",
+ // "-Xep:OverrideThrowableToString:WARN",
+ // "-Xep:Overrides:WARN",
+ // "-Xep:OverridesGuiceInjectableMethod:WARN",
+ // "-Xep:ParameterName:WARN",
+ // "-Xep:PreconditionsInvalidPlaceholder:WARN",
+ // "-Xep:ProtoRedundantSet:WARN",
+ // "-Xep:QualifierOrScopeOnInjectMethod:WARN",
+ // "-Xep:ReachabilityFenceUsage:WARN",
+ // "-Xep:ReferenceEquality:WARN",
+ // "-Xep:RequiredModifiers:WARN",
+ // "-Xep:ShortCircuitBoolean:WARN",
+ // "-Xep:StaticGuardedByInstance:WARN",
+ // "-Xep:StreamResourceLeak:WARN",
+ // "-Xep:StringSplitter:WARN",
+ // "-Xep:SwigMemoryLeak:WARN",
+ // "-Xep:SynchronizeOnNonFinalField:WARN",
+ // "-Xep:ThreadJoinLoop:WARN",
+ // "-Xep:ThreadLocalUsage:WARN",
+ // "-Xep:ThreadPriorityCheck:WARN",
+ // "-Xep:ThreeLetterTimeZoneID:WARN",
+ // "-Xep:ToStringReturnsNull:WARN",
+ // "-Xep:TruthAssertExpected:WARN",
+ // "-Xep:TruthConstantAsserts:WARN",
+ // "-Xep:TruthIncompatibleType:WARN",
+ // "-Xep:TypeNameShadowing:WARN",
+ // "-Xep:TypeParameterShadowing:WARN",
+ // "-Xep:TypeParameterUnusedInFormals:WARN",
+ // "-Xep:URLEqualsHashCode:WARN",
+ // "-Xep:UndefinedEquals:WARN",
+ // "-Xep:UnnecessaryParentheses:WARN",
+ // "-Xep:UnsafeFinalization:WARN",
+ // "-Xep:UnsafeReflectiveConstructionCast:WARN",
+ // "-Xep:UnsynchronizedOverridesSynchronized:WARN",
+ // "-Xep:UseCorrectAssertInTests:WARN",
+ // "-Xep:VariableNameSameAsType:WARN",
+ // "-Xep:WaitNotInLoop:WARN",
+ // "-Xep:WakelockReleasedDangerously:WARN",
+
+ // Errorprone default severity SUGGESTION
}
- // The checks that are default-disabled
+ // The checks that are default-disabled and listed for completeness
+ // and simple experiments.
config.ErrorProneChecksDefaultDisabled = []string{
+ // Errorprone default severity ERROR
+ // "-Xep:AndroidJdkLibsChecker:ERROR",
+ // "-Xep:AssistedInjectAndInjectOnSameConstructor:ERROR",
+ // "-Xep:AutoFactoryAtInject:ERROR",
+ // "-Xep:ClassName:ERROR",
+ // "-Xep:ComparisonContractViolated:ERROR",
+ // "-Xep:DepAnn:ERROR",
+ // "-Xep:DivZero:ERROR",
+ // "-Xep:EmptyIf:ERROR",
+ // "-Xep:FuzzyEqualsShouldNotBeUsedInEqualsMethod:ERROR",
+ // "-Xep:InjectInvalidTargetingOnScopingAnnotation:ERROR",
+ // "-Xep:InjectMoreThanOneQualifier:ERROR",
+ // "-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass:ERROR",
+ // "-Xep:InjectScopeOrQualifierAnnotationRetention:ERROR",
+ // "-Xep:InjectedConstructorAnnotations:ERROR",
+ // "-Xep:InsecureCryptoUsage:ERROR",
+ // "-Xep:IterablePathParameter:ERROR",
+ // "-Xep:JMockTestWithoutRunWithOrRuleAnnotation:ERROR",
+ // "-Xep:Java7ApiChecker:ERROR",
+ // "-Xep:JavaxInjectOnFinalField:ERROR",
+ // "-Xep:LockMethodChecker:ERROR",
+ // "-Xep:LongLiteralLowerCaseSuffix:ERROR",
+ // "-Xep:NoAllocation:ERROR",
+ // "-Xep:NumericEquality:ERROR",
+ // "-Xep:ParameterPackage:ERROR",
+ // "-Xep:RestrictTo:ERROR",
+ // "-Xep:StaticOrDefaultInterfaceMethod:ERROR",
+ // "-Xep:UnlockMethod:ERROR",
+
+ // Errorprone default severity WARNING
+ // "-Xep:AnnotateFormatMethod:WARN",
+ // "-Xep:AnnotationPosition:WARN",
+ // "-Xep:AssertFalse:WARN",
+ // "-Xep:AssistedInjectAndInjectOnConstructors:WARN",
+ // "-Xep:BinderIdentityRestoredDangerously:WARN",
+ // "-Xep:BindingToUnqualifiedCommonType:WARN",
+ // "-Xep:ConstructorInvokesOverridable:WARN",
+ // "-Xep:ConstructorLeaksThis:WARN",
+ // "-Xep:EmptyTopLevelDeclaration:WARN",
+ // "-Xep:EqualsBrokenForNull:WARN",
+ // "-Xep:ExpectedExceptionChecker:WARN",
+ // "-Xep:FunctionalInterfaceClash:WARN",
+ // "-Xep:HardCodedSdCardPath:WARN",
+ // "-Xep:InconsistentOverloads:WARN",
+ // "-Xep:InvalidParam:WARN",
+ // "-Xep:InvalidTag:WARN",
+ // "-Xep:InvalidThrows:WARN",
+ // "-Xep:MissingDefault:WARN",
+ // "-Xep:MutableMethodReturnType:WARN",
+ // "-Xep:NoFunctionalReturnType:WARN",
+ // "-Xep:NonCanonicalStaticMemberImport:WARN",
+ // "-Xep:NullableDereference:WARN",
+ // "-Xep:PrimitiveArrayPassedToVarargsMethod:WARN",
+ // "-Xep:ProtosAsKeyOfSetOrMap:WARN",
+ // "-Xep:ProvidesFix:WARN",
+ // "-Xep:QualifierWithTypeUse:WARN",
+ // "-Xep:RedundantThrows:WARN",
+ // "-Xep:ReturnFromVoid:WARN",
+ // "-Xep:StaticQualifiedUsingExpression:WARN",
+ // "-Xep:StringEquality:WARN",
+ // "-Xep:SystemExitOutsideMain:WARN",
+ // "-Xep:TestExceptionChecker:WARN",
+ // "-Xep:UnnecessaryDefaultInEnumSwitch:WARN",
+ // "-Xep:Unused:WARN",
+ // "-Xep:UnusedException:WARN",
+ // "-Xep:Var:WARN",
+
+ // Errorprone default severity SUGGESTION
+ // "-Xep:BooleanParameter:SUGGESTION",
+ // "-Xep:ClassNamedLikeTypeParameter:SUGGESTION",
+ // "-Xep:ConstantField:SUGGESTION",
+ // "-Xep:EmptySetMultibindingContributions:SUGGESTION",
+ // "-Xep:ExpectedExceptionRefactoring:SUGGESTION",
+ // "-Xep:FieldCanBeFinal:SUGGESTION",
+ // "-Xep:FieldMissingNullable:SUGGESTION",
+ // "-Xep:ImmutableRefactoring:SUGGESTION",
+ // "-Xep:LambdaFunctionalInterface:SUGGESTION",
+ // "-Xep:MethodCanBeStatic:SUGGESTION",
+ // "-Xep:MixedArrayDimensions:SUGGESTION",
+ // "-Xep:MultiVariableDeclaration:SUGGESTION",
+ // "-Xep:MultipleTopLevelClasses:SUGGESTION",
+ // "-Xep:MultipleUnaryOperatorsInMethodCall:SUGGESTION",
+ // "-Xep:PackageLocation:SUGGESTION",
+ // "-Xep:ParameterComment:SUGGESTION",
+ // "-Xep:ParameterNotNullable:SUGGESTION",
+ // "-Xep:PrivateConstructorForNoninstantiableModule:SUGGESTION",
+ // "-Xep:PrivateConstructorForUtilityClass:SUGGESTION",
+ // "-Xep:RemoveUnusedImports:SUGGESTION",
+ // "-Xep:ReturnMissingNullable:SUGGESTION",
+ // "-Xep:ScopeOnModule:SUGGESTION",
+ // "-Xep:SwitchDefault:SUGGESTION",
+ // "-Xep:TestExceptionRefactoring:SUGGESTION",
+ // "-Xep:ThrowsUncheckedException:SUGGESTION",
+ // "-Xep:TryFailRefactoring:SUGGESTION",
+ // "-Xep:TypeParameterNaming:SUGGESTION",
+ // "-Xep:UngroupedOverloads:SUGGESTION",
+ // "-Xep:UnnecessarySetDefault:SUGGESTION",
+ // "-Xep:UnnecessaryStaticImport:SUGGESTION",
+ // "-Xep:UseBinds:SUGGESTION",
+ // "-Xep:WildcardImport:SUGGESTION",
}
config.ErrorProneChecksOff = []string{
@@ -190,6 +419,11 @@
// 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",
diff --git a/update.sh b/update.sh
index db399d5..c5c4af9 100755
--- a/update.sh
+++ b/update.sh
@@ -22,6 +22,8 @@
JAVAC_SOURCES_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_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 {
@@ -50,15 +52,6 @@
update_jar "${JAVAC_VERSION}" "${JAVAC_SOURCES_JAR_URL}" "${TOOLS_DIR}/javac"
update_jar "${JAVAC_VERSION}" "${JAVAC_JAR_URL}" "${TOOLS_DIR}/javac"
-# Update the versions in the build file
-perl -pi -e "\
- s|\"(javac/javac).*\"|\"\\1-${JAVAC_VERSION}.jar\"|;\
- s|\"(error_prone/error_prone_core).*\"|\"\\1-${EP_VERSION}-with-dependencies.jar\"|;\
- s|\"(error_prone/error_prone_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
- s|\"(error_prone/error_prone_type_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
- s|\"(error_prone/error_prone_test_helpers).*\"|\"\\1-${EP_VERSION}.jar\"|;\
-" "$TOOLS_DIR/Android.bp"
-
# Update the versions for soong
perl -pi -e "\
s|\"(external/error_prone/javac/javac).*\"|\"\\1-${JAVAC_VERSION}.jar\"|;\
@@ -72,8 +65,10 @@
rm -f checkerframework/*.jar*
update_jar "${CF_VERSION}" "${CF_DATAFLOW_JAR_URL}" "${TOOLS_DIR}/checkerframework"
update_jar "${CF_VERSION}" "${CF_DATAFLOW_SOURCES_JAR_URL}" "${TOOLS_DIR}/checkerframework"
+ 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-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;\
+ s|\"(external/error_prone/checkerframework/javacutil).*\"|\"\\1-${CF_VERSION}.jar\"|;\
" "$TOOLS_DIR/soong/error_prone.go"
- perl -pi -e "s|\"(dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;" "${TOOLS_DIR}/checkerframework/Android.bp"
fi
