diff --git a/WORKSPACE b/WORKSPACE index 51d8bc67305..1a0ce513cf5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -49,6 +49,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") maven_install( artifacts = [ + "com.google.guava:guava:27.1-android", "com.android.support:support-annotations:25.0.0", "com.android.support:support-fragment:25.0.0", "com.android.support:appcompat-v7:25.0.0", diff --git a/java/dagger/internal/guava/BUILD b/java/dagger/internal/guava/BUILD index f455d1c26e3..8b930d84939 100644 --- a/java/dagger/internal/guava/BUILD +++ b/java/dagger/internal/guava/BUILD @@ -51,3 +51,18 @@ alias( name = "concurrent", actual = "@google_bazel_common//third_party/java/guava", ) + +alias( + name = "base-android", + actual = "@maven//:com_google_guava_guava", +) + +alias( + name = "collect-android", + actual = "@maven//:com_google_guava_guava", +) + +alias( + name = "concurrent-android", + actual = "@maven//:com_google_guava_guava", +) diff --git a/java/dagger/producers/BUILD b/java/dagger/producers/BUILD index 0fb462d6e0b..b0f23b8ce51 100644 --- a/java/dagger/producers/BUILD +++ b/java/dagger/producers/BUILD @@ -15,8 +15,6 @@ # Description: # An asynchronous dependency injection system that extends JSR-330. -package(default_visibility = ["//:src"]) - load( "//:build_defs.bzl", "DOCLINT_HTML_AND_SYNTAX", @@ -25,6 +23,8 @@ load( ) load("//tools:maven.bzl", "POM_VERSION", "gen_maven_artifact") +package(default_visibility = ["//:src"]) + # Work around b/70476182 which prevents Kythe from connecting :producers to the .java files it # contains. SRCS = glob(["**/*.java"]) @@ -40,8 +40,8 @@ java_library( javacopts = SOURCE_7_TARGET_7 + DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES, tags = ["maven_coordinates=com.google.dagger:dagger-producers:" + POM_VERSION], exports = [ - # TODO(dpb): Don't export any of Guava. - "@google_bazel_common//third_party/java/guava", + "//java/dagger/internal/guava:base", + "//java/dagger/internal/guava:concurrent", "@google_bazel_common//third_party/java/jsr330_inject", ], deps = [