feat: Add support for rules_swift 3.x and rules_apple 4.x (#1675)

jpsim · web-flow · commit 0902aa1031a5 · 2025-06-14T21:35:42.000Z
Add support for rules_swift 3.x and rules_apple 4.x by setting
`max_compatibility_level` to the next major versions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -26,10 +26,11 @@ bazel_dep(
     name = "rules_swift",
     version = "2.2.0",
     repo_name = "build_bazel_rules_swift",
+    max_compatibility_level = 3,
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.6.0",
+    version = "4.0.1",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel
@@ -15,18 +15,18 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.22.0")
 bazel_dep(
     name = "rules_swift",
-    version = "2.8.2",
+    version = "3.0.2",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.22.0",
+    version = "4.0.1",
     repo_name = "build_bazel_rules_apple",
 )
 
 bazel_dep(
     name = "rules_xcodeproj",
-    version = "2.11.2",
+    version = "3.0.0",
     dev_dependency = True,
 )
 bazel_dep(
diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel
@@ -15,12 +15,12 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.22.0")
 bazel_dep(
     name = "rules_swift",
-    version = "2.8.2",
+    version = "3.0.2",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.22.0",
+    version = "4.0.1",
     repo_name = "build_bazel_rules_apple",
 )
 
@@ -42,7 +42,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_xcodeproj",
-    version = "2.11.2",
+    version = "3.0.0",
     dev_dependency = True,
 )
 
diff --git a/swiftpkg/internal/swift_package_tool.bzl b/swiftpkg/internal/swift_package_tool.bzl
@@ -82,7 +82,6 @@ swift_package_tool = rule(
 Defines a rule that can be used to execute the `swift package` tool.\
 """,
     attrs = dicts.add(
-        swift_common.toolchain_attrs(),
         repo_rules.env_attr,
         {
             "cmd": attr.string(
@@ -108,4 +107,5 @@ The relative path to the `Package.swift` file from the workspace root.\
         swift_package_tool_attrs.swift_package_registry,
     ),
     executable = True,
+    toolchains = swift_common.use_toolchain(),
 )

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@ bazel_dep(`
`26`	`26`	`name = "rules_swift",`
`27`	`27`	`version = "2.2.0",`
`28`	`28`	`repo_name = "build_bazel_rules_swift",`
	`29`	`+ max_compatibility_level = 3,`
`29`	`30`	`)`
`30`	`31`	`bazel_dep(`
`31`	`32`	`name = "rules_apple",`
`32`		`- version = "3.6.0",`
	`33`	`+ version = "4.0.1",`
`33`	`34`	`repo_name = "build_bazel_rules_apple",`
`34`	`35`	`)`
`35`	`36`	`bazel_dep(`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")`
`15`	`15`	`bazel_dep(name = "apple_support", version = "1.22.0")`
`16`	`16`	`bazel_dep(`
`17`	`17`	`name = "rules_swift",`
`18`		`- version = "2.8.2",`
	`18`	`+ version = "3.0.2",`
`19`	`19`	`repo_name = "build_bazel_rules_swift",`
`20`	`20`	`)`
`21`	`21`	`bazel_dep(`
`22`	`22`	`name = "rules_apple",`
`23`		`- version = "3.22.0",`
	`23`	`+ version = "4.0.1",`
`24`	`24`	`repo_name = "build_bazel_rules_apple",`
`25`	`25`	`)`
`26`	`26`
`@@ -42,7 +42,7 @@ bazel_dep(`
`42`	`42`	`)`
`43`	`43`	`bazel_dep(`
`44`	`44`	`name = "rules_xcodeproj",`
`45`		`- version = "2.11.2",`
	`45`	`+ version = "3.0.0",`
`46`	`46`	`dev_dependency = True,`
`47`	`47`	`)`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ swift_package_tool = rule(`
`82`	`82`	Defines a rule that can be used to execute the `swift package` tool.\
`83`	`83`	`""",`
`84`	`84`	`attrs = dicts.add(`
`85`		`- swift_common.toolchain_attrs(),`
`86`	`85`	`repo_rules.env_attr,`
`87`	`86`	`{`
`88`	`87`	`"cmd": attr.string(`
@@ -108,4 +107,5 @@ The relative path to the `Package.swift` file from the workspace root.\
`108`	`107`	`swift_package_tool_attrs.swift_package_registry,`
`109`	`108`	`),`
`110`	`109`	`executable = True,`
	`110`	`+ toolchains = swift_common.use_toolchain(),`
`111`	`111`	`)`