Snap for 11741764 from 969e142daaa75a2a192f1086984609fcbb7ae654 to androidx-vectordrawable-release
Change-Id: Ib1d6417657498fc5d25c5e96a70494f3961ce388
diff --git a/default-javadoc-checks.xml b/default-javadoc-checks.xml
index 113f119..bafedab 100644
--- a/default-javadoc-checks.xml
+++ b/default-javadoc-checks.xml
@@ -32,6 +32,6 @@
<property name="scope" value="public"/>
<property name="tokens" value="METHOD_DEF"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
- <property name="allowedAnnotations" value="Override,Test,Before,After,Parameterized.Parameters"/>
+ <property name="allowedAnnotations" value="Override,Test,Before,After,Parameterized.Parameters,BeforeClass,AfterClass"/>
<property name="ignoreMethodNamesRegex" value="^test.*$"/>
</module>
diff --git a/default-treewalker-checks.xml b/default-treewalker-checks.xml
index 4c75318..9a58e5f 100644
--- a/default-treewalker-checks.xml
+++ b/default-treewalker-checks.xml
@@ -154,12 +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, junitparams, libcore, net, kotlin, org, perfetto, vendor, java, javax"/>
+ <property name="groups" value="android, androidx, com.android, dalvik, com, dagger, gov, io, junit, junitparams, libcore, net, kotlin, kotlinx, org, perfetto, vendor, 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"/>
+ <property name="staticGroups" value="android, androidx, com.android, dalvik, com, dagger, gov, io, junit, junitparams, libcore, net, kotlin, kotlinx, org, perfetto, java, javax"/>
</module>
<module name="Indentation">
<property name="severity" value="error"/>