Skip to content

Commit d24ba7c

Browse files
bcorsoDagger Team
authored and
Dagger Team
committed
Restructure hilt-compiler sources
RELNOTES=N/A PiperOrigin-RevId: 734668767
1 parent 3aa1553 commit d24ba7c

File tree

161 files changed

+419
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+419
-466
lines changed

hilt-android/main/java/dagger/hilt/android/BUILD

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android_library(
2828
"WithFragmentBindings.java",
2929
],
3030
exported_plugins = [
31-
"//java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
31+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
3232
],
3333
exports = [
3434
"//hilt-android/main/java/dagger/hilt/android/components",
@@ -64,10 +64,10 @@ android_library(
6464
name = "hilt_android_app",
6565
srcs = ["HiltAndroidApp.java"],
6666
exported_plugins = [
67-
"//java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
68-
"//java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin",
69-
"//java/dagger/hilt/processor/internal/root:component_tree_deps_plugin",
70-
"//java/dagger/hilt/processor/internal/root:root_plugin",
67+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
68+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin",
69+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_plugin",
70+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_plugin",
7171
],
7272
exports = [
7373
"//:dagger_with_compiler",
@@ -131,8 +131,8 @@ android_library(
131131
"EarlyEntryPoints.java",
132132
],
133133
exported_plugins = [
134-
"//java/dagger/hilt/processor/internal/aggregateddeps:plugin",
135-
"//java/dagger/hilt/processor/internal/earlyentrypoint:processor",
134+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:plugin",
135+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor",
136136
],
137137
proguard_specs = ["proguard-rules.pro"],
138138
exports = [

hilt-android/main/java/dagger/hilt/android/lifecycle/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ android_library(
3333
name = "hilt_view_model",
3434
srcs = ["HiltViewModel.java"],
3535
exported_plugins = [
36-
"//java/dagger/hilt/android/processor/internal/viewmodel:processor",
36+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor",
3737
],
3838
exports = [
3939
"//:dagger_with_compiler",

hilt-compiler/BUILD

+150
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
# Copyright (C) 2020 The Dagger Authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Description:
16+
# Hilt android processors.
17+
18+
load("@rules_java//java:defs.bzl", "java_library")
19+
load("//:build_defs.bzl", "POM_VERSION")
20+
load("//tools/maven:maven.bzl", "gen_maven_artifact")
21+
22+
package(default_visibility = ["//:src"])
23+
24+
_ARTIFACT_EXPORTS = [
25+
"//dagger-compiler/main/java/dagger/internal/codegen:processor",
26+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:processor_lib",
27+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue:bind_value_processor_lib",
28+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication:processor_lib",
29+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor_lib",
30+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin_lib",
31+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:processor_lib",
32+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:processor_lib",
33+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:processor_lib",
34+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor_lib",
35+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:processor_lib",
36+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/originatingelement:processor_lib",
37+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_processor_lib",
38+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_processor_lib",
39+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:processor_lib",
40+
]
41+
42+
_ARTIFACT_TARGET_LIBS = [
43+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
44+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:android_generators",
45+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:metadata",
46+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:processor_lib",
47+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue:bind_value_processor_lib",
48+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication:processor_lib",
49+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin_lib",
50+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor_lib",
51+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:aggregated_elements",
52+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
53+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
54+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
55+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:dagger_models",
56+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_descriptor",
57+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_names",
58+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
59+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:hilt_processing_env_configs",
60+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:method_signature",
61+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
62+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
63+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:component_dependencies",
64+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:pkg_private_metadata",
65+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:processor_lib",
66+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:alias_ofs",
67+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:processor_lib",
68+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:define_components",
69+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:metadatas",
70+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:processor_lib",
71+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:aggregated_early_entry_point_metadata",
72+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor_lib",
73+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:generates_root_inputs",
74+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:processor_lib",
75+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
76+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/optionvalues:optionvalues",
77+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/originatingelement:processor_lib",
78+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_processor_lib",
79+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_processor_lib",
80+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_metadata",
81+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_type",
82+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root/ir:ir",
83+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:processor_lib",
84+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:aggregated_uninstall_modules_metadata",
85+
]
86+
87+
_ARTIFACT_TARGET_MAVEN_DEPS = [
88+
"com.google.code.findbugs:jsr305",
89+
"com.google.dagger:dagger-compiler",
90+
"com.google.dagger:dagger",
91+
"com.google.dagger:dagger-spi",
92+
"com.google.devtools.ksp:symbol-processing-api",
93+
"com.google.guava:failureaccess",
94+
"com.google.guava:guava",
95+
"com.squareup:javapoet",
96+
"com.squareup:kotlinpoet",
97+
"com.squareup:kotlinpoet-javapoet",
98+
"javax.inject:javax.inject",
99+
"net.ltgt.gradle.incap:incap",
100+
"org.jetbrains.kotlin:kotlin-stdlib",
101+
]
102+
103+
_JAVA_DOC_ROOT_PACKAGES = [
104+
# Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
105+
"dagger.hilt.processor.internal",
106+
"dagger.hilt.android.processor.internal",
107+
]
108+
109+
_JAVA_DOC_SRCS = [
110+
"//java/dagger/hilt:hilt_processing_filegroup",
111+
]
112+
113+
java_library(
114+
name = "artifact-lib",
115+
tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION],
116+
exports = _ARTIFACT_EXPORTS,
117+
)
118+
119+
gen_maven_artifact(
120+
name = "artifact",
121+
artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION,
122+
artifact_name = "Hilt Processor",
123+
artifact_target = ":artifact-lib",
124+
artifact_target_libs = _ARTIFACT_TARGET_LIBS,
125+
artifact_target_maven_deps = _ARTIFACT_TARGET_MAVEN_DEPS,
126+
javadoc_android_api_level = 34,
127+
javadoc_root_packages = _JAVA_DOC_ROOT_PACKAGES,
128+
javadoc_srcs = _JAVA_DOC_SRCS,
129+
)
130+
131+
java_library(
132+
name = "legacy-artifact-lib",
133+
tags = ["maven_coordinates=com.google.dagger:hilt-android-compiler:" + POM_VERSION],
134+
exports = _ARTIFACT_EXPORTS,
135+
)
136+
137+
# TODO(bcorso): Remove this artifact. We renamed this artifact to hilt-compiler in Dagger 2.29 as we
138+
# plan to create a non-android Hilt which will share the same compiler artifact as Hilt android.
139+
gen_maven_artifact(
140+
name = "legacy-artifact",
141+
artifact_coordinates = "com.google.dagger:hilt-android-compiler:" + POM_VERSION,
142+
artifact_name = "Hilt Android Processor",
143+
artifact_target = ":legacy-artifact-lib",
144+
artifact_target_libs = _ARTIFACT_TARGET_LIBS,
145+
artifact_target_maven_deps = _ARTIFACT_TARGET_MAVEN_DEPS,
146+
javadoc_android_api_level = 34,
147+
javadoc_root_packages = _JAVA_DOC_ROOT_PACKAGES,
148+
javadoc_srcs = _JAVA_DOC_SRCS,
149+
pom_name = "legacy-pom",
150+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (C) 2020 The Dagger Authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Description:
16+
# Hilt android processors.
17+
18+
package(default_visibility = ["//:src"])
19+
20+
filegroup(
21+
name = "srcs_filegroup",
22+
srcs = glob(["*"]),
23+
)

java/dagger/hilt/android/processor/internal/androidentrypoint/BUILD hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint/BUILD

+17-17
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ java_library(
4343
":android_generators",
4444
":metadata",
4545
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
46-
"//java/dagger/hilt/android/processor/internal:android_classnames",
47-
"//java/dagger/hilt/processor/internal:base_processor",
48-
"//java/dagger/hilt/processor/internal:compiler_options",
49-
"//java/dagger/hilt/processor/internal:processor_errors",
50-
"//java/dagger/hilt/processor/internal/optionvalues",
46+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
47+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
48+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
49+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
50+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/optionvalues",
5151
"//third_party/java/auto:service",
5252
"//third_party/java/guava/collect",
5353
"//third_party/java/incap",
@@ -72,12 +72,12 @@ java_library(
7272
":metadata",
7373
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
7474
"//dagger-spi",
75-
"//java/dagger/hilt/android/processor/internal:android_classnames",
76-
"//java/dagger/hilt/processor/internal:classnames",
77-
"//java/dagger/hilt/processor/internal:component_names",
78-
"//java/dagger/hilt/processor/internal:method_signature",
79-
"//java/dagger/hilt/processor/internal:processor_errors",
80-
"//java/dagger/hilt/processor/internal:processors",
75+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
76+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
77+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_names",
78+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:method_signature",
79+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
80+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
8181
"//third_party/java/guava/base",
8282
"//third_party/java/guava/collect",
8383
"//third_party/java/javapoet",
@@ -93,12 +93,12 @@ java_library(
9393
deps = [
9494
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
9595
"//dagger-spi",
96-
"//java/dagger/hilt/android/processor/internal:android_classnames",
97-
"//java/dagger/hilt/processor/internal:compiler_options",
98-
"//java/dagger/hilt/processor/internal:components",
99-
"//java/dagger/hilt/processor/internal:processor_errors",
100-
"//java/dagger/hilt/processor/internal:processors",
101-
"//java/dagger/hilt/processor/internal/kotlin",
96+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
97+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
98+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
99+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
100+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
101+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
102102
"//third_party/java/auto:value",
103103
"//third_party/java/guava/base",
104104
"//third_party/java/guava/collect",

java/dagger/hilt/android/processor/internal/androidentrypoint/Generators.java hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint/Generators.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ && getOnlyElement(constructors).getParameters().isEmpty()
9494
}
9595

9696
/**
97-
* Returns true if the constructor is visibile to a subclass in the same package as the reference.
97+
* Returns true if the constructor is visible to a subclass in the same package as the reference.
9898
* A reference is used because usually for generators the subclass is being generated and so
9999
* doesn't actually exist.
100100
*/

java/dagger/hilt/android/processor/internal/bindvalue/BUILD hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue/BUILD

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ java_library(
4040
"//:dagger_with_compiler",
4141
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
4242
"//dagger-spi",
43-
"//java/dagger/hilt/processor/internal:base_processor",
44-
"//java/dagger/hilt/processor/internal:classnames",
45-
"//java/dagger/hilt/processor/internal:components",
46-
"//java/dagger/hilt/processor/internal:processor_errors",
47-
"//java/dagger/hilt/processor/internal:processors",
48-
"//java/dagger/hilt/processor/internal/kotlin",
43+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
44+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
45+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
46+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
47+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
48+
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
4949
"//third_party/java/auto:service",
5050
"//third_party/java/auto:value",
5151
"//third_party/java/guava/base",

java/dagger/hilt/android/processor/internal/customtestapplication/BUILD hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication/BUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ java_library(
3838
deps = [
3939
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
4040
"//dagger-spi",
41-
"//java/dagger/hilt/processor/internal:base_processor",
42-
"//java/dagger/hilt/processor/internal:classnames",
43-
"//java/dagger/hilt/processor/internal:processor_errors",
44-
"//java/dagger/hilt/processor/internal:processors",
41+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
42+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
43+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
44+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
4545
"//third_party/java/auto:service",
4646
"//third_party/java/auto:value",
4747
"//third_party/java/guava/base",

java/dagger/hilt/android/processor/internal/viewmodel/BUILD hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel/BUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ kt_jvm_library(
3737
],
3838
deps = [
3939
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
40-
"//java/dagger/hilt/android/processor/internal:android_classnames",
41-
"//java/dagger/hilt/processor/internal:base_processor",
42-
"//java/dagger/hilt/processor/internal:classnames",
43-
"//java/dagger/hilt/processor/internal:compiler_options",
44-
"//java/dagger/hilt/processor/internal:processor_errors",
45-
"//java/dagger/hilt/processor/internal:processors",
40+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
41+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
42+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
43+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
44+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
45+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
4646
"//third_party/java/auto:service",
4747
"//third_party/java/guava/collect",
4848
"//third_party/java/incap",
@@ -64,8 +64,8 @@ kt_jvm_library(
6464
deps = [
6565
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
6666
"//dagger-spi",
67-
"//java/dagger/hilt/android/processor/internal:android_classnames",
68-
"//java/dagger/hilt/processor/internal:dagger_models",
67+
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
68+
"//hilt-compiler/main/java/dagger/hilt/processor/internal:dagger_models",
6969
"//third_party/java/auto:service",
7070
"//third_party/java/guava/graph",
7171
"//third_party/java/javapoet",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (C) 2020 The Dagger Authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Description:
16+
# Hilt android processors.
17+
18+
package(default_visibility = ["//:src"])
19+
20+
filegroup(
21+
name = "srcs_filegroup",
22+
srcs = glob(["*"]),
23+
)

0 commit comments

Comments
 (0)