Skip to content

Commit

Permalink
Remove dependency on @google_bazel_common third_party deps.
Browse files Browse the repository at this point in the history
This CL removes @google_bazel_common//third_party dependencies and replaces them with local versions of these dependencies that are backed by maven_install artifacts.

In general, I think having our own list of dependencies will make managing dependencies easier since we'll have all of our dependencies imported by the same maven_install, which should handle dependency resolution and prevent 1-version violations. In addition, we can easily test upgrading our dependency versions without having to first commit to bazel-common.

RELNOTES=N/A
PiperOrigin-RevId: 409454340
  • Loading branch information
bcorso authored and Dagger Team committed Nov 12, 2021
1 parent e3849ca commit fad2eeb
Show file tree
Hide file tree
Showing 134 changed files with 1,549 additions and 695 deletions.
4 changes: 2 additions & 2 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jarjar_library(
name = "shaded_android_processor",
jars = [
"//java/dagger/android/processor",
"@com_google_auto_auto_common//jar",
"//third_party/java/auto:common",
],
rules = [
"rule com.google.auto.common.** dagger.android.shaded.auto.common.@1",
Expand All @@ -90,7 +90,7 @@ jarjar_library(
name = "shaded_grpc_server_processor",
jars = [
"//java/dagger/grpc/server/processor",
"@com_google_auto_auto_common//jar",
"//third_party/java/auto:common",
],
rules = [
"rule com.google.auto.common.** dagger.grpc.shaded.auto.common.@1",
Expand Down
55 changes: 54 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,24 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")

ANDROID_LINT_VERSION = "26.6.2"

# TODO(b/204390647): Update to 1.2 once this bug is fixed.
AUTO_COMMON_VERSION = "1.0"

# NOTE(bcorso): Even though we set the version here, our Guava version in
# processor code will use whatever version is built into JavaBuilder, which is
# tied to the version of Bazel we're using.
GUAVA_VERSION = "27.1"

GRPC_VERSION = "1.2.0"

INCAP_VERSION = "0.2"

BYTE_BUDDY_VERSION = "1.9.10"

CHECKER_FRAMEWORK_VERSION = "2.5.3"

ERROR_PRONE_VERSION = "2.3.2"

maven_install(
artifacts = [
"androidx.annotation:annotation:1.1.0",
Expand All @@ -196,12 +214,47 @@ maven_install(
"com.android.tools.lint:lint-tests:%s" % ANDROID_LINT_VERSION,
"com.android.tools:testutils:%s" % ANDROID_LINT_VERSION,
"com.github.tschuchortdev:kotlin-compile-testing:1.2.8",
"com.google.auto:auto-common:%s" % AUTO_COMMON_VERSION,
"com.google.auto.factory:auto-factory:1.0",
"com.google.auto.service:auto-service:1.0",
"com.google.auto.service:auto-service-annotations:1.0",
"com.google.auto.value:auto-value:1.6",
"com.google.auto.value:auto-value-annotations:1.6",
"com.google.code.findbugs:jsr305:3.0.1",
"com.google.devtools.ksp:symbol-processing-api:1.5.30-1.0.0",
"com.google.guava:guava:27.1-android",
"com.google.errorprone:error_prone_annotation:%s" % ERROR_PRONE_VERSION,
"com.google.errorprone:error_prone_annotations:%s" % ERROR_PRONE_VERSION,
"com.google.errorprone:error_prone_check_api:%s" % ERROR_PRONE_VERSION,
"com.google.googlejavaformat:google-java-format:1.5",
"com.google.guava:guava:%s-jre" % GUAVA_VERSION,
"com.google.guava:guava-testlib:%s-jre" % GUAVA_VERSION,
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:guava-beta-checker:1.0",
"com.google.protobuf:protobuf-java:3.7.0",
"com.google.testing.compile:compile-testing:0.18",
"com.google.truth:truth:1.1",
"com.squareup:javapoet:1.13.0",
"io.grpc:grpc-context:%s" % GRPC_VERSION,
"io.grpc:grpc-core:%s" % GRPC_VERSION,
"io.grpc:grpc-netty:%s" % GRPC_VERSION,
"io.grpc:grpc-protobuf:%s" % GRPC_VERSION,
"javax.annotation:jsr250-api:1.0",
"javax.inject:javax.inject:1",
"javax.inject:javax.inject-tck:1",
"junit:junit:4.13",
"net.bytebuddy:byte-buddy:%s" % BYTE_BUDDY_VERSION,
"net.bytebuddy:byte-buddy-agent:%s" % BYTE_BUDDY_VERSION,
"net.ltgt.gradle.incap:incap:%s" % INCAP_VERSION,
"net.ltgt.gradle.incap:incap-processor:%s" % INCAP_VERSION,
"org.checkerframework:checker-compat-qual:%s" % CHECKER_FRAMEWORK_VERSION,
"org.checkerframework:dataflow:%s" % CHECKER_FRAMEWORK_VERSION,
"org.checkerframework:javacutil:%s" % CHECKER_FRAMEWORK_VERSION,
"org.hamcrest:hamcrest-core:1.3",
"org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:%s" % KOTLIN_VERSION,
"org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0",
"org.mockito:mockito-core:2.28.2",
"org.objenesis:objenesis:1.0",
"org.robolectric:robolectric:4.4",
"org.robolectric:shadows-framework:4.4", # For ActivityController
],
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ java_library(
srcs = glob(["**/*.java"]),
javacopts = SOURCE_7_TARGET_7 + DOCLINT_HTML_AND_SYNTAX,
tags = ["maven_coordinates=com.google.dagger:dagger:" + POM_VERSION],
exports = ["@google_bazel_common//third_party/java/jsr330_inject"],
exports = ["//third_party/java/jsr330_inject"],
deps = [
"@google_bazel_common//third_party/java/jsr330_inject",
"//third_party/java/jsr330_inject",
],
)

Expand All @@ -55,5 +55,5 @@ javadoc_library(
srcs = [":javadoc-srcs"],
exclude_packages = ["dagger.internal"],
root_packages = ["dagger"],
deps = ["@google_bazel_common//third_party/java/jsr330_inject"],
deps = ["//third_party/java/jsr330_inject"],
)
8 changes: 4 additions & 4 deletions java/dagger/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ android_library(
],
deps = [
"//:dagger_with_compiler",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/error_prone:annotations",
"//third_party/java/auto:value",
"//third_party/java/error_prone:annotations",
"@maven//:androidx_annotation_annotation",
],
)
Expand All @@ -79,8 +79,8 @@ android_library(
tags = ["maven_coordinates=com.google.dagger:dagger-android-legacy:" + POM_VERSION],
exports = [
"//:dagger_with_compiler",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/error_prone:annotations",
"//third_party/java/auto:value",
"//third_party/java/error_prone:annotations",
"@maven//:com_android_support_support_annotations",
],
)
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/internal/proguard/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ java_library(
srcs = ["ProguardProcessor.java"],
javacopts = DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES,
deps = [
"@google_bazel_common//third_party/java/auto:service",
"//third_party/java/auto:service",
],
)

Expand Down
16 changes: 8 additions & 8 deletions java/dagger/android/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ java_library(
tags = ["maven_coordinates=com.google.dagger:dagger-android-processor:" + POM_VERSION],
deps = [
"//java/dagger:core",
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"//java/dagger/spi",
"@google_bazel_common//third_party/java/auto:common",
"@google_bazel_common//third_party/java/auto:service",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/google_java_format",
"@google_bazel_common//third_party/java/incap",
"@google_bazel_common//third_party/java/javapoet",
"//third_party/java/auto:common",
"//third_party/java/auto:service",
"//third_party/java/auto:value",
"//third_party/java/google_java_format",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/incap",
"//third_party/java/javapoet",
],
)

Expand Down
4 changes: 2 additions & 2 deletions java/dagger/android/support/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android_library(
deps = [
"//:dagger_with_compiler",
"//java/dagger/android",
"@google_bazel_common//third_party/java/error_prone:annotations",
"//third_party/java/error_prone:annotations",
"@maven//:androidx_activity_activity",
"@maven//:androidx_annotation_annotation",
"@maven//:androidx_appcompat_appcompat",
Expand Down Expand Up @@ -71,7 +71,7 @@ android_library(
exports = [
"//:dagger_with_compiler",
"//java/dagger/android:legacy-deps",
"@google_bazel_common//third_party/java/error_prone:annotations",
"//third_party/java/error_prone:annotations",
"@maven//:com_android_support_appcompat_v7",
"@maven//:com_android_support_support_annotations",
"@maven//:com_android_support_support_fragment",
Expand Down
4 changes: 2 additions & 2 deletions java/dagger/errorprone/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ java_library(
srcs = glob(["*.java"]),
deps = [
"//java/dagger:core",
"//java/dagger/internal/guava:collect",
"//third_party/java/error_prone:check_api",
"//third_party/java/guava/collect",
"@bazel_tools//tools/jdk:langtools-neverlink",
"@google_bazel_common//third_party/java/error_prone:check_api",
],
)
12 changes: 6 additions & 6 deletions java/dagger/example/spi/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ java_plugin(
name = "binding-graph-visualizer",
srcs = glob(["*.java"]),
deps = [
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"//java/dagger/internal/guava:graph",
"//java/dagger/spi",
"@google_bazel_common//third_party/java/auto:service",
"@google_bazel_common//third_party/java/error_prone:annotations",
"@google_bazel_common//third_party/java/javapoet",
"//third_party/java/auto:service",
"//third_party/java/error_prone:annotations",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/guava/graph",
"//third_party/java/javapoet",
],
)
20 changes: 10 additions & 10 deletions java/dagger/grpc/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java_library(
javacopts = DOCLINT_HTML_AND_SYNTAX,
tags = ["maven_coordinates=com.google.dagger:dagger-grpc-server-annotations:" + POM_VERSION],
deps = [
"@google_bazel_common//third_party/java/jsr330_inject",
"//third_party/java/jsr330_inject",
],
)

Expand All @@ -41,15 +41,15 @@ java_library(
exports = [":annotations"],
deps = [
"//:dagger_with_compiler",
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/grpc:context",
"@google_bazel_common//third_party/java/grpc:core",
"@google_bazel_common//third_party/java/grpc:netty",
"@google_bazel_common//third_party/java/grpc:protobuf",
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/protobuf",
"//third_party/java/auto:value",
"//third_party/java/grpc:context",
"//third_party/java/grpc:core",
"//third_party/java/grpc:netty",
"//third_party/java/grpc:protobuf",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/jsr330_inject",
"//third_party/java/protobuf",
],
)

Expand Down
16 changes: 8 additions & 8 deletions java/dagger/grpc/server/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ java_library(
deps = [
"//:dagger_with_compiler",
"//java/dagger/grpc/server:annotations",
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"//java/dagger/internal/guava:io",
"@google_bazel_common//third_party/java/auto:common",
"@google_bazel_common//third_party/java/auto:service",
"@google_bazel_common//third_party/java/google_java_format",
"@google_bazel_common//third_party/java/javapoet",
"@google_bazel_common//third_party/java/jsr250_annotations",
"//third_party/java/auto:common",
"//third_party/java/auto:service",
"//third_party/java/google_java_format",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/guava/io",
"//third_party/java/javapoet",
"//third_party/java/jsr250_annotations",
],
)

Expand Down
4 changes: 2 additions & 2 deletions java/dagger/hilt/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ java_library(
"//java/dagger/hilt/internal:generated_component",
"//java/dagger/hilt/internal:preconditions",
"//java/dagger/hilt/internal:test_singleton_component",
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
],
)

Expand Down Expand Up @@ -96,7 +96,7 @@ java_library(
name = "package_info",
srcs = ["package-info.java"],
deps = [
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
],
)

Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ android_library(
":package_info",
"//java/dagger/hilt:entry_point",
"//java/dagger/hilt/android/internal",
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
"@maven//:androidx_activity_activity",
"@maven//:androidx_fragment_fragment",
"@maven//:androidx_lifecycle_lifecycle_common",
Expand Down Expand Up @@ -144,15 +144,15 @@ android_library(
"//java/dagger/hilt/internal:component_manager",
"//java/dagger/hilt/internal:preconditions",
"//java/dagger/hilt/internal:test_singleton_component_manager",
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
],
)

java_library(
name = "package_info",
srcs = ["package-info.java"],
deps = [
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
],
)

Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/android/migration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ java_library(
name = "package_info",
srcs = ["package-info.java"],
deps = [
"@google_bazel_common//third_party/java/jsr305_annotations",
"//third_party/java/jsr305_annotations",
],
)

Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/android/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ gen_maven_artifact(
# The shaded deps are added using jarjar, but they won't be shaded until later
# due to: https://github.com/google/dagger/issues/2765. For the shaded rules see
# util/deploy-hilt.sh
shaded_deps = ["@com_google_auto_auto_common//jar"],
shaded_deps = ["//third_party/java/auto:common"],
)

filegroup(
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/android/processor/internal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java_library(
"AndroidClassNames.java",
],
deps = [
"@google_bazel_common//third_party/java/javapoet",
"//third_party/java/javapoet",
],
)

Expand All @@ -34,8 +34,8 @@ java_library(
"MoreTypes.java",
],
deps = [
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
],
)

Expand Down
24 changes: 12 additions & 12 deletions java/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ java_library(
"//java/dagger/hilt/processor/internal:base_processor",
"//java/dagger/hilt/processor/internal:compiler_options",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/internal/guava:collect",
"@google_bazel_common//third_party/java/auto:service",
"@google_bazel_common//third_party/java/incap",
"//third_party/java/auto:service",
"//third_party/java/guava/collect",
"//third_party/java/incap",
],
)

Expand All @@ -69,10 +69,10 @@ java_library(
"//java/dagger/hilt/processor/internal:processors",
"//java/dagger/internal/codegen/extension",
"//java/dagger/internal/codegen/langmodel",
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"@google_bazel_common//third_party/java/auto:common",
"@google_bazel_common//third_party/java/javapoet",
"//third_party/java/auto:common",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/javapoet",
],
)

Expand All @@ -91,11 +91,11 @@ java_library(
"//java/dagger/hilt/processor/internal:processors",
"//java/dagger/internal/codegen/extension",
"//java/dagger/internal/codegen/kotlin",
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"@google_bazel_common//third_party/java/auto:common",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/javapoet",
"//third_party/java/auto:common",
"//third_party/java/auto:value",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/javapoet",
],
)

Expand Down
Loading

0 comments on commit fad2eeb

Please sign in to comment.