Migrate resource usage to data attribute.
PiperOrigin-RevId: 236910284
diff --git a/src/TulsiGeneratorIntegrationTests/QueryTests.swift b/src/TulsiGeneratorIntegrationTests/QueryTests.swift
index 609f756..8fef8eb 100644
--- a/src/TulsiGeneratorIntegrationTests/QueryTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/QueryTests.swift
@@ -94,7 +94,7 @@
.hasNoDependencies()
checker.assertThat("//tulsi_complex_test:ApplicationResources")
- .hasType("objc_library")
+ .hasType("apple_resource_group")
.hasNoLinkedTargetLabels()
.hasNoDependencies()
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/ComplexSingle.BUILD b/src/TulsiGeneratorIntegrationTests/Resources/ComplexSingle.BUILD
index b81a8f9..addad25 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/ComplexSingle.BUILD
+++ b/src/TulsiGeneratorIntegrationTests/Resources/ComplexSingle.BUILD
@@ -35,6 +35,7 @@
load(
"@build_bazel_rules_apple//apple:resources.bzl",
"apple_bundle_import",
+ "apple_resource_group",
)
load(
"@build_bazel_rules_apple//apple:tvos.bzl",
@@ -57,15 +58,6 @@
minimum_os_version = "10.0",
deps = [
":ApplicationLibrary",
- ":ApplicationResources",
- ],
-)
-
-objc_library(
- name = "ApplicationResources",
- structured_resources = [
- "Application/structured_resources.file1",
- "Application/structured_resources.file2",
],
)
@@ -75,7 +67,6 @@
"Application/srcs/main.m",
":SrcGenerator",
],
- bundles = [":ObjCBundle"],
data = [
"Application/AssetsOne.xcassets/another_file.ico",
"Application/AssetsOne.xcassets/test_file.ico",
@@ -87,6 +78,8 @@
"Application/en.lproj/EN.strings",
"Application/en.lproj/Localized.strings",
"Application/es.lproj/Localized.strings",
+ ":ApplicationResources",
+ ":ObjCBundle",
":StoryboardGenerator",
],
defines = [
@@ -106,6 +99,14 @@
],
)
+apple_resource_group(
+ name = "ApplicationResources",
+ structured_resources = [
+ "Application/structured_resources.file1",
+ "Application/structured_resources.file2",
+ ],
+)
+
apple_bundle_import(
name = "ObjCBundle",
bundle_imports = [
@@ -116,7 +117,7 @@
objc_library(
name = "CoreDataResources",
- datamodels = glob(["Test.xcdatamodeld/**"]),
+ data = glob(["Test.xcdatamodeld/**"]),
)
objc_library(
@@ -130,13 +131,13 @@
"Library/hdrs/HdrsHeader.h",
],
copts = ["-DLIBRARY_COPT_DEFINE"],
+ data = ["Library/xib.xib"],
defines = [
"LIBRARY_DEFINES_DEFINE=1",
"'LIBRARY SECOND DEFINE'=2",
"LIBRARY_VALUE_WITH_SPACES=\"Value with spaces\"",
],
pch = ":PCHGenerator",
- xibs = ["Library/xib.xib"],
deps = [
":SubLibrary",
":SubLibraryWithDefines",
@@ -262,7 +263,7 @@
objc_library(
name = "TodayExtensionResources",
- resources = [
+ data = [
"TodayExtension/resources/file1",
"TodayExtension/resources/file2.file",
],
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/Mac.BUILD b/src/TulsiGeneratorIntegrationTests/Resources/Mac.BUILD
index 6dfc5ee..487f81c 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/Mac.BUILD
+++ b/src/TulsiGeneratorIntegrationTests/Resources/Mac.BUILD
@@ -120,7 +120,7 @@
"src/plugin/PluginViewController.h",
"src/plugin/PluginViewController.m",
],
- resources = [
+ data = [
"Resources/plugin/PluginViewController.xib",
],
sdk_frameworks = [
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/Watch.BUILD b/src/TulsiGeneratorIntegrationTests/Resources/Watch.BUILD
index a9a8a31..4093667 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/Watch.BUILD
+++ b/src/TulsiGeneratorIntegrationTests/Resources/Watch.BUILD
@@ -19,6 +19,10 @@
"ios_application",
)
load("@build_bazel_rules_apple//apple:watchos.bzl", "watchos_application", "watchos_extension")
+load(
+ "@build_bazel_rules_apple//apple:resources.bzl",
+ "apple_resource_group",
+)
ios_application(
name = "Application",
@@ -39,6 +43,11 @@
objc_library(
name = "ApplicationResources",
+ data = [":ApplicationStructuredResources"],
+)
+
+apple_resource_group(
+ name = "ApplicationStructuredResources",
structured_resources = [
"Application/structured_resources.file1",
],
@@ -74,7 +83,12 @@
data = [
"Watch2Extension/app_asset_catalogs.xcassets/app_asset_file.png",
"Watch2Extension/ext_resources.file",
+ ":WatchApplicationStructuredResources",
],
+)
+
+apple_resource_group(
+ name = "WatchApplicationStructuredResources",
structured_resources = [
"Watch2Extension/ext_structured_resources.file",
],
@@ -96,7 +110,12 @@
name = "WatchExtensionResources",
data = [
"Watch2Extension/ext_resources.file",
+ ":WatchExtensionStructuredResources",
],
+)
+
+apple_resource_group(
+ name = "WatchExtensionStructuredResources",
structured_resources = [
"Watch2Extension/ext_structured_resources.file",
],
