Automated rollback of changelist cd33465

*** Original change description *** Internal GWT change *** ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=233628983
google · Feb 14, 2019 · b937ab0 · b937ab0
1 parent cd33465
commit b937ab0
Show file tree

Hide file tree

Showing 18 changed files with 255 additions and 160 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
@@ -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
@@ -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="java.util.Util"/>
-  <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="java.util.Util"/>
+
+  <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
@@ -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.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="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
 
   <source path="">
 
@@ -20,4 +14,16 @@
 
   <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="java.util.Util"/>
+
+  <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
@@ -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.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="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
 
   <source path="">
 
@@ -21,4 +14,18 @@
 
   <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="java.util.Util"/>
+
+  <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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="java.util.Util"/>
-  <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="java.util.Util"/>
+
+  <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
@@ -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
@@ -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>