draft

Author: Karim Alweheshy

tools/generators/pbxproj_prefix/src/Generator/PBXProjectBuildSettings.swift

@@ -97,6 +97,17 @@ extension Generator {
                 value: #""$(INDEX_DATA_STORE_DIR)""#
             ),
             .init(key: "INDEX_FORCE_SCRIPT_EXECUTION", value: "YES"),
+            // .init(key: "CC", value: #""$(BAZEL_INTEGRATION_DIR)/clang.sh""#),
+            // .init(key: "CXX", value: #""$(BAZEL_INTEGRATION_DIR)/clang.sh""#),
+            // .init(key: "LD", value: #""$(BAZEL_INTEGRATION_DIR)/ld""#),
+            // .init(
+            //     key: "LDPLUSPLUS",
+            //     value: #""$(BAZEL_INTEGRATION_DIR)/ld""#
+            // ),
+            // .init(
+            //     key: "LIBTOOL",
+            //     value: #""$(BAZEL_INTEGRATION_DIR)/libtool""#
+            // ),
             .init(
                 key: "INDEX_IMPORT",
                 value: indexImport

tools/swiftc_stub/main.swift

@@ -226,16 +226,17 @@ error: Failed to parse DEVELOPER_DIR from '-sdk'. Using /usr/bin/swiftc.
     let developerDir = sdkPath[range]
 
     let processedArgs = args.dropFirst().map { arg in
-        if let range = arg.range(of: "BazelRulesXcodeProj16B40.xctoolchain") {
+        if let range = arg.range(of: "BazelRulesXcodeProj") {
             let substring = arg[..<range.lowerBound]
+            // Extract the version suffix (e.g. "16B40" from "BazelRulesXcodeProj16B40")
+            let toolchainSuffix = arg[range.upperBound...].prefix(while: { $0 != "." })
             return arg.replacingOccurrences(
-                of: String(substring) + "BazelRulesXcodeProj16B40.xctoolchain",
+                of: String(substring) + "BazelRulesXcodeProj" + toolchainSuffix + ".xctoolchain",
                 with: "\(developerDir)/Toolchains/XcodeDefault.xctoolchain"
             )
         }
         return arg
     }
-    try "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc \(processedArgs.joined(separator: " "))".appendLineToURL(fileURL: URL(fileURLWithPath: NSHomeDirectory()).appendingPathComponent("rulesxcodeproj_ld.log"))
     try exit(runSubProcess(
         executable: """
 \(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc

xcodeproj/internal/bazel_integration_files/copy_outputs.sh

@@ -26,10 +26,11 @@ if [[ "$ACTION" != indexbuild ]]; then
     cd "${BAZEL_OUTPUTS_PRODUCT%/*}"
 
     # Symlink .o files from BAZEL_PACKAGE_BIN_DIR to OBJECT_FILE_DIR_normal/arm64
-    find "$PWD" -name '*.o' -exec sh -c '
+    find "$PWD/${PRODUCT_NAME}_objs" -name '*.o' -exec sh -c '
       TARGET_FILE="$OBJECT_FILE_DIR_normal/arm64/$(basename "$1" | sed "s/\.swift//")"
       rm -f $TARGET_FILE
       cp "$1" $TARGET_FILE
+      chmod 644 $TARGET_FILE
     ' _ {} \;
 
     if [[ -f "$BAZEL_OUTPUTS_PRODUCT_BASENAME" ]]; then

xcodeproj/internal/templates/xcodeproj.bazelrc

@@ -93,6 +93,10 @@ common:rules_xcodeproj_indexbuild --bes_backend= --bes_results_url=
 
 common:rules_xcodeproj_swiftuipreviews --config=rules_xcodeproj
 
+# This is required for Previews to dynamically substitute Swift UI view bodies.
+# https://github.com/swiftlang/swift-build/blob/25648e8e5cc5e4f7f91aba666007ff9a00d6bd31/Sources/SwiftBuild/SWBPreviewSupport.swift#L77
+common:rules_xcodeproj --features=swift.experimental.OpaqueTypeErasure
+
 # Allow frameworks to find framework dependencies when running a preview
 # See `$PROJECT_FILE_PATH/rules_xcodeproj/bazel/copy_outputs.sh` for more info
 common:rules_xcodeproj_swiftuipreviews --linkopt="-Wl,-rpath,@loader_path/SwiftUIPreviewsFrameworks"

xcodeproj/internal/xcodeproj_incremental_rule.bzl

@@ -778,7 +778,9 @@ Are you using an `alias`? `xcodeproj.focused_targets` and \
         DefaultInfo(
             executable = installer,
             files = depset(
-                transitive = [inputs.important_generated],
+                transitive = [inputs.important_generated] + [
+                    ctx.attr._rulesxcodeproj_toolchain.files
+                ],
             ),
             runfiles = ctx.runfiles(files = runfiles),
         ),