Support index-import on all Xcode 16.x versions

Similar to: bazelbuild/rules_swift#1504

Part of #3160

This PR updates the index-import dependency to include both version 5.8 and 6.1 as the hash algorithm changed in Swift 6.1.
To make this change backwards compatible we switch to the 5.8 version on Xcode 16.2 and under.

Signed-off-by: Luis Padron <[email protected]>

Author: luispadron

MODULE.bazel

@@ -10,7 +10,7 @@ bazel_dep(name = "bazel_features", version = "1.3.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.8.0",
     max_compatibility_level = 2,
     repo_name = "build_bazel_rules_swift",
 )
@@ -28,6 +28,7 @@ non_module_deps = use_extension("//xcodeproj:extensions.bzl", "non_module_deps")
 use_repo(
     non_module_deps,
     "rules_xcodeproj_index_import",
+    "rules_xcodeproj_index_import_legacy",
 )
 
 # Non-release dependencies
@@ -55,12 +56,6 @@ bazel_dep(
     repo_name = "io_bazel_stardoc",
 )
 
-# Use newer versions of deps in development
-single_version_override(
-    module_name = "rules_swift",
-    version = "2.3.0",
-)
-
 # Some of our deps are forcing a new stardoc on us, so pinning for now
 single_version_override(
     module_name = "stardoc",

examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj

@@ -20,7 +20,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_ios",
-    version = "5.5.1",
+    version = "5.6.0",
     repo_name = "build_bazel_rules_ios",
 )
 

examples/integration/test/fixtures/bwb_project_spec.json

@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_ios",
-    sha256 = "c417b69639a737eb44e2af13309f1b00950d6d0c48f67c64ee36d3ea750f687e",
-    url = "https://github.com/bazel-ios/rules_ios/releases/download/4.6.0/rules_ios.4.6.0.tar.gz",
+    sha256 = "e0dbd18f1d7a48a4b98e97dbdc45dfc7f0b1cf902afe86c442614db17f560611",
+    url = "https://github.com/bazel-ios/rules_ios/releases/download/5.6.0/rules_ios.5.6.0.tar.gz",
 )
 
 load(

examples/rules_ios/MODULE.bazel

@@ -53,6 +53,7 @@ def _write_pbxproj_prefix_test_impl(ctx):
         import_index_build_indexstores = (
             ctx.attr.import_index_build_indexstores
         ),
+        legacy_index_import = ctx.attr.legacy_index_import,
         index_import = ctx.attr.index_import,
         install_path = "a/project.xcodeproj",
         minimum_xcode_version = ctx.attr.minimum_xcode_version,
@@ -144,6 +145,7 @@ write_pbxproj_prefix_test = unittest.make(
         "default_xcode_configuration": attr.string(mandatory = True),
         "execution_root_file": attr.string(mandatory = True),
         "import_index_build_indexstores": attr.bool(mandatory = True),
+        "legacy_index_import": attr.string(mandatory = True),
         "index_import": attr.string(mandatory = True),
         "minimum_xcode_version": attr.string(mandatory = True),
         "platforms": attr.string_list(mandatory = True),
@@ -180,6 +182,7 @@ def write_pbxproj_prefix_test_suite(name):
             default_xcode_configuration,
             execution_root_file,
             import_index_build_indexstores,
+            legacy_index_import,
             index_import,
             minimum_xcode_version,
             platforms,
@@ -204,6 +207,7 @@ def write_pbxproj_prefix_test_suite(name):
             default_xcode_configuration = default_xcode_configuration,
             execution_root_file = execution_root_file,
             import_index_build_indexstores = import_index_build_indexstores,
+            legacy_index_import = legacy_index_import,
             index_import = index_import,
             minimum_xcode_version = minimum_xcode_version,
             platforms = platforms,
@@ -233,6 +237,7 @@ def write_pbxproj_prefix_test_suite(name):
         default_xcode_configuration = "Debug",
         execution_root_file = "an/execution/root/file",
         import_index_build_indexstores = True,
+        legacy_index_import = "some/path/to/legacy/index_import",
         index_import = "some/path/to/index_import",
         minimum_xcode_version = "14.2.1",
         platforms = [
@@ -262,6 +267,8 @@ def write_pbxproj_prefix_test_suite(name):
             "an/execution/root/file",
             # targetIdsFile
             "a/path/to/target_ids_list",
+            # legacyIndexImport
+            "some/path/to/legacy/index_import",
             # indexImport
             "some/path/to/index_import",
             # resolvedRepositoriesFile
@@ -296,6 +303,7 @@ def write_pbxproj_prefix_test_suite(name):
         default_xcode_configuration = "Release",
         execution_root_file = "an/execution/root/file",
         import_index_build_indexstores = False,
+        legacy_index_import = "some/path/to/legacy/index_import",
         index_import = "some/path/to/index_import",
         platforms = [
             "MACOS",
@@ -328,6 +336,8 @@ def write_pbxproj_prefix_test_suite(name):
             "an/execution/root/file",
             # targetIdsFile
             "a/path/to/target_ids_list",
+            # legacyIndexImport
+            "some/path/to/legacy/index_import",
             # indexImport
             "some/path/to/index_import",
             # resolvedRepositoriesFile

examples/rules_ios/WORKSPACE

@@ -176,7 +176,7 @@ _XCSCHEMES = [
                 # targetIdsFile
                 "bazel-out/darwin_arm64-dbg/bin/external/_main~internal~rules_xcodeproj_generated/generator/tools/xcodeproj/xcodeproj_target_ids",
                 # indexImport
-                "bazel-out/darwin_arm64-opt-exec-2B5CBBC6/bin/external/_main~non_module_deps~rules_xcodeproj_index_import/index-import",
+                "bazel-out/darwin_arm64-opt-exec-2B5CBBC6/bin/external/_main~non_module_deps~rules_xcodeproj_index_import_legacy/index-import",
                 # resolvedRepositoriesFile
                 "bazel-out/darwin_arm64-dbg/bin/external/_main~internal~rules_xcodeproj_generated/generator/tools/generators/xcodeproj/xcodeproj_pbxproj_partials/resolved_repositories",
                 # minimumXcodeVersion

examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj

@@ -39,6 +39,7 @@ struct Project: Equatable {
     var customXcodeSchemes: [XcodeScheme] = []
     let targetIdsFile: String
     let targetNameMode: TargetNameMode
+    let legacyIndexImport: String
     let indexImport: String
     let preBuildScript: String?
     let postBuildScript: String?
@@ -61,7 +62,8 @@ extension Project: Decodable {
         case schemeAutogenerationMode = "s"
         case targetIdsFile = "T"
         case targetNameMode = "N"
-        case indexImport = "i"
+        case legacyIndexImport = "i"
+        case indexImport = "j"
         case preBuildScript = "p"
         case postBuildScript = "P"
     }
@@ -107,6 +109,8 @@ extension Project: Decodable {
                 TargetNameMode.self,
                 forKey: .targetNameMode
             ) ?? .auto
+        legacyIndexImport = try container
+            .decode(String.self, forKey: .legacyIndexImport)
         indexImport = try container
             .decode(String.self, forKey: .indexImport)
         preBuildScript = try container