Skip to content

Commit 140e201

Browse files
bcorsoDagger Team
bcorso
authored and
Dagger Team
committed
This CL removes the last few dependencies on bazel-common (mainly the definitions of `jarjar_library` and `javadoc_library` which have now been copied directly into Dagger). This has the following benefits * The android sdk is now defined in Dagger's WORKSPACE * All maven dependencies should now be defined in Dagger's WORKSPACE **Background:** We've been in the process of removing bazel-common dependencies for a while due to the confusion of mixing maven dependencies between both Dagger and bazel-common and the hassle of upgrading those dependencies on bazel-common (requires first updating in bazel-common, then updating version of bazel-common in Dagger). RELNOTES=N/A PiperOrigin-RevId: 653711935
1 parent 216a9d2 commit 140e201

File tree

36 files changed

+914
-84
lines changed

36 files changed

+914
-84
lines changed

‎BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@google_bazel_common//tools/jarjar:jarjar.bzl", "jarjar_library")
16-
load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
1715
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "define_kt_toolchain")
1816
load("@rules_java//java:defs.bzl", "java_library")
17+
load("//tools/jarjar:jarjar.bzl", "jarjar_library")
18+
load("//tools/javadoc:javadoc.bzl", "javadoc_library")
1919

2020
package(default_visibility = ["//visibility:public"])
2121

‎WORKSPACE

+39-21
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ http_archive(
5757
url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz",
5858
)
5959

60+
#############################
61+
# Load Android Sdk
62+
#############################
63+
64+
android_sdk_repository(
65+
name = "androidsdk",
66+
api_level = 32,
67+
build_tools_version = "32.0.0",
68+
)
69+
6070
####################################################
6171
# Load Protobuf repository (needed by bazel-common)
6272
####################################################
@@ -78,21 +88,6 @@ rules_proto_dependencies()
7888

7989
rules_proto_toolchains()
8090

81-
#############################
82-
# Load Bazel-Common repository
83-
#############################
84-
85-
http_archive(
86-
name = "google_bazel_common",
87-
sha256 = "82a49fb27c01ad184db948747733159022f9464fc2e62da996fa700594d9ea42",
88-
strip_prefix = "bazel-common-2a6b6406e12208e02b2060df0631fb30919080f3",
89-
urls = ["https://github.com/google/bazel-common/archive/2a6b6406e12208e02b2060df0631fb30919080f3.zip"],
90-
)
91-
92-
load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
93-
94-
google_common_workspace_rules()
95-
9691
#############################
9792
# Load Protobuf dependencies
9893
#############################
@@ -187,8 +182,20 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
187182

188183
ANDROID_LINT_VERSION = "30.1.0"
189184

185+
ANT_VERSION = "1.9.6"
186+
187+
ASM_VERSION = "9.6"
188+
190189
AUTO_COMMON_VERSION = "1.2.1"
191190

191+
BYTE_BUDDY_VERSION = "1.9.10"
192+
193+
CHECKER_FRAMEWORK_VERSION = "2.5.3"
194+
195+
ECLIPSE_SISU_VERSION = "0.3.0"
196+
197+
ERROR_PRONE_VERSION = "2.14.0"
198+
192199
# NOTE(bcorso): Even though we set the version here, our Guava version in
193200
# processor code will use whatever version is built into JavaBuilder, which is
194201
# tied to the version of Bazel we're using.
@@ -198,14 +205,10 @@ GRPC_VERSION = "1.2.0"
198205

199206
INCAP_VERSION = "0.2"
200207

201-
BYTE_BUDDY_VERSION = "1.9.10"
202-
203-
CHECKER_FRAMEWORK_VERSION = "2.5.3"
204-
205-
ERROR_PRONE_VERSION = "2.14.0"
206-
207208
KSP_VERSION = KOTLIN_VERSION + "-1.0.19"
208209

