diff options
| author | cpovirk <cpovirk@google.com> | 2021-04-14 14:07:49 -0700 |
|---|---|---|
| committer | Google Java Core Libraries <java-libraries-firehose+copybara@google.com> | 2021-04-14 14:08:22 -0700 |
| commit | b997ffb1e6122f3117af8dd9585d0cdc4193f679 (patch) | |
| tree | 3aa06a2e3f22fe421acf6b5a02014b6735c5ac73 | |
| parent | f734e9087f68a4344122b4adf6a28fa0787ddb5e (diff) | |
| download | truth-b997ffb1e6122f3117af8dd9585d0cdc4193f679.tar.gz | |
Sort and uniquify .gwt.xml <inherits> lines.
RELNOTES=n/a
PiperOrigin-RevId: 368504781
3 files changed, 3 insertions, 8 deletions
diff --git a/core/src/main/java/com/google/common/truth/Truth.gwt.xml b/core/src/main/java/com/google/common/truth/Truth.gwt.xml index e723de08..e0be07a6 100644 --- a/core/src/main/java/com/google/common/truth/Truth.gwt.xml +++ b/core/src/main/java/com/google/common/truth/Truth.gwt.xml @@ -20,15 +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.primitives.Primitives" /> <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/core/src/test/java/com/google/common/truth/gwt/TruthTest.gwt.xml b/core/src/test/java/com/google/common/truth/gwt/TruthTest.gwt.xml index 093a4119..ee9caccb 100644 --- a/core/src/test/java/com/google/common/truth/gwt/TruthTest.gwt.xml +++ b/core/src/test/java/com/google/common/truth/gwt/TruthTest.gwt.xml @@ -3,6 +3,6 @@ <inherits name="com.google.common.collect.Collect"/> <inherits name="com.google.common.primitives.Primitives"/> <inherits name="com.google.common.truth.Truth"/> - <!-- TODO(cpovirk): Test Truth8 separately. --> + <!-- TODO(cpovirk): Test Truth8. --> <inherits name="com.google.gwt.junit.JUnit"/> </module> diff --git a/extensions/java8/src/main/java/com/google/common/truth/Truth8.gwt.xml b/extensions/java8/src/main/java/com/google/common/truth/Truth8.gwt.xml index 43f8535b..a3ac1443 100644 --- a/extensions/java8/src/main/java/com/google/common/truth/Truth8.gwt.xml +++ b/extensions/java8/src/main/java/com/google/common/truth/Truth8.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.truth.Truth" /> <inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> </module> |