Migrate `structured_resources` to `data`.
The `resources` and `structured_resources` attributes
on `swift_library` are being removed. Runtime resources
should now be specified using the `data` attribute. The
`resources` attribute can be moved verbatim;
`structured_resources` are specified using the new
`apple_resource_group` attribute.
PiperOrigin-RevId: 227518626
diff --git a/WORKSPACE b/WORKSPACE
index 66462b3..1860cda 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
git_repository(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
- tag = "0.10.0",
+ tag = "0.11.1",
)
load(
diff --git a/src/Tulsi/BUILD b/src/Tulsi/BUILD
index 4b2af2b..4d80c28 100644
--- a/src/Tulsi/BUILD
+++ b/src/Tulsi/BUILD
@@ -35,8 +35,8 @@
swift_library(
name = "tulsi_lib",
srcs = [":tulsi_srcs"],
+ data = [":tulsi_resources"],
module_name = "Tulsi",
- resources = [":tulsi_resources"],
tags = ["nobuilder"],
deps = ["//src/TulsiGenerator:tulsi_generator_lib"],
)
diff --git a/src/TulsiGenerator/BUILD b/src/TulsiGenerator/BUILD
index 14175ae..dc22bc4 100644
--- a/src/TulsiGenerator/BUILD
+++ b/src/TulsiGenerator/BUILD
@@ -31,8 +31,10 @@
swift_library(
name = "tulsi_generator_lib",
srcs = [":tulsi_generator_srcs"],
+ data = [
+ ":tulsi_generator_resources",
+ "//src/TulsiGenerator/Bazel:tulsi",
+ ],
module_name = "TulsiGenerator",
- resources = [":tulsi_generator_resources"],
- structured_resources = ["//src/TulsiGenerator/Bazel:tulsi"],
tags = ["nobuilder"],
)
diff --git a/src/TulsiGenerator/Bazel/BUILD b/src/TulsiGenerator/Bazel/BUILD
index 6716704..453e9ab 100644
--- a/src/TulsiGenerator/Bazel/BUILD
+++ b/src/TulsiGenerator/Bazel/BUILD
@@ -1,3 +1,5 @@
+load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_group")
+
licenses(["notice"]) # Apache 2.0
package(default_visibility = ["//:__subpackages__"])
@@ -14,9 +16,9 @@
visibility = ["//visibility:private"],
)
-filegroup(
+apple_resource_group(
name = "tulsi",
- srcs = [
+ structured_resources = [
"tulsi/tulsi_aspects.bzl",
"tulsi/tulsi_aspects_paths.bzl",
":aspect_build",
diff --git a/src/TulsiGeneratorIntegrationTests/BUILD b/src/TulsiGeneratorIntegrationTests/BUILD
index 009ee7d..30a5604 100644
--- a/src/TulsiGeneratorIntegrationTests/BUILD
+++ b/src/TulsiGeneratorIntegrationTests/BUILD
@@ -13,10 +13,8 @@
"BazelFakeWorkspace.swift",
"BazelIntegrationTestCase.swift",
],
+ data = ["//:strings"],
module_name = "BazelIntegrationTestCase",
- resources = [
- "//:strings",
- ],
visibility = ["//:__subpackages__"],
deps = ["//src/TulsiGenerator:tulsi_generator_lib"],
)
