Skip to content

Commit

Permalink
Restructure dagger-android-processor sources
Browse files Browse the repository at this point in the history
RELNOTES=N/A
PiperOrigin-RevId: 731733595
  • Loading branch information
bcorso authored and Dagger Team committed Feb 27, 2025
1 parent 6eba54b commit 13ee3a7
Show file tree
Hide file tree
Showing 16 changed files with 86 additions and 37 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ java_library(

android_library(
name = "android",
exported_plugins = ["//java/dagger/android/processor:plugin"],
exported_plugins = ["//dagger-android-processor:plugin"],
exports = ["//java/dagger/android"],
)

Expand Down
76 changes: 76 additions & 0 deletions dagger-android-processor/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Copyright (C) 2017 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:
# Public Dagger API for Android

load("//:build_defs.bzl", "POM_VERSION")
load("//tools/maven:maven.bzl", "gen_maven_artifact")

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

package_group(
name = "internal",
packages = [
"//dagger-android-processor/...",
"//javatests/dagger/android/processor/...",
],
)

gen_maven_artifact(
name = "artifact",
artifact_coordinates = "com.google.dagger:dagger-android-processor:" + POM_VERSION,
artifact_name = "Dagger Android Processor",
artifact_target = "//dagger-android-processor/main/java/dagger/android/processor",
artifact_target_libs = [
"//java/dagger/internal/codegen/xprocessing",
"//dagger-android-processor/main/java/dagger/android/processor:base_processing_step",
],
artifact_target_maven_deps = [
"com.google.dagger:dagger",
"com.google.devtools.ksp:symbol-processing-api",
"com.google.guava:guava",
"com.squareup:javapoet",
"com.google.code.findbugs:jsr305",
"com.google.dagger:dagger-spi",
"com.google.guava:failureaccess",
"com.squareup:kotlinpoet",
"com.squareup:kotlinpoet-javapoet",
"net.ltgt.gradle.incap:incap",
"org.jetbrains.kotlin:kotlin-stdlib",
],
javadoc_root_packages = [
"dagger.android.processor",
],
javadoc_srcs = [
"//dagger-android-processor/main/java/dagger/android/processor:srcs",
],
)

# Note: We're exposing this to the proguard processor, which is not actually used by any artifact.
alias(
name = "base_processing_step",
actual = "//dagger-android-processor/main/java/dagger/android/processor:base_processing_step",
visibility = [
"//java/dagger/android/internal/proguard:__pkg__",
],
)

alias(
name = "plugin",
actual = "//dagger-android-processor/main/java/dagger/android/processor:plugin",
visibility = [
"//:__pkg__",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ load(
"DOCLINT_REFERENCES",
"POM_VERSION",
)
load("//tools/maven:maven.bzl", "gen_maven_artifact")

package(default_visibility = ["//:src"])
package(default_visibility = [
"//dagger-android-processor:internal",
])

filegroup(
name = "srcs",
Expand Down Expand Up @@ -66,34 +67,6 @@ java_library(
],
)

gen_maven_artifact(
name = "artifact",
artifact_coordinates = "com.google.dagger:dagger-android-processor:" + POM_VERSION,
artifact_name = "Dagger Android Processor",
artifact_target = ":processor",
artifact_target_libs = [
"//java/dagger/internal/codegen/xprocessing",
"//java/dagger/android/processor:base_processing_step",
],
artifact_target_maven_deps = [
"com.google.dagger:dagger",
"com.google.devtools.ksp:symbol-processing-api",
"com.google.guava:guava",
"com.squareup:javapoet",
"com.google.code.findbugs:jsr305",
"com.google.dagger:dagger-spi",
"com.google.guava:failureaccess",
"com.squareup:kotlinpoet",
"com.squareup:kotlinpoet-javapoet",
"net.ltgt.gradle.incap:incap",
"org.jetbrains.kotlin:kotlin-stdlib",
],
javadoc_root_packages = [
"dagger.android.processor",
],
javadoc_srcs = [":srcs"],
)

java_plugin(
name = "plugin",
generates_api = 1,
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 @@ -29,7 +29,7 @@ java_library(
],
javacopts = DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES,
deps = [
"//java/dagger/android/processor:base_processing_step",
"//dagger-android-processor:base_processing_step",
"//java/dagger/internal/codegen/xprocessing",
"//third_party/java/auto:service",
"//third_party/java/guava/collect",
Expand Down
2 changes: 1 addition & 1 deletion javatests/dagger/android/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ GenJavaTests(
javacopts = DOCLINT_HTML_AND_SYNTAX,
deps = [
"//:dagger_with_compiler",
"//dagger-android-processor/main/java/dagger/android/processor",
"//java/dagger/android",
"//java/dagger/android/processor",
"//java/dagger/internal/codegen:processor",
"//java/dagger/testing/compile",
"//third_party/java/compile_testing",
Expand Down
8 changes: 4 additions & 4 deletions util/deploy-dagger.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ _deploy \

_deploy \
"com.google.auto.common,dagger.spi.internal.shaded.auto.common;androidx.room.compiler,dagger.spi.internal.shaded.androidx.room.compiler;kotlin.metadata,dagger.spi.internal.shaded.kotlin.metadata;androidx.room,dagger.spi.internal.shaded.androidx.room" \
java/dagger/android/processor/artifact.jar \
java/dagger/android/processor/pom.xml \
java/dagger/android/processor/artifact-src.jar \
java/dagger/android/processor/artifact-javadoc.jar \
dagger-android-processor/artifact.jar \
dagger-android-processor/pom.xml \
dagger-android-processor/artifact-src.jar \
dagger-android-processor/artifact-javadoc.jar \
""

_deploy \
Expand Down

0 comments on commit 13ee3a7

Please sign in to comment.