bazel-xcode · Apr 22, 2022 · Apr 28, 2022 · May 3, 2022 · May 3, 2022 · May 3, 2022
diff --git a/.bazelrc b/.bazelrc
@@ -9,6 +9,5 @@ build \
  --spawn_strategy=standalone \
  --strategy=SwiftCompile=worker \
  --swiftcopt=-Xwrapped-swift=-debug-prefix-pwd-is-dot \
- --experimental_strict_action_env=true \
- --cpu darwin_x86_64 \
- --experimental_show_artifacts
+ --incompatible_strict_action_env=true \
+ --experimental_show_artifacts 
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-3.4.1
+5.0.0
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,9 @@ external
 *.swp
 
 xchammer-includes
+
+# SPM outputs
+.build/
+
+# VSCode configuration
+.vscode/
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,15 +1,11 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
 load(
     "@build_bazel_rules_apple//apple:macos.bzl",
     "macos_application",
 )
 load(
     "@build_bazel_rules_apple//apple:resources.bzl",
-    "apple_resource_group",
     "apple_resource_bundle",
+    "apple_resource_group",
 )
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
@@ -20,9 +16,15 @@ load(
     "apple_bundle_version",
 )
 load(
-    "@com_github_bazelbuild_buildtools//buildifier:def.bzl",
-    "buildifier",
+    "//:BazelExtensions/features.bzl",
+    "feature_names",
 )
+
+# FIX-ME: Bring this back after resolving issues with loading from rules_ios
+# load(
+#     "@com_github_bazelbuild_buildtools//buildifier:def.bzl",
+#     "buildifier",
+# )
 load(
     "//third_party:repositories.bzl",
     "namespaced_name",
@@ -36,6 +38,20 @@ load(
     "target_config",
     "xchammer_config",
 )
+load(
+    "//:BazelExtensions/xcode_configuration_provider.bzl",
+    "declare_target_config",
+)
+
+# Xcode project for Bazel built project
+load(
+    "//:BazelExtensions/xcodeproject.bzl",
+    "xcode_project",
+)
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
 
 apple_resource_group(
     name = "XCHammerAssets",
@@ -44,7 +60,6 @@ apple_resource_group(
     ]),
 )
 
-
 # Build system support. Currently, we use the example xcbuildkit
 # to simply show the progress bar.
 # Stick this into a bundle to group files together
@@ -54,51 +69,45 @@ apple_resource_bundle(
         "@xcbuildkit//:BazelBuildServiceInstaller",
         "@xcbuildkit//:BuildInfo",
         # We use this to check if it's installed into each Xcode
-        "@bazel_tools//tools/osx:xcode-locator-genrule"
-    ]
-)
-
-load(
-    "//:BazelExtensions/xcode_configuration_provider.bzl",
-    "declare_target_config",
-)
-
-load(
-    "@build_bazel_rules_apple//apple:resources.bzl",
-    "apple_resource_group",
+        "@bazel_tools//tools/osx:xcode-locator-genrule",
+    ],
 )
 
 # Note:
 # - $(SPAWN_OPTS) is determined at build time by tools/XCHammerXcodeRunscript.sh
 # XCHammer's `bazel`, tools/bazelwrapper subs out make variable
 xchammer_xcode_target_config = target_config(
-    build_bazel_template="tools/XCHammerXcodeRunscript.sh",
-    build_bazel_options="$(SPAWN_OPTS)"
+    build_bazel_options = "$(SPAWN_OPTS)",
+    build_bazel_template = "tools/XCHammerXcodeRunscript.sh",
 )
 
 # This is an example of declaring a target config.
