Restructure dagger-spi sources

RELNOTES=N/A
PiperOrigin-RevId: 730949440

Author: bcorso

BUILD

@@ -45,11 +45,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "spi",
-    exports = ["//java/dagger/spi"],
-)
-
 java_library(
     name = "compiler_internals",
     exports = [
@@ -109,13 +104,13 @@ javadoc_library(
     testonly = 1,
     srcs = [
         "//dagger-runtime/main/java/dagger:javadoc-srcs",
+        "//dagger-spi:srcs",
         "//java/dagger/android:android-srcs",
         "//java/dagger/android/support:support-srcs",
         "//java/dagger/grpc/server:javadoc-srcs",
         "//java/dagger/grpc/server/processor:javadoc-srcs",
         "//java/dagger/hilt:javadoc-srcs",
         "//java/dagger/producers:producers-srcs",
-        "//java/dagger/spi:spi-srcs",
     ],
     android_api_level = 34,
     # TODO(ronshapiro): figure out how to specify the version number for release builds
@@ -130,13 +125,13 @@ javadoc_library(
     root_packages = ["dagger"],
     deps = [
         "//dagger-runtime/main/java/dagger:core",
+        "//dagger-spi",
         "//java/dagger/android",
         "//java/dagger/android/support",
         "//java/dagger/grpc/server",
         "//java/dagger/grpc/server/processor",
         "//java/dagger/hilt/android:artifact-lib",
         "//java/dagger/hilt/android/testing:artifact-lib",
         "//java/dagger/producers",
-        "//java/dagger/spi",
     ],
 )

java/dagger/spi/BUILD dagger-spi/BUILDjava/dagger/spi/BUILD renamed to dagger-spi/BUILD

@@ -16,51 +16,50 @@
 #   The Service Provider Interface for Dagger's binding graph model
 
 load("@rules_java//java:defs.bzl", "java_library")
-load(
-    "//:build_defs.bzl",
-    "DOCLINT_HTML_AND_SYNTAX",
-    "DOCLINT_REFERENCES",
-    "POM_VERSION",
-)
+load("//:build_defs.bzl", "POM_VERSION")
 load("//tools/maven:maven.bzl", "gen_maven_artifact")
 
 package(default_visibility = ["//:src"])
 
+package_group(
+    name = "internal",
+    packages = [
+        "//dagger-spi/...",
+    ],
+)
+
+ARTIFACT_COORDINATES = "com.google.dagger:dagger-spi:" + POM_VERSION
+
+ARTIFACT_LIBS = [
+    "//dagger-spi/main/java/dagger/internal/codegen/extension",
+    "//dagger-spi/main/java/dagger/model",
+    "//dagger-spi/main/java/dagger/spi",
+    "//dagger-spi/main/java/dagger/spi/model",
+]
+
 filegroup(
-    name = "spi-srcs",
-    srcs = glob(["*.java"]) + [
-        "//java/dagger/model:model-srcs",
-        "//java/dagger/spi/model:model-srcs",
+    name = "srcs",
+    srcs = [
+        "//dagger-spi/main/java/dagger/model:srcs",
+        "//dagger-spi/main/java/dagger/spi:srcs",
+        "//dagger-spi/main/java/dagger/spi/model:srcs",
     ],
 )
 
+# Other artifacts should only depend on this target to ensure that their POM file includes the
+# dagger-spi dependency which is found via the maven_coordinates tag.
 java_library(
-    name = "spi",
-    srcs = glob(["*.java"]),
-    javacopts = DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES,
-    tags = ["maven_coordinates=com.google.dagger:dagger-spi:" + POM_VERSION],
-    exports = [
-        "//java/dagger/model",
-        "//java/dagger/spi/model",
-    ],
-    deps = [
-        "//dagger-runtime/main/java/dagger:core",
-        "//java/dagger/model",
-        "//third_party/java/auto:value",
-        "//third_party/java/error_prone:annotations",
-    ],
+    name = "dagger-spi",
+    tags = ["maven_coordinates=" + ARTIFACT_COORDINATES],
+    exports = ARTIFACT_LIBS,
 )
 
 gen_maven_artifact(
     name = "artifact",
-    artifact_coordinates = "com.google.dagger:dagger-spi:" + POM_VERSION,
+    artifact_coordinates = ARTIFACT_COORDINATES,
     artifact_name = "Dagger SPI",
-    artifact_target = ":spi",
-    artifact_target_libs = [
-        "//java/dagger/internal/codegen/extension",
-        "//java/dagger/model",
-        "//java/dagger/spi/model",
-    ],
+    artifact_target = ":dagger-spi",
+    artifact_target_libs = ARTIFACT_LIBS,
     artifact_target_maven_deps = [
         "com.google.code.findbugs:jsr305",
         "com.google.dagger:dagger",
@@ -74,7 +73,7 @@ gen_maven_artifact(
         "dagger.model",
         "dagger.spi",
     ],
-    javadoc_srcs = [":spi-srcs"],
+    javadoc_srcs = [":srcs"],
     # 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-dagger.sh

…/dagger/internal/codegen/extension/BUILD …/dagger/internal/codegen/extension/BUILDjava/dagger/internal/codegen/extension/BUILD renamed to dagger-spi/main/java/dagger/internal/codegen/extension/BUILD java/dagger/internal/codegen/extension/BUILD renamed to dagger-spi/main/java/dagger/internal/codegen/extension/BUILD

@@ -18,7 +18,7 @@
 
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//:src"])
+package(default_visibility = ["//dagger-spi:internal"])
 
 java_library(
     name = "extension",

…/codegen/extension/DaggerCollectors.java …/codegen/extension/DaggerCollectors.javajava/dagger/internal/codegen/extension/DaggerCollectors.java renamed to dagger-spi/main/java/dagger/internal/codegen/extension/DaggerCollectors.java java/dagger/internal/codegen/extension/DaggerCollectors.java renamed to dagger-spi/main/java/dagger/internal/codegen/extension/DaggerCollectors.java

@@ -22,28 +22,22 @@ load(
     "DOCLINT_REFERENCES",
 )
 
-package(default_visibility = [
-    # The dagger/spi should be the only direct dependent on this target.
-    # If you need to depend on :model, depend on dagger/spi instead so
-    # that pom files correctly pick up the spi maven dependency.
-    # TODO(bcorso): Consider if :model should have its own maven coordinates.
-    "//java/dagger/spi:__pkg__",
-])
+package(default_visibility = ["//dagger-spi:internal"])
 
 filegroup(
-    name = "model-srcs",
+    name = "srcs",
     srcs = glob(
         ["*.java"],
     ),
 )
 
 java_library(
     name = "model",
-    srcs = [":model-srcs"],
+    srcs = [":srcs"],
     javacopts = DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES,
     deps = [
         "//dagger-runtime/main/java/dagger:core",
-        "//java/dagger/internal/codegen/extension",
+        "//dagger-spi/main/java/dagger/internal/codegen/extension",
         "//third_party/java/auto:common",
         "//third_party/java/auto:value",
         "//third_party/java/error_prone:annotations",