Split apple starlarkbuildapi into apple and objc

This is needed to break up the circular dependency in some upcoming work, where
some Apple APIs need to depend on cpp.  In general, anything that is
ObjC-related should be moved to objc.  Specifically, this change:

1. moves ObjcProviderApi to objc.
2. moves any API depending on ObjcProviderApi to objc.

This refactoring allows us to add CcInfoApi to objc APIs that carry linking
info, in preparation for migrating linking info to CcInfo.

PiperOrigin-RevId: 481916193
Change-Id: I56f88fd64f617b7c14137e43deb23206eabe9da3

src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD

@@ -64,7 +64,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/exec:module_action_context_registry",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_cache",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_strategy_registry",
-        "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/packages/semantics",
         "//src/main/java/com/google/devtools/build/lib/remote",
         "//src/main/java/com/google/devtools/build/lib/remote/options",
@@ -93,9 +92,9 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/proto",
         "//src/main/java/com/google/devtools/build/lib/rules/python",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android",
-        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/proto",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/stubs",

src/main/java/com/google/devtools/build/lib/bazel/rules/ObjcRules.java

@@ -37,7 +37,7 @@
 import com.google.devtools.build.lib.rules.objc.ObjcImportBaseRule;
 import com.google.devtools.build.lib.rules.objc.ObjcLibraryBaseRule;
 import com.google.devtools.build.lib.rules.objc.ObjcRuleClasses;
-import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleBootstrap;
+import com.google.devtools.build.lib.starlarkbuildapi.objc.AppleBootstrap;
 
 /** Rules for Objective-C support in Bazel. */
 public class ObjcRules implements RuleSet {

src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java

@@ -20,7 +20,7 @@
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.BuiltinProvider;
 import com.google.devtools.build.lib.packages.NativeInfo;
-import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleDynamicFrameworkInfoApi;
+import com.google.devtools.build.lib.starlarkbuildapi.objc.AppleDynamicFrameworkInfoApi;
 import javax.annotation.Nullable;
 
 /**

src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java

@@ -18,7 +18,7 @@
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.BuiltinProvider;
 import com.google.devtools.build.lib.packages.NativeInfo;
-import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleExecutableBinaryApi;
+import com.google.devtools.build.lib.starlarkbuildapi.objc.AppleExecutableBinaryApi;
 
 /**
  * Provider containing the executable binary output that was built using an apple_binary target with

src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java

@@ -44,7 +44,7 @@
 import com.google.devtools.build.lib.rules.cpp.CppSemantics;
 import com.google.devtools.build.lib.rules.objc.ObjcProvider.Flag;
 import com.google.devtools.build.lib.starlarkbuildapi.SplitTransitionProviderApi;
-import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleCommonApi;
+import com.google.devtools.build.lib.starlarkbuildapi.objc.AppleCommonApi;
 import java.util.Map;
 import javax.annotation.Nullable;
 import net.starlark.java.eval.Dict;

src/main/java/com/google/devtools/build/lib/rules/objc/BUILD

@@ -58,6 +58,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/vfs",

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java

@@ -39,7 +39,7 @@
 import com.google.devtools.build.lib.rules.cpp.CcLinkingContext;
 import com.google.devtools.build.lib.rules.cpp.CcModule;
 import com.google.devtools.build.lib.rules.cpp.LibraryToLink;
-import com.google.devtools.build.lib.starlarkbuildapi.apple.ObjcProviderApi;
+import com.google.devtools.build.lib.starlarkbuildapi.objc.ObjcProviderApi;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.Collections;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD

@@ -24,6 +24,7 @@ filegroup(
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp:srcs",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java:srcs",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/go:srcs",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc:srcs",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/platform:srcs",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python:srcs",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/repository:srcs",

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleBootstrap.java → src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.starlarkbuildapi.apple;
+package com.google.devtools.build.lib.starlarkbuildapi.objc;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java → src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleCommonApi.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.starlarkbuildapi.apple;
+package com.google.devtools.build.lib.starlarkbuildapi.objc;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
@@ -21,6 +21,10 @@
 import com.google.devtools.build.lib.starlarkbuildapi.FileApi;
 import com.google.devtools.build.lib.starlarkbuildapi.SplitTransitionProviderApi;
 import com.google.devtools.build.lib.starlarkbuildapi.StarlarkRuleContextApi;
+import com.google.devtools.build.lib.starlarkbuildapi.apple.ApplePlatformApi;
+import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleToolchainApi;
+import com.google.devtools.build.lib.starlarkbuildapi.apple.DottedVersionApi;
+import com.google.devtools.build.lib.starlarkbuildapi.apple.XcodeConfigInfoApi;
 import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi;
 import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi;
 import com.google.devtools.build.lib.starlarkbuildapi.platform.ConstraintValueInfoApi;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleDynamicFrameworkInfoApi.java → src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleDynamicFrameworkInfoApi.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.starlarkbuildapi.apple;
+package com.google.devtools.build.lib.starlarkbuildapi.objc;
 
 import com.google.devtools.build.docgen.annot.DocCategory;
 import com.google.devtools.build.lib.collect.nestedset.Depset;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleExecutableBinaryApi.java → src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleExecutableBinaryApi.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.starlarkbuildapi.apple;
+package com.google.devtools.build.lib.starlarkbuildapi.objc;
 
 import com.google.devtools.build.docgen.annot.DocCategory;
 import com.google.devtools.build.lib.starlarkbuildapi.FileApi;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/BUILD

@@ -0,0 +1,39 @@
+# Description:
+#   This package contains interfaces representing the Starlark "build API"
+#   (but not the implementation of that API). Ultimately, this package
+#   may be broken out of the Bazel package hierarchy to be standalone.
+#   Thus, this package should not depend on Bazel-specific packages (only
+#   those which contain pure-Starlark concepts, such as the interpreter or
+#   annotation interfaces).
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(default_visibility = ["//src:__subpackages__"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+    visibility = ["//src:__subpackages__"],
+)
+
+java_library(
+    name = "objc",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//third_party:guava",
+        "//src/main/java/com/google/devtools/build/docgen/annot",
+        "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/starlark_exposed_rule_transition_factory",
+        "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
+        "//src/main/java/com/google/devtools/build/lib/packages/semantics",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/platform",
+        "//src/main/java/net/starlark/java/annot",
+        # TODO(b/80307387): Remove dependency on Depset.
+        "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+        "//src/main/java/net/starlark/java/eval",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple",
+        "//third_party:jsr305",
+    ],
+)

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/ObjcProviderApi.java → src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/ObjcProviderApi.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.starlarkbuildapi.apple;
+package com.google.devtools.build.lib.starlarkbuildapi.objc;
 
 import com.google.devtools.build.docgen.annot.DocCategory;
 import com.google.devtools.build.lib.collect.nestedset.Depset;