diff options
| author | zlt <zlt@google.com> | 2019-02-12 10:10:55 -0800 |
|---|---|---|
| committer | Ron Shapiro <shapiro.rd@gmail.com> | 2019-02-26 14:18:53 -0500 |
| commit | 5929fcf18f78a8826544f0aa1a4eb2ced704787b (patch) | |
| tree | 871c76e2e97b40e2cabf9d99b10a6ebc59763d19 | |
| parent | 07f3d6ca86cac1d27cb2f13e6fe0bb4d0faca7fe (diff) | |
| download | guava-5929fcf18f78a8826544f0aa1a4eb2ced704787b.tar.gz | |
Automated rollback of commit 1d49ade94c3e7d2c056893a630739c8a6b897f66
*** Original change description ***
Internal GWT change
***
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=233628983
18 files changed, 245 insertions, 155 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 9a44903f8..d8167055b 100644 --- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml +++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <inherits name="com.google.gwt.user.User"/> - <inherits name="com.google.gwt.core.Core"/> <source path=""> @@ -14,5 +13,7 @@ <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> + + <inherits name="com.google.gwt.core.Core"/> </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 bf126708d..1fcbe108e 100644 --- a/guava-gwt/src/com/google/common/base/Base.gwt.xml +++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -17,4 +14,10 @@ <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"/> + </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 e744149d3..174b2fac1 100644 --- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml +++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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.util.concurrent.Concurrent"/> - <inherits name="com.google.gwt.core.Core"/> <source path=""> @@ -19,4 +14,14 @@ <super-source path="super"/> + <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.util.concurrent.Concurrent"/> + + <inherits name="com.google.gwt.core.Core"/> + </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 7f494be3f..0439cf6ba 100644 --- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml +++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -20,4 +14,16 @@ <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"/> + </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 ae395d648..c442ad25f 100644 --- a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml +++ b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -17,4 +14,10 @@ <super-source path="super"/> + <inherits name="com.google.common.annotations.Annotations"/> + + <inherits name="com.google.common.base.Base"/> + + <inherits name="com.google.gwt.core.Core"/> + </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 1ca66cf1e..d59eeaace 100644 --- a/guava-gwt/src/com/google/common/html/Html.gwt.xml +++ b/guava-gwt/src/com/google/common/html/Html.gwt.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -16,5 +13,11 @@ <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> + + <inherits name="com.google.common.annotations.Annotations"/> + + <inherits name="com.google.common.escape.Escape"/> + + <inherits name="com.google.gwt.core.Core"/> </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 94b9f9991..c4287c1e0 100644 --- a/guava-gwt/src/com/google/common/io/Io.gwt.xml +++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -19,4 +14,14 @@ <super-source path="super"/> + <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"/> + </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 8b0eb749f..686f3c531 100644 --- a/guava-gwt/src/com/google/common/math/Math.gwt.xml +++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -18,4 +14,12 @@ <super-source path="super"/> + <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"/> + </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 7b1c5d956..f1da2e724 100644 --- a/guava-gwt/src/com/google/common/net/Net.gwt.xml +++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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.thirdparty.publicsuffix.PublicSuffixPatterns"/> - <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/> - <inherits name="com.google.gwt.core.Core"/> <source path=""> @@ -22,4 +14,20 @@ <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.escape.Escape"/> + + <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 1a3c2506c..b52382ddc 100644 --- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml +++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -18,4 +14,12 @@ <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"/> + </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 05416aa58..aa59ee177 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 @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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.gwt.core.Core"/> <source path=""> @@ -18,4 +14,12 @@ <super-source path="super"/> + <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"/> + </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 e8b3e7040..8fad4a6ac 100644 --- a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml +++ b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -18,4 +14,12 @@ <super-source path="super"/> + <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"/> + </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 1984797a5..beb498b40 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml @@ -1,22 +1,29 @@ -<?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> - - <source path=""> - - <!-- Hack to keep collect from hiding collect.testing supersource: --> - - <exclude name="**/testing/**"/> - - </source> - - <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> - - <super-source path="super"/> - +<source path=""> + <!-- Hack to keep collect from hiding collect.testing supersource: --> + <exclude name="**/testing/**"/> +</source> + +<!-- + We used to set this only for packages that had manual supersource. + That worked everywhere that I know of except for one place: + when running the GWT util.concurrent tests under Guava. + The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: + https://goo.gl/pRV3Yn + The summary is that it ignores one file in favor of the other. + util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. + util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. + GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. + This causes it to fail to find AtomicLongMapTest. + Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. + GWT is happy to ignore us when we specify a nonexistent path. + (I hope that this workaround does not cause its own problems in the future.) +--> +<super-source path="super"/> +<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"/> </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 0838ee8e5..d95b658c7 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml @@ -1,19 +1,26 @@ -<?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <inherits name="com.google.gwt.user.User"/> - <inherits name="com.google.common.annotations.Annotations"/> - <inherits name="com.google.gwt.core.Core"/> - - <source path=""> - - <!-- Hack to keep collect from hiding collect.testing supersource: --> - - <exclude name="**/testing/**"/> - - </source> - - <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> - - <super-source path="super"/> - +<source path=""> + <!-- Hack to keep collect from hiding collect.testing supersource: --> + <exclude name="**/testing/**"/> +</source> + +<!-- + We used to set this only for packages that had manual supersource. + That worked everywhere that I know of except for one place: + when running the GWT util.concurrent tests under Guava. + The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: + https://goo.gl/pRV3Yn + The summary is that it ignores one file in favor of the other. + util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. + util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. + GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. + This causes it to fail to find AtomicLongMapTest. + Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. + GWT is happy to ignore us when we specify a nonexistent path. + (I hope that this workaround does not cause its own problems in the future.) +--> +<super-source path="super"/> +<inherits name="com.google.common.annotations.Annotations"/> +<inherits name="com.google.gwt.core.Core"/> </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 ec21d39d8..978168748 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 @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -21,4 +14,18 @@ <super-source path="super"/> + <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"/> + </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 7eb9a79bd..0f7ee40a9 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 @@ -1,25 +1,32 @@ -<?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> - - <source path=""> - - <!-- Hack to keep collect from hiding collect.testing supersource: --> - - <exclude name="**/testing/**"/> - - </source> - - <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> - - <super-source path="super"/> - +<source path=""> + <!-- Hack to keep collect from hiding collect.testing supersource: --> + <exclude name="**/testing/**"/> +</source> + +<!-- + We used to set this only for packages that had manual supersource. + That worked everywhere that I know of except for one place: + when running the GWT util.concurrent tests under Guava. + The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: + https://goo.gl/pRV3Yn + The summary is that it ignores one file in favor of the other. + util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. + util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. + GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. + This causes it to fail to find AtomicLongMapTest. + Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. + GWT is happy to ignore us when we specify a nonexistent path. + (I hope that this workaround does not cause its own problems in the future.) +--> +<super-source path="super"/> +<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"/> </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 26ad24aae..c06ebbb4b 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 @@ -1,21 +1,28 @@ -<?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> - - <source path=""> - - <!-- Hack to keep collect from hiding collect.testing supersource: --> - - <exclude name="**/testing/**"/> - - </source> - - <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) --> - - <super-source path="super"/> - +<source path=""> + <!-- Hack to keep collect from hiding collect.testing supersource: --> + <exclude name="**/testing/**"/> +</source> + +<!-- + We used to set this only for packages that had manual supersource. + That worked everywhere that I know of except for one place: + when running the GWT util.concurrent tests under Guava. + The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: + https://goo.gl/pRV3Yn + The summary is that it ignores one file in favor of the other. + util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. + util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. + GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. + This causes it to fail to find AtomicLongMapTest. + Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. + GWT is happy to ignore us when we specify a nonexistent path. + (I hope that this workaround does not cause its own problems in the future.) +--> +<super-source path="super"/> +<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"/> </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 f56cef2b7..e65cd647b 100644 --- a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml +++ b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- semi-autogenerated module descriptor --> <module> - <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"/> <source path=""> @@ -19,4 +14,14 @@ <super-source path="super"/> + <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"/> + </module> |