diff options
| author | cpovirk <cpovirk@google.com> | 2021-04-14 14:07:49 -0700 |
|---|---|---|
| committer | Google Java Core Libraries <java-core-libraries-team+copybara@google.com> | 2021-04-14 14:09:57 -0700 |
| commit | 2eee304995ac013cc91d75c53b99dee8bd6c3d4d (patch) | |
| tree | e603ff194332671ccc6f9c710cd7ec53876fc94d /guava-gwt | |
| parent | 6854bafae2825a65bfd4683b5fe1eba91a954643 (diff) | |
| download | guava-2eee304995ac013cc91d75c53b99dee8bd6c3d4d.tar.gz | |
Sort and uniquify .gwt.xml <inherits> lines.
RELNOTES=n/a
PiperOrigin-RevId: 368504781
Diffstat (limited to 'guava-gwt')
18 files changed, 25 insertions, 85 deletions
diff --git a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml index e86a1bff7..a281a1fab 100644 --- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml +++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml @@ -20,9 +20,7 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/base/Base.gwt.xml b/guava-gwt/src/com/google/common/base/Base.gwt.xml index b2776cf48..b8c044723 100644 --- a/guava-gwt/src/com/google/common/base/Base.gwt.xml +++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml @@ -20,13 +20,8 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> - - - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml index bc2141b59..fb58b9975 100644 --- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml +++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml @@ -20,16 +20,12 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> <inherits name="com.google.common.math.Math" /> <inherits name="com.google.common.util.concurrent.Concurrent" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml index 102121c18..cb2b654d1 100644 --- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml +++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml @@ -20,17 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> - <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.math.Math" /> <inherits name="com.google.common.primitives.Primitives" /> - - - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml index 1fb64cd73..573370698 100644 --- a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml +++ b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml @@ -20,13 +20,9 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/html/Html.gwt.xml b/guava-gwt/src/com/google/common/html/Html.gwt.xml index e05252a27..ca997f09b 100644 --- a/guava-gwt/src/com/google/common/html/Html.gwt.xml +++ b/guava-gwt/src/com/google/common/html/Html.gwt.xml @@ -20,11 +20,9 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.escape.Escape" /> - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/io/Io.gwt.xml b/guava-gwt/src/com/google/common/io/Io.gwt.xml index d1b08d284..cb2b654d1 100644 --- a/guava-gwt/src/com/google/common/io/Io.gwt.xml +++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml @@ -20,15 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.math.Math" /> <inherits name="com.google.common.primitives.Primitives" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/math/Math.gwt.xml b/guava-gwt/src/com/google/common/math/Math.gwt.xml index 3e79e4e19..ff56f8edb 100644 --- a/guava-gwt/src/com/google/common/math/Math.gwt.xml +++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml @@ -20,14 +20,10 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.primitives.Primitives" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/net/Net.gwt.xml b/guava-gwt/src/com/google/common/net/Net.gwt.xml index a06e5c894..702431215 100644 --- a/guava-gwt/src/com/google/common/net/Net.gwt.xml +++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml @@ -20,18 +20,13 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> <inherits name="com.google.common.escape.Escape" /> +<inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixPatterns" /> <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /> - - - -<inherits name="com.google.gwt.core.Core" /> - </module> diff --git a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml index 43bae8c29..573370698 100644 --- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml +++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml @@ -20,14 +20,9 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> - - - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml index c2c061658..92daff3bc 100644 --- a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml +++ b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml @@ -20,15 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> -<inherits name="elemental2.promise.Promise" /> - - - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> +<inherits name="elemental2.promise.Promise" /> </module> diff --git a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml index d6e8a86fc..8a9e3b81b 100644 --- a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml +++ b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml @@ -20,12 +20,10 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.escape.Escape" /> - - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml index d5dd2908c..be70a5cfb 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml @@ -20,11 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> +<inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /> </module> diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml index ffbcaf104..b8c044723 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml @@ -20,8 +20,8 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml index 2a168094a..6d1e97bda 100644 --- a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml +++ b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml @@ -20,17 +20,13 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.junit.JUnit" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> <inherits name="com.google.common.primitives.Primitives" /> <inherits name="com.google.common.testing.Testing" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.junit.JUnit" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml index 704e5050f..5e90c3195 100644 --- a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml +++ b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml @@ -20,18 +20,14 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.junit.JUnit" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> <inherits name="com.google.common.collect.testing.Testing" /> <inherits name="com.google.common.primitives.Primitives" /> <inherits name="com.google.common.testing.Testing" /> - <inherits name="com.google.gwt.core.Core" /> - - - +<inherits name="com.google.gwt.junit.JUnit" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml index e0cd87274..c3a1bd4b9 100644 --- a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml +++ b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml @@ -20,11 +20,10 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.junit.JUnit" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.escape.Escape" /> - <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.junit.JUnit" /> +<inherits name="com.google.gwt.user.User" /> </module> diff --git a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml index c53059950..0c5856762 100644 --- a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml +++ b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml @@ -20,15 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /> -<inherits name="com.google.gwt.junit.JUnit" /> <inherits name="com.google.common.annotations.Annotations" /> <inherits name="com.google.common.base.Base" /> <inherits name="com.google.common.collect.Collect" /> - - - <inherits name="com.google.gwt.core.Core" /> - +<inherits name="com.google.gwt.junit.JUnit" /> +<inherits name="com.google.gwt.user.User" /> </module> |