Skip to content

Fix BSP not working with rules_apple 4.3.3 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rockbruno merged 1 commit into from
Jan 11, 2026
Merged

Fix BSP not working with rules_apple 4.3.3 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Example/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
common --ios_simulator_device="iPhone 16 Pro"
common --ios_simulator_version="18.6"
common --watchos_cpus=arm64

# rules_swift flags migration
# --swiftcopt and --host_swiftcopt are deprecated
Expand Down
4 changes: 2 additions & 2 deletions Example/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ local_path_override(

bazel_dep(
name = "rules_swift",
version = "3.3.0",
version = "3.4.0",
repo_name = "build_bazel_rules_swift",
)

bazel_dep(
name = "rules_apple",
version = "4.3.2",
version = "4.3.3",
repo_name = "build_bazel_rules_apple",
)

Expand Down
8 changes: 7 additions & 1 deletion Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetQuerierParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,17 @@ extension BazelTargetQuerierParserImpl {
let cpuComponents = try configComponents.getIndexThrowing(0).split(separator: "_", maxSplits: 1)
let platform = try cpuComponents.getIndexThrowing(0)
let cpuArch = try cpuComponents.getIndexThrowing(1)

// To support compiling libraries directly, we need to additionally strip out
// the transition and distinguisher parts of the configuration name, as those will not
// be present when compiling directly.
let configWithoutTransitionOrDistinguisher = configComponents.dropLast(3)

// Edge case: rules_apple 4.3.3 dropped configuration distinguishers
let stepsToDrop = try configComponents.getIndexThrowing(5).hasPrefix("applebin_") ? 3 : 2

let configWithoutTransitionOrDistinguisher = configComponents.dropLast(stepsToDrop)
let effectiveConfigurationName = configWithoutTransitionOrDistinguisher.joined(separator: "-")

return BazelTargetConfigurationInfo(
configurationName: fullConfig,
effectiveConfigurationName: effectiveConfigurationName,
Expand Down