Add rules for building SDK frameworks for explicit module compilation

.bazelrc

@@ -36,6 +36,12 @@ build --features apple.arm64_simulator_use_device_deps
 # Note - tree artifacts needs to be on
 build:lldb_ios_test --spawn_strategy=standalone --apple_platform_type=ios --define=apple.experimental.tree_artifact_outputs=1
 
+# Configure for explicit module compilation
+# also requires setting EXPLICIT_MODULE env variable to generate the frameworks repo.
+build:explicit_modules --features=swift.use_c_modules
+build:explicit_modules --features=swift.emit_c_module
+build:explicit_modules --action_env=EXPLICIT_MODULES=1
+
 # Delete the VM test suite for github
 build --deleted_packages tests/ios/vmd
 

.github/workflows/tests.yml

@@ -131,3 +131,57 @@ jobs:
         run: .github/workflows/xcode_select.sh
       - name: Build App
         run: bazelisk build -s tests/ios/app/App --apple_platform_type=ios --ios_minimum_os=10.2  --ios_multi_cpus=i386,x86_64
+  explicit_module_tests:
+    name: Build and Test w/ explicit modules
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+      - name: Select Xcode
+        run: .github/workflows/xcode_select.sh
+      - name: Build and Test
+        run: |
+          # Host config
+          bazelisk test --build_tests_only --local_test_jobs=1 \
+          --config=explicit_modules -- \
+          //... -//tests/ios/...
+
+          bazelisk build --config=explicit_modules -- \
+          //... -//tests/ios/... \
+          -//tests/macos/xcconfig:all
+
+          # `deleted_packages` is needed below in order to override the value of the .bazelrc file
+          bazelisk test --build_tests_only -k --local_test_jobs=1 --apple_platform_type=ios --deleted_packages='' \
+          --config=explicit_modules -- \
+          //tests/ios/... \
+          -//tests/ios/frameworks/dynamic:AppWithExtension_output_test    \
+          -//tests/ios/frameworks/dynamic:App_output_test                  \
+          -//tests/ios/frameworks/dynamic:TestAppWithDylibs                \
+          -//tests/ios/frameworks/dynamic:TestAppWithDylibs_output_test    \
+          -//tests/ios/frameworks/mixed-source/custom-module-map:CustomModuleMapTests \
+          -//tests/ios/frameworks/mixed-source/only-source:MixedSourceTest \
+          -//tests/ios/frameworks/testonly:MixedSourceTest                 \
+          -//tests/ios/unit-test/test-imports-app:TestImports-Unit-Tests   \
+          -//tests/ios/frameworks/sources-with-prebuilt-binaries:MixedSourceFrameworkTests
+
+          bazelisk build --apple_platform_type=ios --deleted_packages='' \
+          --config=explicit_modules -- \
+          `bazel query 'kind("ios_application rule", //...)'` \
+          -//tests/ios/app:AppTestOnly \
+          -//tests/ios/app:AppTestOnlyWithExtension \
+          -//tests/ios/app:AppWithDefines \
+          -//tests/ios/app:AppWithSelectableCopts \
+          -//tests/ios/frameworks/dynamic:App \
+          -//tests/ios/frameworks/dynamic:AppWithExtension \
+          -//tests/ios/in-tree-vendor-prebuilt-deps/dynamic/app:App \
+          -//tests/ios/in-tree-vendor-prebuilt-deps/dynamic/app:AppWithSelectableCopts \
+          -//tests/ios/in-tree-vendor-prebuilt-deps/static/app:App \
+          -//tests/ios/in-tree-vendor-prebuilt-deps/static/app:AppWithSelectableCopts \
+          -//tests/ios/unit-test/test-imports-app:TestImports-App \
+          -//tests/ios/xcconfig:App \
+          -//tests/ios/xcframeworks/Basic:XCFrameworksApp \
+          -//tests/ios/xcframeworks/StaticLib:StaticLibApp
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: bazel-testlogs
+          path: bazel-testlogs

BUILD.bazel

@@ -1,6 +1,6 @@
 # Pull buildifer.mac as an http_file, then depend on the file group to make an
 # executable
-load("@build_bazel_rules_swift//swift/internal:feature_names.bzl", "SWIFT_FEATURE_USE_GLOBAL_INDEX_STORE")
+load("@build_bazel_rules_swift//swift/internal:feature_names.bzl", "SWIFT_FEATURE_USE_C_MODULES", "SWIFT_FEATURE_USE_GLOBAL_INDEX_STORE")
 load("//rules:features.bzl", "feature_names")
 load("@bazel_skylib//lib:selects.bzl", "selects")
 
@@ -19,6 +19,13 @@ config_setting(
     },
 )
 
