Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure hilt-compiler sources #4644

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions hilt-android/main/java/dagger/hilt/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android_library(
"WithFragmentBindings.java",
],
exported_plugins = [
"//java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
],
exports = [
"//hilt-android/main/java/dagger/hilt/android/components",
Expand Down Expand Up @@ -64,10 +64,10 @@ android_library(
name = "hilt_android_app",
srcs = ["HiltAndroidApp.java"],
exported_plugins = [
"//java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
"//java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin",
"//java/dagger/hilt/processor/internal/root:component_tree_deps_plugin",
"//java/dagger/hilt/processor/internal/root:root_plugin",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:plugin",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_plugin",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_plugin",
],
exports = [
"//:dagger_with_compiler",
Expand Down Expand Up @@ -131,8 +131,8 @@ android_library(
"EarlyEntryPoints.java",
],
exported_plugins = [
"//java/dagger/hilt/processor/internal/aggregateddeps:plugin",
"//java/dagger/hilt/processor/internal/earlyentrypoint:processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:plugin",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor",
],
proguard_specs = ["proguard-rules.pro"],
exports = [
Expand Down
2 changes: 1 addition & 1 deletion hilt-android/main/java/dagger/hilt/android/lifecycle/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android_library(
name = "hilt_view_model",
srcs = ["HiltViewModel.java"],
exported_plugins = [
"//java/dagger/hilt/android/processor/internal/viewmodel:processor",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor",
],
exports = [
"//:dagger_with_compiler",
Expand Down
150 changes: 150 additions & 0 deletions hilt-compiler/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
# Copyright (C) 2020 The Dagger Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Description:
# Hilt android processors.

load("@rules_java//java:defs.bzl", "java_library")
load("//:build_defs.bzl", "POM_VERSION")
load("//tools/maven:maven.bzl", "gen_maven_artifact")

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

_ARTIFACT_EXPORTS = [
"//dagger-compiler/main/java/dagger/internal/codegen:processor",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue:bind_value_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/originatingelement:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:processor_lib",
]

_ARTIFACT_TARGET_LIBS = [
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:android_generators",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:metadata",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue:bind_value_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:validation_plugin_lib",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:aggregated_elements",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:dagger_models",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_descriptor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_names",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:hilt_processing_env_configs",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:method_signature",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:component_dependencies",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:pkg_private_metadata",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:alias_ofs",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:define_components",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:metadatas",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:aggregated_early_entry_point_metadata",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:generates_root_inputs",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/optionvalues:optionvalues",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/originatingelement:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:component_tree_deps_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_metadata",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root:root_type",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/root/ir:ir",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:processor_lib",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules:aggregated_uninstall_modules_metadata",
]

_ARTIFACT_TARGET_MAVEN_DEPS = [
"com.google.code.findbugs:jsr305",
"com.google.dagger:dagger-compiler",
"com.google.dagger:dagger",
"com.google.dagger:dagger-spi",
"com.google.devtools.ksp:symbol-processing-api",
"com.google.guava:failureaccess",
"com.google.guava:guava",
"com.squareup:javapoet",
"com.squareup:kotlinpoet",
"com.squareup:kotlinpoet-javapoet",
"javax.inject:javax.inject",
"net.ltgt.gradle.incap:incap",
"org.jetbrains.kotlin:kotlin-stdlib",
]

_JAVA_DOC_ROOT_PACKAGES = [
# Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
"dagger.hilt.processor.internal",
"dagger.hilt.android.processor.internal",
]

_JAVA_DOC_SRCS = [
"//java/dagger/hilt:hilt_processing_filegroup",
]

java_library(
name = "artifact-lib",
tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION],
exports = _ARTIFACT_EXPORTS,
)

gen_maven_artifact(
name = "artifact",
artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION,
artifact_name = "Hilt Processor",
artifact_target = ":artifact-lib",
artifact_target_libs = _ARTIFACT_TARGET_LIBS,
artifact_target_maven_deps = _ARTIFACT_TARGET_MAVEN_DEPS,
javadoc_android_api_level = 34,
javadoc_root_packages = _JAVA_DOC_ROOT_PACKAGES,
javadoc_srcs = _JAVA_DOC_SRCS,
)

java_library(
name = "legacy-artifact-lib",
tags = ["maven_coordinates=com.google.dagger:hilt-android-compiler:" + POM_VERSION],
exports = _ARTIFACT_EXPORTS,
)

# TODO(bcorso): Remove this artifact. We renamed this artifact to hilt-compiler in Dagger 2.29 as we
# plan to create a non-android Hilt which will share the same compiler artifact as Hilt android.
gen_maven_artifact(
name = "legacy-artifact",
artifact_coordinates = "com.google.dagger:hilt-android-compiler:" + POM_VERSION,
artifact_name = "Hilt Android Processor",
artifact_target = ":legacy-artifact-lib",
artifact_target_libs = _ARTIFACT_TARGET_LIBS,
artifact_target_maven_deps = _ARTIFACT_TARGET_MAVEN_DEPS,
javadoc_android_api_level = 34,
javadoc_root_packages = _JAVA_DOC_ROOT_PACKAGES,
javadoc_srcs = _JAVA_DOC_SRCS,
pom_name = "legacy-pom",
)
23 changes: 23 additions & 0 deletions hilt-compiler/main/java/dagger/hilt/android/processor/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (C) 2020 The Dagger Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Description:
# Hilt android processors.

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

filegroup(
name = "srcs_filegroup",
srcs = glob(["*"]),
)
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ java_library(
":android_generators",
":metadata",
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//java/dagger/hilt/android/processor/internal:android_classnames",
"//java/dagger/hilt/processor/internal:base_processor",
"//java/dagger/hilt/processor/internal:compiler_options",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal/optionvalues",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/optionvalues",
"//third_party/java/auto:service",
"//third_party/java/guava/collect",
"//third_party/java/incap",
Expand All @@ -72,12 +72,12 @@ java_library(
":metadata",
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//dagger-spi",
"//java/dagger/hilt/android/processor/internal:android_classnames",
"//java/dagger/hilt/processor/internal:classnames",
"//java/dagger/hilt/processor/internal:component_names",
"//java/dagger/hilt/processor/internal:method_signature",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:component_names",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:method_signature",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
"//third_party/java/javapoet",
Expand All @@ -93,12 +93,12 @@ java_library(
deps = [
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//dagger-spi",
"//java/dagger/hilt/android/processor/internal:android_classnames",
"//java/dagger/hilt/processor/internal:compiler_options",
"//java/dagger/hilt/processor/internal:components",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal:processors",
"//java/dagger/hilt/processor/internal/kotlin",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
"//third_party/java/auto:value",
"//third_party/java/guava/base",
"//third_party/java/guava/collect",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ && getOnlyElement(constructors).getParameters().isEmpty()
}

/**
* Returns true if the constructor is visibile to a subclass in the same package as the reference.
* Returns true if the constructor is visible to a subclass in the same package as the reference.
* A reference is used because usually for generators the subclass is being generated and so
* doesn't actually exist.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ java_library(
"//:dagger_with_compiler",
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//dagger-spi",
"//java/dagger/hilt/processor/internal:base_processor",
"//java/dagger/hilt/processor/internal:classnames",
"//java/dagger/hilt/processor/internal:components",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal:processors",
"//java/dagger/hilt/processor/internal/kotlin",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:components",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal/kotlin",
"//third_party/java/auto:service",
"//third_party/java/auto:value",
"//third_party/java/guava/base",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ java_library(
deps = [
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//dagger-spi",
"//java/dagger/hilt/processor/internal:base_processor",
"//java/dagger/hilt/processor/internal:classnames",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//third_party/java/auto:service",
"//third_party/java/auto:value",
"//third_party/java/guava/base",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ kt_jvm_library(
],
deps = [
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//java/dagger/hilt/android/processor/internal:android_classnames",
"//java/dagger/hilt/processor/internal:base_processor",
"//java/dagger/hilt/processor/internal:classnames",
"//java/dagger/hilt/processor/internal:compiler_options",
"//java/dagger/hilt/processor/internal:processor_errors",
"//java/dagger/hilt/processor/internal:processors",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:base_processor",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:compiler_options",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processor_errors",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:processors",
"//third_party/java/auto:service",
"//third_party/java/guava/collect",
"//third_party/java/incap",
Expand All @@ -64,8 +64,8 @@ kt_jvm_library(
deps = [
"//dagger-compiler/main/java/dagger/internal/codegen/xprocessing",
"//dagger-spi",
"//java/dagger/hilt/android/processor/internal:android_classnames",
"//java/dagger/hilt/processor/internal:dagger_models",
"//hilt-compiler/main/java/dagger/hilt/android/processor/internal:android_classnames",
"//hilt-compiler/main/java/dagger/hilt/processor/internal:dagger_models",
"//third_party/java/auto:service",
"//third_party/java/guava/graph",
"//third_party/java/javapoet",
Expand Down
23 changes: 23 additions & 0 deletions hilt-compiler/main/java/dagger/hilt/processor/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (C) 2020 The Dagger Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Description:
# Hilt android processors.

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

filegroup(
name = "srcs_filegroup",
srcs = glob(["*"]),
)
Loading