210+
MAVEN_VERSION = "3.3.3"
211+
209212
maven_install(
210213
artifacts = [
211214
"androidx.annotation:annotation:1.1.0",
@@ -264,16 +267,27 @@ maven_install(
264267
"io.grpc:grpc-protobuf:%s" % GRPC_VERSION,
265268
"jakarta.inject:jakarta.inject-api:2.0.1",
266269
"javax.annotation:javax.annotation-api:1.3.2",
270+
"javax.enterprise:cdi-api:1.0",
267271
"javax.inject:javax.inject:1",
268272
"javax.inject:javax.inject-tck:1",
269273
"junit:junit:4.13",
270274
"net.bytebuddy:byte-buddy:%s" % BYTE_BUDDY_VERSION,
271275
"net.bytebuddy:byte-buddy-agent:%s" % BYTE_BUDDY_VERSION,
272276
"net.ltgt.gradle.incap:incap:%s" % INCAP_VERSION,
273277
"net.ltgt.gradle.incap:incap-processor:%s" % INCAP_VERSION,
278+
"org.apache.ant:ant:%s" % ANT_VERSION,
279+
"org.apache.ant:ant-launcher:%s" % ANT_VERSION,
280+
"org.apache.maven:maven-artifact:%s" % MAVEN_VERSION,
281+
"org.apache.maven:maven-model:%s" % MAVEN_VERSION,
282+
"org.apache.maven:maven-plugin-api:%s" % MAVEN_VERSION,
274283
"org.checkerframework:checker-compat-qual:%s" % CHECKER_FRAMEWORK_VERSION,
275284
"org.checkerframework:dataflow:%s" % CHECKER_FRAMEWORK_VERSION,
276285
"org.checkerframework:javacutil:%s" % CHECKER_FRAMEWORK_VERSION,
286+
"org.codehaus.plexus:plexus-utils:3.0.20",
287+
"org.codehaus.plexus:plexus-classworlds:2.5.2",
288+
"org.codehaus.plexus:plexus-component-annotations:1.5.5",
289+
"org.eclipse.sisu:org.eclipse.sisu.plexus:%s" % ECLIPSE_SISU_VERSION,
290+
"org.eclipse.sisu:org.eclipse.sisu.inject:%s" % ECLIPSE_SISU_VERSION,
277291
"org.hamcrest:hamcrest-core:1.3",
278292
"org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:%s" % KOTLIN_VERSION,
279293
"org.jetbrains.kotlin:kotlin-compiler-embeddable:%s" % KOTLIN_VERSION,
@@ -282,7 +296,11 @@ maven_install(
282296
"org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2",
283297
"org.jspecify:jspecify:0.3.0",
284298
"org.mockito:mockito-core:2.28.2",
299+
"org.pantsbuild:jarjar:1.7.2",
285300
"org.objenesis:objenesis:1.0",
301+
"org.ow2.asm:asm:%s" % ASM_VERSION,
302+
"org.ow2.asm:asm-tree:%s" % ASM_VERSION,
303+
"org.ow2.asm:asm-commons:%s" % ASM_VERSION,
286304
"org.robolectric:robolectric:4.4",
287305
"org.robolectric:shadows-framework:4.4", # For ActivityController
288306
],

‎gwt/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
load("@rules_java//java:defs.bzl", "java_library")
1919
load("//:build_defs.bzl", "POM_VERSION")
20-
load("//tools:maven.bzl", "pom_file")
20+
load("//tools/maven:maven.bzl", "dagger_pom_file")
2121

2222
package(default_visibility = ["//:src"])
2323

@@ -41,7 +41,7 @@ java_library(
4141
visibility = ["//visibility:private"],
4242
)
4343

44-
pom_file(
44+
dagger_pom_file(
4545
name = "pom",
4646
artifact_id = "dagger-gwt",
4747
artifact_name = "Dagger GWT",

‎java/dagger/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ load(
2222
"JAVA_RELEASE_MIN",
2323
"POM_VERSION",
2424
)
25-
load("//tools:maven.bzl", "gen_maven_artifact")
25+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2626

2727
package(default_visibility = ["//:src"])
2828

‎java/dagger/android/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ load(
2121
)
2222
load("//tools:dejetify.bzl", "dejetified_library")
2323
load(
24-
"//tools:maven.bzl",
24+
"//tools/maven:maven.bzl",
25+
"dagger_pom_file",
2526
"gen_maven_artifact",
26-
"pom_file",
2727
)
2828

2929
package(default_visibility = ["//:src"])
@@ -94,7 +94,7 @@ android_library(
9494
],
9595
)
9696

97-
pom_file(
97+
dagger_pom_file(
9898
name = "legacy-pom",
9999
artifact_id = "dagger-android-legacy",
100100
artifact_name = "Dagger Android Legacy",

‎java/dagger/android/processor/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ load(
2222
"DOCLINT_REFERENCES",
2323
"POM_VERSION",
2424
)
25-
load("//tools:maven.bzl", "gen_maven_artifact")
25+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2626

2727
package(default_visibility = ["//:src"])
2828

‎java/dagger/android/support/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ load(
2121
)
2222
load("//tools:dejetify.bzl", "dejetified_library")
2323
load(
24-
"//tools:maven.bzl",
24+
"//tools/maven:maven.bzl",
25+
"dagger_pom_file",
2526
"gen_maven_artifact",
26-
"pom_file",
2727
)
2828

2929
package(default_visibility = ["//:src"])
@@ -95,7 +95,7 @@ android_library(
9595
],
9696
)
9797

98-
pom_file(
98+
dagger_pom_file(
9999
name = "legacy-pom",
100100
artifact_id = "dagger-android-support-legacy",
101101
artifact_name = "Dagger Android Legacy Support",

‎java/dagger/grpc/server/BUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# A framework supporting Dagger-injected gRPC servers.
22

3-
load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
43
load("@rules_java//java:defs.bzl", "java_library")
54
load(
65
"//:build_defs.bzl",
76
"DOCLINT_HTML_AND_SYNTAX",
87
"DOCLINT_REFERENCES",
98
"POM_VERSION",
109
)
11-
load("//tools:maven.bzl", "pom_file")
10+
load("//tools/javadoc:javadoc.bzl", "javadoc_library")
11+
load("//tools/maven:maven.bzl", "dagger_pom_file")
1212

1313
package(default_visibility = ["//:src"])
1414

@@ -53,14 +53,14 @@ java_library(
5353
],
5454
)
5555

56-
pom_file(
56+
dagger_pom_file(
5757
name = "annotations-pom",
5858
artifact_id = "dagger-grpc-server-annotations",
5959
artifact_name = "Dagger gRPC Server Annotations",
6060
targets = [":annotations"],
6161
)
6262

63-
pom_file(
63+
dagger_pom_file(
6464
name = "server-pom",
6565
artifact_id = "dagger-grpc-server",
6666
artifact_name = "Dagger gRPC Server",

‎java/dagger/grpc/server/processor/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
21
load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
32
load(
43
"//:build_defs.bzl",
54
"DOCLINT_HTML_AND_SYNTAX",
65
"POM_VERSION",
76
)
8-
load("//tools:maven.bzl", "pom_file")
7+
load("//tools/javadoc:javadoc.bzl", "javadoc_library")
8+
load("//tools/maven:maven.bzl", "dagger_pom_file")
99

1010
package(default_visibility = ["//:src"])
1111

@@ -28,7 +28,7 @@ java_library(
2828
],
2929
)
3030

31-
pom_file(
31+
dagger_pom_file(
3232
name = "pom",
3333
artifact_id = "dagger-grpc-server-processor",
3434
artifact_name = "Dagger gRPC Server Processor",

‎java/dagger/hilt/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
load("//:build_defs.bzl", "POM_VERSION")
16-
load("//tools:maven.bzl", "gen_maven_artifact")
16+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
1717

1818
# Description:
1919
# A library that wraps the Dagger API to make DI usage and testing easier.

‎java/dagger/hilt/android/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# A library based on Hilt that provides standard components and automated injection for Android.
1717
load("//:build_defs.bzl", "POM_VERSION")
1818
load("//tools:bazel_compat.bzl", "compat_kt_android_library")
19-
load("//tools:maven.bzl", "gen_maven_artifact")
19+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2020

2121
package(default_visibility = ["//:src"])
2222

‎java/dagger/hilt/android/processor/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Hilt android processors.
1717

1818
load("//:build_defs.bzl", "POM_VERSION")
19-
load("//tools:maven.bzl", "gen_maven_artifact")
19+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2020

2121
package(default_visibility = ["//:src"])
2222

‎java/dagger/hilt/android/testing/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Testing libraries for Hilt Android.
1616

1717
load("//:build_defs.bzl", "POM_VERSION")
18-
load("//tools:maven.bzl", "gen_maven_artifact")
18+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
1919

2020
package(default_visibility = ["//:src"])
2121

‎java/dagger/hilt/processor/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Hilt android processors.
1717

1818
load("//:build_defs.bzl", "POM_VERSION")
19-
load("//tools:maven.bzl", "gen_maven_artifact")
19+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2020

2121
package(default_visibility = ["//:src"])
2222

‎java/dagger/internal/codegen/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ load(
2020
"//:build_defs.bzl",
2121
"POM_VERSION",
2222
)
23-
load("//tools:maven.bzl", "gen_maven_artifact")
23+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2424

2525
package(default_visibility = ["//:src"])
2626

‎java/dagger/lint/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
1919
load("//:build_defs.bzl", "POM_VERSION")
20-
load("//tools:maven.bzl", "gen_maven_artifact")
20+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2121

2222
package(default_visibility = ["//:src"])
2323

‎java/dagger/producers/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ load(
2323
"JAVA_RELEASE_MIN",
2424
"POM_VERSION",
2525
)
26-
load("//tools:maven.bzl", "gen_maven_artifact")
26+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2727

2828
package(default_visibility = ["//:src"])
2929

‎java/dagger/spi/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ load(
2222
"DOCLINT_REFERENCES",
2323
"POM_VERSION",
2424
)
25-
load("//tools:maven.bzl", "gen_maven_artifact")
25+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
2626

2727
package(default_visibility = ["//:src"])
2828

‎javatests/dagger/internal/codegen/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ java_library(
7272
"//third_party/java/guava/collect",
7373
"//third_party/java/javapoet",
7474
"//third_party/java/truth",
75-
"@com_google_auto_value_auto_value//jar",
75+
"@maven//:com_google_auto_value_auto_value",
7676
],
7777
)
7878

@@ -110,7 +110,7 @@ DEPS = [
110110
"//third_party/java/guava/collect",
111111
"//third_party/java/guava/util/concurrent",
112112
"//third_party/java/auto:value",
113-
"@com_google_auto_value_auto_value//jar",
113+
"@maven//:com_google_auto_value_auto_value",
114114
"//third_party/java/auto:common",
115115
"//third_party/java/compile_testing",
116116
"//third_party/java/javapoet",

‎third_party/java/auto/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ alias(
2626
java_plugin(
2727
name = "auto_value_processor",
2828
processor_class = "com.google.auto.value.processor.AutoValueProcessor",
29-
visibility = ["//visibility:private"],
3029
deps = [
3130
":common",
3231
":service",

0 commit comments

Comments
 (0)