Skip to content

Commit 1ec546a

Browse files
authored
Update for rules_swift 2.x (#879)
This fixes a missing `_swift_vfs.yaml` error related to the changes in: bazelbuild/rules_swift#1191 Fixes #875
1 parent ec08184 commit 1ec546a

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

rules/library.bzl

+14-2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ module {module_name}.Swift {{
7474
arguments = [args],
7575
)
7676

77+
return [
78+
DefaultInfo(
79+
files = depset([ctx.outputs.destination]),
80+
),
81+
CcInfo(
82+
compilation_context = cc_common.create_compilation_context(
83+
headers = depset([ctx.outputs.destination]),
84+
),
85+
),
86+
]
87+
7788
extend_modulemap = rule(
7889
implementation = _extend_modulemap_impl,
7990
attrs = {
@@ -961,6 +972,7 @@ def apple_library(
961972
tags = _MANUAL,
962973
)
963974
module_map = "%s.extended.modulemap" % name
975+
swiftc_inputs.append(module_map)
964976

965977
# Note: this needs to go here, in order to virtualize the extended module
966978
framework_vfs_overlay(
@@ -991,11 +1003,11 @@ def apple_library(
9911003
"@build_bazel_rules_ios//:virtualize_frameworks": framework_vfs_swift_copts,
9921004
"//conditions:default": framework_vfs_swift_copts if enable_framework_vfs else [],
9931005
}) + additional_swift_copts,
994-
deps = deps + private_deps + private_dep_names + lib_names + select({
1006+
deps = deps + private_deps + private_dep_names + lib_names,
1007+
swiftc_inputs = swiftc_inputs + select({
9951008
"@build_bazel_rules_ios//:virtualize_frameworks": [framework_vfs_overlay_name_swift],
9961009
"//conditions:default": [framework_vfs_overlay_name_swift] if enable_framework_vfs else [],
9971010
}),
998-
swiftc_inputs = swiftc_inputs,
9991011
features = features + ["swift.no_generated_module_map", "swift.use_pch_output_dir"] + select({
10001012
"@build_bazel_rules_ios//:virtualize_frameworks": ["swift.vfsoverlay"],
10011013
"//conditions:default": [],

0 commit comments

Comments
 (0)