Snap for 11315376 from cbc1b8eda862ba707d62aeb235c8cf9d5664ca13 to androidx-wear-tiles-release
Change-Id: Ica18f701721b834641f30f2813e0dbc74bcff00b
diff --git a/LICENSE b/LICENSE
index c6ed510..19e3071 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,13 +2,13 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-[This is the first released version of the Lesser GPL. It also counts
+(This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
+ the version number 2.1.)
Preamble
@@ -55,7 +55,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -146,7 +146,7 @@
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -456,7 +456,7 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
@@ -470,8 +470,8 @@
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ {description}
+ Copyright (C) {year} {fullname}
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -485,7 +485,8 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
Also add information on how to contact you by electronic and paper mail.
@@ -494,9 +495,10 @@
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+ library `Frob' (a library for tweaking knobs) written by James Random
+ Hacker.
- <signature of Ty Coon>, 1 April 1990
+ {signature of Ty Coon}, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
diff --git a/README.md b/README.md
index 7888a4f..c8d5db2 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@
A development tool to help programmers write Java code that adheres to a
coding standard.
-* URL: https://checkstyle.sourceforge.io/
-* Version: 7.4-SNAPSHOT
+* URL: https://checkstyle.sourceforge.io
+* Version: 10.12.3
* License: LGPL 2.1
* License File: LICENSE
-* Source repo: https://android.googlesource.com/platform/external/checkstyle
+* Source repo: https://github.com/checkstyle/checkstyle
### Git-Lint
diff --git a/checkstyle.jar b/checkstyle.jar
index 747b3e3..8a9e2d1 100644
--- a/checkstyle.jar
+++ b/checkstyle.jar
Binary files differ
diff --git a/checkstyle.py b/checkstyle.py
index 06e2390..c32943d 100755
--- a/checkstyle.py
+++ b/checkstyle.py
@@ -65,7 +65,7 @@
SKIPPED_RULES_FOR_TEST_FILES = ['com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck',
'com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck']
SUBPATH_FOR_TEST_FILES = ['/tests/', '/test/', '/androidTest/', '/perftests/', '/gts-tests/',
- '/hostsidetests/', '/jvmTest/']
+ '/hostsidetests/', '/jvmTest/', '/robotests/']
SUBPATH_FOR_TEST_DATA_FILES = _FindFoldersContaining(git.repository_root(),
'IGNORE_CHECKSTYLE')
ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n'
@@ -177,7 +177,9 @@
checkstyle_env['JAVA_CMD'] = 'java'
try:
- check = subprocess.Popen(['java', '-cp', classpath,
+ check = subprocess.Popen(['java',
+ '-Dcheckstyle.enableExternalDtdLoad=true',
+ '-cp', classpath,
'com.puppycrawl.tools.checkstyle.Main', '-c',
config_xml, '-f', 'xml'] + java_files,
stdout=subprocess.PIPE, env=checkstyle_env,
diff --git a/default-javadoc-checks.xml b/default-javadoc-checks.xml
index b17f2c6..113f119 100644
--- a/default-javadoc-checks.xml
+++ b/default-javadoc-checks.xml
@@ -23,10 +23,15 @@
</module>
<module name="JavadocMethod">
<property name="severity" value="error"/>
+ <property name="tokens" value="METHOD_DEF"/>
+ <property name="validateThrows" value="false"/>
+ <property name="allowMissingParamTags" value="true"/>
+ <property name="allowMissingReturnTag" value="true"/>
+</module>
+<module name="MissingJavadocMethod">
<property name="scope" value="public"/>
<property name="tokens" value="METHOD_DEF"/>
- <property name="allowMissingParamTags" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
- <property name="allowMissingReturnTag" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
+ <property name="allowedAnnotations" value="Override,Test,Before,After,Parameterized.Parameters"/>
+ <property name="ignoreMethodNamesRegex" value="^test.*$"/>
</module>
diff --git a/default-module-checks.xml b/default-module-checks.xml
index 920a4ec..d82143d 100644
--- a/default-module-checks.xml
+++ b/default-module-checks.xml
@@ -19,6 +19,11 @@
<module name="FileTabCharacter">
<property name="severity" value="error"/>
</module>
+<module name="LineLength">
+ <property name="severity" value="error"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|^ *\*? \{@link .*$"/>
+ <property name="max" value="100"/>
+</module>
<module name="NewlineAtEndOfFile">
<property name="severity" value="error"/>
</module>
diff --git a/default-treewalker-checks.xml b/default-treewalker-checks.xml
index c605ac8..62f40c0 100644
--- a/default-treewalker-checks.xml
+++ b/default-treewalker-checks.xml
@@ -81,11 +81,6 @@
<property name="format" value="^m|s|((([ms][a-z0-9])|([a-ln-rt-z]))[a-zA-Z0-9]*)$"/>
<message key="name.invalidPattern" value="Local variables should be camel-cased (e.g. int minWidth = 4)."/>
</module>
-<module name="LineLength">
- <property name="severity" value="error"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|^ *\*? \{@link .*$"/>
- <property name="max" value="100"/>
-</module>
<module name="LeftCurly">
<property name="severity" value="error"/>
</module>
@@ -159,10 +154,12 @@
<module name="ImportOrder">
<property name="severity" value="error"/>
<message key="import.ordering" value="Wrong order for {0} import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statements"/>
- <property name="groups" value="android, androidx, com.android, dalvik, com, dagger, gov, io, junit, libcore, net, kotlin, org, java, javax"/>
+ <property name="groups" value="android, androidx, com.android, dalvik, com, dagger, gov, io, junit, junitparams, libcore, net, kotlin, org, perfetto, java, javax"/>
<property name="ordered" value="true"/>
<property name="option" value="top"/>
<property name="separated" value="true"/>
+ <property name="separatedStaticGroups" value="true"/>
+ <property name="staticGroups" value="android, androidx, com.android, dalvik, com, dagger, gov, io, junit, junitparams, libcore, net, kotlin, org, perfetto, java, javax"/>
</module>
<module name="Indentation">
<property name="severity" value="error"/>
@@ -211,7 +208,6 @@
<module name="OuterTypeFilename">
<property name="severity" value="error"/>
</module>
-<module name="FileContentsHolder"/>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE:OFF IndentationCheck"/>
<property name="onCommentFormat" value="CHECKSTYLE:ON IndentationCheck"/>
