diff options
| author | Andrei Selkin <andreyselkin@gmail.com> | 2016-09-22 01:35:17 +0300 |
|---|---|---|
| committer | Roman Ivanov <romani@users.noreply.github.com> | 2016-09-21 15:35:17 -0700 |
| commit | ee66d82723cb6f2f4c74f6d91dd9c4f58beb5775 (patch) | |
| tree | 5042eaa84c62fa7ab02a5b39965c5597d2762e8e /config | |
| parent | fbf3f95c2273be23b966cba6e6ef89390a6fb020 (diff) | |
| download | checkstyle-ee66d82723cb6f2f4c74f6d91dd9c4f58beb5775.tar.gz | |
Issue #3433: Cut down on Checkstyle's dependencies on Guava (part 3) (#3458)
Diffstat (limited to 'config')
| -rw-r--r-- | config/checkstyle_sevntu_checks.xml | 7 | ||||
| -rw-r--r-- | config/import-control.xml | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml index ebcd9211f..8aca176eb 100644 --- a/config/checkstyle_sevntu_checks.xml +++ b/config/checkstyle_sevntu_checks.xml @@ -44,7 +44,8 @@ com.google.common.base.Preconditions,com.google.common.base.Predicate, com.google.common.io.CharSource,com.google.common.annotations.Beta, com.google.common.collect.Queues,com.google.common.collect.Sets, - com.google.common.collect.Lists"/> + com.google.common.collect.Lists,com.google.common.annotations.GwtCompatible, + com.google.common.io.Files,com.google.common.collect.TreeTraverser"/> </module> <module name="ForbidCCommentsInMethods"/> <module name="FinalizeImplementationCheck"/> @@ -111,7 +112,9 @@ com\.google\.common\.base\.Equivalence|com\.google\.common\.base\.Preconditions| com\.google\.common\.base\.Optional|com\.google\.common\.io\.CharSource| com\.google\.common\.primitives.*|com\.google\.common\.collect\.Sets| - com\.google\.common\.collect\.Queues|com\.google\.common\.collect\.Lists"/> + com\.google\.common\.collect\.Queues|com\.google\.common\.collect\.Lists| + com\.google\.common\.annotations\.GwtCompatible|com\.google\.common\.io\.Files| + com\.google\.common\.collect\.TreeTraverser"/> <property name="forbiddenImportsExcludesRegexp" value=""/> </module> <module name="ForbidCertainImports"> diff --git a/config/import-control.xml b/config/import-control.xml index 92d1aaf7a..a07897eaf 100644 --- a/config/import-control.xml +++ b/config/import-control.xml @@ -70,7 +70,6 @@ <subpackage name="checks"> <allow pkg="com.puppycrawl.tools.checkstyle.checks"/> <allow class="com.puppycrawl.tools.checkstyle.Definitions"/> - <allow class="com.google.common.io.Files" local-only="true"/> <allow class="com.google.common.io.Closeables" local-only="true"/> <allow class="com.google.common.collect.HashMultiset" local-only="true"/> <allow class="com.google.common.collect.HashMultimap" local-only="true"/> @@ -99,24 +98,16 @@ <allow pkg="com.puppycrawl.tools.checkstyle.grammars.javadoc"/> <allow pkg="java.lang.reflect"/> <allow class="com.google.common.base.CharMatcher" local-only="true"/> - <allow class="com.google.common.annotations.GwtCompatible" local-only="true"/> - <allow class="com.google.common.annotations.GwtIncompatible" local-only="true"/> <allow class="com.google.common.collect.ImmutableList" local-only="true"/> <allow class="com.google.common.collect.ImmutableMap" local-only="true"/> <allow class="com.google.common.collect.ImmutableSortedSet" local-only="true"/> <allow class="com.google.common.collect.Multiset" local-only="true"/> </subpackage> - <subpackage name="whitespace"> - <allow class="com.google.common.annotations.GwtCompatible" local-only="true"/> - </subpackage> <subpackage name="design"> <allow class="com.google.common.annotations.VisibleForTesting" local-only="true"/> <allow class="com.google.common.collect.ImmutableList" local-only="true"/> <allow class="com.google.common.collect.ImmutableMap" local-only="true"/> </subpackage> - <subpackage name="regexp"> - <allow class="com.google.common.io.Files" local-only="true"/> - </subpackage> <subpackage name="imports"> <allow class="com.google.common.collect.HashMultimap" local-only="true"/> <allow class="com.google.common.collect.ImmutableSet" local-only="true"/> @@ -164,8 +155,6 @@ <subpackage name="internal"> <allow class="com.google.common.reflect.ClassPath" local-only="true"/> - <allow class="com.google.common.io.Files" local-only="true"/> <allow class="com.google.common.collect.FluentIterable" local-only="true"/> - <allow class="com.google.common.collect.TreeTraverser"/> </subpackage> </import-control> |