Skip to content

Commit 01b4e77

Browse files
fix: Fix byName resolution (#1117)
In the case of `accessibilitysnapshot`, it depends on `SnapshotTesting` by name. `SnapshotTesting` has an identity of `swift-snapshot-testing` (based on the git url, but it could be different for mirrors/forks), but the name is `snapshottesting`. Signed-off-by: Brentley Jones <[email protected]>
1 parent 6884df4 commit 01b4e77

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

swiftpkg/internal/pkginfo_target_deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def _resolve_by_name(pkg_ctx, name):
8181

8282
ext_dep = lists.find(
8383
pkg_ctx.pkg_info.dependencies,
84-
lambda d: d.identity == normalized_name,
84+
lambda d: d.name == normalized_name,
8585
)
8686
if ext_dep != None:
8787
return [bazel_labels.new(

swiftpkg/tests/pkginfo_target_deps_tests.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ _target_dep_condition = pkginfos.new_target_dependency_condition(
2525
# AwesomePackage (external dependency)
2626

2727
_external_dep = pkginfos.new_dependency(
28-
identity = "awesomepackage",
28+
identity = "awesomepackage-identity",
2929
name = "AwesomePackage",
3030
file_system = pkginfos.new_file_system(
3131
path = "/path/to/AwesomePackage",
@@ -134,7 +134,7 @@ def _bzl_select_list_test(ctx):
134134
kind = pkginfo_target_deps.target_dep_kind,
135135
value = [
136136
bazel_labels.normalize(
137-
"@swiftpkg_awesomepackage//:AwesomePackage",
137+
"@swiftpkg_awesomepackage_identity//:AwesomePackage",
138138
),
139139
],
140140
),
@@ -148,7 +148,7 @@ def _bzl_select_list_test(ctx):
148148
kind = pkginfo_target_deps.target_dep_kind,
149149
value = [
150150
bazel_labels.normalize(
151-
"@swiftpkg_awesomepackage//:AwesomeProduct",
151+
"@swiftpkg_awesomepackage_identity//:AwesomeProduct",
152152
),
153153
],
154154
),
@@ -162,7 +162,7 @@ def _bzl_select_list_test(ctx):
162162
kind = pkginfo_target_deps.target_dep_kind,
163163
value = [
164164
bazel_labels.normalize(
165-
"@swiftpkg_awesomepackage//:AwesomeProduct",
165+
"@swiftpkg_awesomepackage_identity//:AwesomeProduct",
166166
),
167167
],
168168
condition = c,

0 commit comments

Comments
 (0)