+config_setting(
+    name = "explicit_modules",
+    values = {
+        "features": SWIFT_FEATURE_USE_C_MODULES,
+    },
+)
+
 config_setting(
     name = "virtualize_frameworks",
     values = {

WORKSPACE

@@ -105,7 +105,6 @@ load_framework_dependencies()
 load("//tools/toolchains/xcode_configure:xcode_configure.bzl", "xcode_configure")
 
 xcode_configure(
-    remote_xcode_label = "",
     xcode_locator_label = "//tools/toolchains/xcode_configure:xcode_locator.m",
 )
 

rules/legacy_xcodeproj.bzl

@@ -348,7 +348,7 @@ def _xcodeproj_aspect_impl(target, ctx):
             swift_info = target[SwiftInfo]
             swift_defines.append(depset(_collect_swift_defines(swift_info.direct_modules)))
             swift_defines.append(depset(_collect_swift_defines(swift_info.transitive_modules.to_list())))
-            swift_module_paths = [m.swift.swiftmodule.path for m in target[SwiftInfo].direct_modules]
+            swift_module_paths = [m.swift.swiftmodule.path for m in target[SwiftInfo].direct_modules if m.swift]
         providers.append(
             _SrcsInfo(
                 srcs = depset(srcs, transitive = _get_attr_values_for_name(deps, _SrcsInfo, "srcs")),

rules/library.bzl

@@ -561,7 +561,7 @@ def apple_library(name, library_tools = {}, export_private_headers = True, names
     tags_manual = tags if "manual" in tags else tags + _MANUAL
     platforms = kwargs.pop("platforms", None)
     private_deps = [] + kwargs.pop("private_deps", [])
-    lib_names = []
+    lib_names = ["@xcode_sdk_frameworks"]
     fetch_default_xcconfig = library_tools["fetch_default_xcconfig"](name, default_xcconfig_name, **kwargs) if default_xcconfig_name else {}
     copts_by_build_setting = copts_by_build_setting_with_defaults(xcconfig, fetch_default_xcconfig, xcconfig_by_build_setting)
     enable_framework_vfs = kwargs.pop("enable_framework_vfs", False) or namespace_is_module_name
@@ -915,13 +915,10 @@ def apple_library(name, library_tools = {}, export_private_headers = True, names
 
     if swift_sources:
         additional_swift_copts.extend(("-Xcc", "-I."))
-        if module_map:
-            # Frameworks find the modulemap file via the framework vfs overlay
-            if not namespace_is_module_name:
-                additional_swift_copts += ["-Xcc", "-fmodule-map-file=" + "$(execpath " + module_map + ")"]
-            additional_swift_copts.append(
-                "-import-underlying-module",
-            )
+
+        # Frameworks find the modulemap file via the framework vfs overlay
+        if module_map and not namespace_is_module_name:
+            additional_swift_copts += ["-Xcc", "-fmodule-map-file=" + "$(execpath " + module_map + ")"]
         swiftc_inputs = other_inputs + objc_hdrs + objc_private_hdrs
         if module_map:
             swiftc_inputs.append(module_map)
@@ -971,11 +968,14 @@ def apple_library(name, library_tools = {}, export_private_headers = True, names
             copts = copts_by_build_setting.swift_copts + swift_copts + select({
                 "@build_bazel_rules_ios//:virtualize_frameworks": framework_vfs_swift_copts,
                 "//conditions:default": framework_vfs_swift_copts if enable_framework_vfs else [],
+            }) + select({
+                "@build_bazel_rules_ios//:explicit_modules": [],
+                "//conditions:default": ["-import-underlying-module"] if module_map else [],
             }) + additional_swift_copts,
             deps = deps + private_deps + lib_names + select({
                 "@build_bazel_rules_ios//:virtualize_frameworks": [framework_vfs_overlay_name_swift],
                 "//conditions:default": [framework_vfs_overlay_name_swift] if enable_framework_vfs else [],
-            }),
+            }) + (["@xcode_sdk_frameworks//:XCTest"] if testonly else []),
             swiftc_inputs = swiftc_inputs,
             features = ["swift.no_generated_module_map", "swift.use_pch_output_dir"] + select({
                 "@build_bazel_rules_ios//:virtualize_frameworks": ["swift.vfsoverlay"],

rules/repositories.bzl

@@ -111,6 +111,7 @@ swift_binary(
     name = "arm64-to-sim",
     srcs = glob(["Sources/arm64-to-sim/*.swift"]),
     visibility = ["//visibility:public"],
+    deps = ["@xcode_sdk_frameworks"],
 )
         """,
     )

rules/third_party/xcbuildkit_repositories.bzl

@@ -83,7 +83,7 @@ swift_library(
         name = name,
         srcs = ",\n".join(['"%s"' % x for x in srcs]),
         defines = ",\n".join(['"%s"' % x for x in defines]),
-        deps = ",\n".join(['"%s"' % namespaced_dep_name(x) for x in deps]),
+        deps = ",\n".join(['"%s"' % namespaced_dep_name(x) for x in deps] + ['"@xcode_sdk_frameworks"']),
         copts = ",\n".join(['"%s"' % x for x in copts]),
     ))
 

tests/ios/frameworks/mixed-source/swift-library-compatibility/BUILD.bazel

@@ -6,6 +6,7 @@ swift_library(
     srcs = ["empty.swift"],
     deps = [
         "//tests/ios/frameworks/objc:ObjcFramework",
+        "@xcode_sdk_frameworks",
     ],
 )
 

tests/ios/xcodeproj/fixtures/test_custom_output_path_expected_diff.txt

@@ -1,13 +1,13 @@
 diff -r ./tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj ./tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj
-45c45
+47c47
 < 			path = ../../..;
 ---
 > 			path = ../../../..;
-211c211
+213c213
 < 				BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..;
 ---
 > 				BAZEL_WORKSPACE_ROOT = $SRCROOT/../../../..;
-268c268
+270c270
 < 				BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..;
 ---
 > 				BAZEL_WORKSPACE_ROOT = $SRCROOT/../../../..;