-declare_target_config(name="XCHammerSourcesXcodeConfig",
-     config=xchammer_xcode_target_config)
+declare_target_config(
+    name = "XCHammerSourcesXcodeConfig",
+    config = xchammer_xcode_target_config,
+)
 
 # This BUILD file is not actually imported into XCHammer
 # There is already a BUILD file placed in there by another dep.
 apple_resource_group(
     name = "BazelExtensions",
-    structured_resources=glob([
+    structured_resources = glob([
         "BazelExtensions/*.bzl",
     ]),
 )
 
-
 swift_library(
     name = "XCHammerSources",
     srcs = glob(["Sources/**/*.swift"]),
+    copts = [
+        "-swift-version",
+        "4.2",
+    ],
     data = [
         ":XCHammerAssets",
         ":BazelExtensions",
     ] + [
         ":XCBuildKit",
-
     ],
     deps = ["@" + namespaced_name(x) for x in [
         "AEXML//:AEXML",
@@ -114,11 +123,7 @@ swift_library(
         "XcodeGen//:ProjectSpec",
         "XcodeProj//:XcodeProj",
         "Yams//:Yams",
-    ]] + [":XCHammerSourcesXcodeConfig" ],
-    copts = [
-        "-swift-version",
-        "4.2"
-    ],
+    ]] + [":XCHammerSourcesXcodeConfig"],
 )
 
 apple_bundle_version(
@@ -132,12 +137,16 @@ macos_application(
     infoplists = ["Info.plist"],
     minimum_os_version = "10.14",
     version = ":XCHammerVersion",
-    deps = [":XCHammerSources", ":XCHammerSourcesXcodeConfig"],
+    deps = [
+        ":XCHammerSources",
+        ":XCHammerSourcesXcodeConfig",
+    ],
 )
 
-buildifier(
-    name = "buildifier",
-)
+# FIX-ME: Bring this back after resolving issues with loading from rules_ios
+# buildifier(
+#     name = "buildifier",
+# )
 
 script_base = "$SRCROOT/tools/instrumentation_helpers"
 
@@ -169,41 +178,41 @@ gen_xchammer_config(
         },
         target_config = {
             "//:xchammer": xchammer_xcode_target_config,
-            "//tools/XCConfigExporter:xcconfig-exporter": xchammer_xcode_target_config
+            "//tools/XCConfigExporter:xcconfig-exporter": xchammer_xcode_target_config,
         },
-        targets = ["//:xchammer", "//tools/XCConfigExporter:xcconfig-exporter"],
+        targets = [
+            "//:xchammer",
+            "//tools/XCConfigExporter:xcconfig-exporter",
+        ],
     ),
 )
 
-# Xcode project for Bazel built project
-load(
-    "//:BazelExtensions/xcodeproject.bzl",
-    "xcode_project"
-)
-
 # The xcode_project for Bazel built Xcode project
 # Note: the target_config is declared in :XCHammerSourcesXcodeConfig
 xcode_project(
-    name="workspace_v2",
-    bazel="tools/bazelwrapper",
-    targets=["//:xchammer", "//tools/XCConfigExporter:xcconfig-exporter"],
-    project_config=project_config(
+    name = "workspace_v2",
+    bazel = "tools/bazelwrapper",
+    project_config = project_config(
+        generate_xcode_schemes = False,
         paths = ["**"],
-        generate_xcode_schemes=False,
         xcconfig_overrides = {
             "Release": "tools/BazelToolchain.xcconfig",
             "Debug": "tools/BazelToolchain.xcconfig",
             "Profile": "tools/BazelToolchain.xcconfig",
-        }
-    )
+        },
+    ),
+    targets = [
+        "//:xchammer",
+        "//tools/XCConfigExporter:xcconfig-exporter",
+    ],
 )
 
 # Development / Distribution
 genrule(
-    name = "xchammer_unzip",
-    srcs = [ ":xchammer" ],
+    name = "gen_xchammer_unzip",
+    srcs = [":xchammer"],
+    outs = ["xchammer_unzip"],
     cmd = "unzip -q $(SRCS) -d $(OUTS)",
-    outs = [ "xchammer_unzip" ]
 )
 
 # This produces the same interface as the XCHammer repository, so a person
@@ -232,23 +241,24 @@ gen_workspace_cmd = """
     touch WORKSPACE
     echo 'sh_binary(name="xchammer", srcs=["xchammer.app/Contents/MacOS/xchammer"], visibility=["//visibility:public"])' > BUILD
 """
