From 858caf425cdf3183776b61b437ba7a4129b6539b Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Thu, 11 Apr 2024 07:57:53 -0700
Subject: [PATCH] Fix [Gradle GWT compilation
 breakage](https://github.com/google/guava/issues/7134).

Fixes https://github.com/google/guava/issues/7134

(tested using the sscce.zip from that issue, adding `mavenLocal()` to the top of its `repositories` and updating `guava-gwt` to `HEAD-jre-SNAPSHOT`)

RELNOTES=Fixed [Gradle GWT compilation breakage](https://github.com/google/guava/issues/7134).
PiperOrigin-RevId: 623826917
---
 guava-gwt/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
index 86fa4b971aa9..9d207424387b 100644
--- a/guava-gwt/pom.xml
+++ b/guava-gwt/pom.xml
@@ -52,6 +52,16 @@
       <artifactId>guava</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- We redeclare the j2objc-annotations dependency from `guava`: Our Gradle
+         Module Metadata hides the dependency declared in `guava` from runtime
+         configurations downstream, and GWT uses the runtime configuration for
+         its builds. Thus, GWT doesn't get j2objc-annotations transitively, in
+         contrast to the other deps of `guava`, which it does get transitively.
+         (Arguably we should redeclare *all* the `guava` deps here.) -->
+    <dependency>
+      <groupId>com.google.j2objc</groupId>
+      <artifactId>j2objc-annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>