+
 genrule(
     name = "xchammer_dist",
-    srcs = [ ":xchammer_unzip" ],
+    srcs = [":xchammer_unzip"],
+    outs = ["xchammer_dist_repo.zip"],
     cmd = """
     mkdir zipdir/
     cp -r $(SRCS)/xchammer.app zipdir/xchammer.app
     cd zipdir
     {gen_workspace_cmd}
     zip -q ../$(OUTS) -r .
-    """.format(gen_workspace_cmd=gen_workspace_cmd),
-    outs = [ "xchammer_dist_repo.zip" ]
+    """.format(gen_workspace_cmd = gen_workspace_cmd),
 )
 
 # Builds an xchammer WORKSPACE use for local development. By creating a symlink
 # to the build artifact to ensure the upstream repository is using the latest
 # artifacts.
-# 
+#
 # If we were to just use `xchammer_dist` Bazel will not check a `.zip` of an
 # http_archive, so this symlinks the files instead.
 #
@@ -262,12 +272,19 @@ genrule(
 # --override_repository=xchammer=/path/to/xchammer/bazel-bin/xchammer_dev_repo/
 genrule(
     name = "xchammer_dev",
-    srcs = [ ":xchammer" ],
+    srcs = [":xchammer"],
+    outs = ["xchammer_dev_repo"],
     cmd = """
     mkdir $(OUTS)
     ln -s $$(dirname $$PWD/$(SRCS))/xchammer_archive-root/xchammer.app $(OUTS)/xchammer.app
     cd $(OUTS)
     {gen_workspace_cmd}
-    """.format(gen_workspace_cmd=gen_workspace_cmd),
-    outs = [ "xchammer_dev_repo" ],
+    """.format(gen_workspace_cmd = gen_workspace_cmd),
 )
+
+config_setting(
+    name = "collect_indexing_info",
+    values = {
+        "features": feature_names.collect_indexing_info,
+    },
+)
diff --git a/BazelExtensions/features.bzl b/BazelExtensions/features.bzl
@@ -0,0 +1,5 @@
+feature_names = struct(
+    # Collect outputs (.o files) and compiler flags per target to be
+    # used during indexing in Bazel by `xcbuildkit`
+    collect_indexing_info = "xcode.collect_indexing_info",
+)
diff --git a/BazelExtensions/tulsi.bzl b/BazelExtensions/tulsi.bzl
@@ -2,12 +2,12 @@
 # In the distribution artifact we need to:
 # Include a binary build of XCHammer
 load(
-    "@xchammer_tulsi_aspects//:tulsi/tulsi_aspects_paths.bzl",
+    "@xchammer-Tulsi//src/TulsiGenerator/Bazel:tulsi/tulsi_aspects_paths.bzl",
     _SwiftInfo = "SwiftInfo",
 )
 
 load(
-    "@xchammer_tulsi_aspects//:tulsi/tulsi_aspects.bzl",
+    "@xchammer-Tulsi//src/TulsiGenerator/Bazel:tulsi/tulsi_aspects.bzl",
     _tulsi_sources_aspect = "tulsi_sources_aspect",
     _TulsiSourcesAspectInfo = "TulsiSourcesAspectInfo",
 )

diff --git a/BazelExtensions/xchammerconfig.bzl b/BazelExtensions/xchammerconfig.bzl
@@ -66,3 +66,11 @@ def xchammer_config(
         projects,  # [String: XCHammerProjectConfig]
         target_config = None):  # [String: XCHammerTargetConfig]?
     return struct(targets = targets, targetConfig = target_config, projects = projects)
+
+def bazel_build_service_config(
+        bep_path = None, # String?
+        indexing_enabled = False, # Bool
+        index_store_path = None, # String?
+        indexing_data_dir = None, # String?
+        progress_bar_enabled = False): # Bool
+    return struct(bepPath = bep_path, indexingEnabled = indexing_enabled, indexStorePath = index_store_path, indexingDataDir = indexing_data_dir, progressBarEnabled = progress_bar_enabled)