Skip to content

Commit d3019cb

Browse files
brentleyjonesbrentleyjones
committed
Use normalized_file_path for resources
1 parent 07d938d commit d3019cb

File tree

7 files changed

+40
-124
lines changed

7 files changed

+40
-124
lines changed

‎examples/ios_app/test/fixtures/bwb.xcodeproj/rules_xcodeproj/external.xcfilelist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
$(BAZEL_EXTERNAL)/build_bazel_rules_apple/apple/testing/DefaultTestBundle.plist
2-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/Contents.json
3-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json
4-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png
2+
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets
53
$(BAZEL_EXTERNAL)/examples_ios_app_external/bundles/Utils.bundle
64
$(BAZEL_EXTERNAL)/examples_ios_app_external/Info.plist
75
$(BAZEL_EXTERNAL)/examples_ios_app_external/nested

‎examples/ios_app/test/fixtures/bwb_spec.json

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Utils/Utils.swift.modulemap",
2828
"t": "g"
2929
},
30-
"ExampleNestedResources/Assets.xcassets/Contents.json",
31-
"ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
32-
"ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
30+
"ExampleNestedResources/Assets.xcassets",
3331
"ExampleNestedResources/en.lproj/Localizable.strings",
3432
"ExampleNestedResources/es.lproj/Localizable.strings",
3533
{
@@ -41,9 +39,7 @@
4139
"f": true,
4240
"t": "e"
4341
},
44-
"ExampleResources/Assets.xcassets/Contents.json",
45-
"ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
46-
"ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
42+
"ExampleResources/Assets.xcassets",
4743
{
4844
"_": "ExampleResources/nested",
4945
"f": true
@@ -63,18 +59,8 @@
6359
"i": false,
6460
"t": "g"
6561
},
66-
"Example/PreviewContent/PreviewAssets.xcassets/Contents.json",
67-
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/Contents.json",
68-
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
69-
"Example/Assets.xcassets/AppIcon.appiconset/Contents.json",
70-
"Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon-1.png",
71-
"Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon.png",
72-
"Example/Assets.xcassets/AppIcon.appiconset/ios_3x_icon.png",
73-
"Example/Assets.xcassets/AppIcon.appiconset/ios_store_icon.png",
74-
"Example/Assets.xcassets/AppIcon.appiconset/ipad_1x_icon.png",
75-
"Example/Assets.xcassets/AppIcon.appiconset/ipad_2x_icon.png",
76-
"Example/Assets.xcassets/AppIcon.appiconset/ipadpro_2x_icon.png",
77-
"Example/Assets.xcassets/Contents.json",
62+
"Example/PreviewContent/PreviewAssets.xcassets",
63+
"Example/Assets.xcassets",
7864
"Example/Model.xcdatamodeld/Model.xcdatamodel/contents",
7965
"Example/Model.xcdatamodeld/Model2.xcdatamodel/contents",
8066
"Example/en.lproj/Localizable.strings",
@@ -119,15 +105,7 @@
119105
},
120106
"ExampleUITests/BUILD",
121107
{
122-
"_": "examples_ios_app_external/Assets.xcassets/Contents.json",
123-
"t": "e"
124-
},
125-
{
126-
"_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
127-
"t": "e"
128-
},
129-
{
130-
"_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
108+
"_": "examples_ios_app_external/Assets.xcassets",
131109
"t": "e"
132110
},
133111
{

‎examples/ios_app/test/fixtures/bwx.xcodeproj/rules_xcodeproj/external.xcfilelist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
$(BAZEL_EXTERNAL)/build_bazel_rules_apple/apple/testing/DefaultTestBundle.plist
2-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/Contents.json
3-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json
4-
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png
2+
$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets
53
$(BAZEL_EXTERNAL)/examples_ios_app_external/bundles/Utils.bundle
64
$(BAZEL_EXTERNAL)/examples_ios_app_external/Info.plist
75
$(BAZEL_EXTERNAL)/examples_ios_app_external/nested

‎examples/ios_app/test/fixtures/bwx_spec.json

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,8 @@
251251
"inputs": {
252252
"entitlements": "Example/app.entitlements",
253253
"resources": [
254-
"Example/PreviewContent/PreviewAssets.xcassets/Contents.json",
255-
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/Contents.json",
256-
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
257-
"Example/Assets.xcassets/AppIcon.appiconset/Contents.json",
258-
"Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon-1.png",
259-
"Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon.png",
260-
"Example/Assets.xcassets/AppIcon.appiconset/ios_3x_icon.png",
261-
"Example/Assets.xcassets/AppIcon.appiconset/ios_store_icon.png",
262-
"Example/Assets.xcassets/AppIcon.appiconset/ipad_1x_icon.png",
263-
"Example/Assets.xcassets/AppIcon.appiconset/ipad_2x_icon.png",
264-
"Example/Assets.xcassets/AppIcon.appiconset/ipadpro_2x_icon.png",
265-
"Example/Assets.xcassets/Contents.json",
254+
"Example/PreviewContent/PreviewAssets.xcassets",
255+
"Example/Assets.xcassets",
266256
"Example/Model.xcdatamodeld/Model.xcdatamodel/contents",
267257
"Example/Model.xcdatamodeld/Model2.xcdatamodel/contents",
268258
"Example/en.lproj/Localizable.strings",
@@ -425,9 +415,7 @@
425415
"info_plist": null,
426416
"inputs": {
427417
"resources": [
428-
"ExampleNestedResources/Assets.xcassets/Contents.json",
429-
"ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
430-
"ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
418+
"ExampleNestedResources/Assets.xcassets",
431419
"ExampleNestedResources/en.lproj/Localizable.strings",
432420
"ExampleNestedResources/es.lproj/Localizable.strings",
433421
{
@@ -699,9 +687,7 @@
699687
"info_plist": null,
700688
"inputs": {
701689
"resources": [
702-
"ExampleResources/Assets.xcassets/Contents.json",
703-
"ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
704-
"ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
690+
"ExampleResources/Assets.xcassets",
705691
{
706692
"_": "ExampleResources/nested",
707693
"f": true
@@ -1292,15 +1278,7 @@
12921278
"inputs": {
12931279
"resources": [
12941280
{
1295-
"_": "examples_ios_app_external/Assets.xcassets/Contents.json",
1296-
"t": "e"
1297-
},
1298-
{
1299-
"_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
1300-
"t": "e"
1301-
},
1302-
{
1303-
"_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
1281+
"_": "examples_ios_app_external/Assets.xcassets",
13041282
"t": "e"
13051283
},
13061284
{

‎test/fixtures/multiplatform/bwb_spec.json

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
"_": "applebin_ios-ios_arm64-dbg-ST-28ac48b4d0bf/bin/examples/multiplatform/iOSApp/iOSApp-intermediates/Info.plist",
2020
"t": "g"
2121
},
22-
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
23-
"examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
24-
"examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
25-
"examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json",
22+
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
23+
"examples/multiplatform/iOSApp/Assets.xcassets",
2624
{
2725
"_": "applebin_ios-ios_x86_64-dbg-ST-e7c08a7bb9db/bin/examples/multiplatform/iOSApp/iOSApp-intermediates/Info.plist",
2826
"t": "g"
@@ -33,9 +31,8 @@
3331
"_": "applebin_tvos-tvos_arm64-dbg-ST-d6d3bf2233f2/bin/examples/multiplatform/tvOSApp/tvOSApp-intermediates/Info.plist",
3432
"t": "g"
3533
},
36-
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
37-
"examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
38-
"examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json",
34+
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
35+
"examples/multiplatform/tvOSApp/Assets.xcassets",
3936
{
4037
"_": "applebin_tvos-tvos_x86_64-dbg-ST-ae85ff5caa67/bin/examples/multiplatform/tvOSApp/tvOSApp-intermediates/Info.plist",
4138
"t": "g"
@@ -46,7 +43,7 @@
4643
"_": "applebin_watchos-watchos_arm64_32-dbg-ST-01fecab27ffc/bin/examples/multiplatform/watchOSApp/watchOSApp-intermediates/Info.plist",
4744
"t": "g"
4845
},
49-
"examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json",
46+
"examples/multiplatform/watchOSApp/Assets.xcassets",
5047
{
5148
"_": "applebin_watchos-watchos_x86_64-dbg-ST-2fd25852cc8a/bin/examples/multiplatform/watchOSApp/watchOSApp-intermediates/Info.plist",
5249
"t": "g"
@@ -57,18 +54,8 @@
5754
"_": "applebin_watchos-watchos_arm64_32-dbg-ST-01fecab27ffc/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension-intermediates/Info.plist",
5855
"t": "g"
5956
},
60-
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
61-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
62-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
63-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
64-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
65-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
66-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
67-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
68-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
69-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
70-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
71-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json",
57+
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
58+
"examples/multiplatform/watchOSAppExtension/Assets.xcassets",
7259
{
7360
"_": "applebin_watchos-watchos_x86_64-dbg-ST-2fd25852cc8a/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension-intermediates/Info.plist",
7461
"t": "g"

‎test/fixtures/multiplatform/bwx_spec.json

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,8 @@
604604
},
605605
"inputs": {
606606
"resources": [
607-
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
608-
"examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
609-
"examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
610-
"examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
607+
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
608+
"examples/multiplatform/iOSApp/Assets.xcassets"
611609
]
612610
},
613611
"is_swift": false,
@@ -682,10 +680,8 @@
682680
},
683681
"inputs": {
684682
"resources": [
685-
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
686-
"examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
687-
"examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
688-
"examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
683+
"examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
684+
"examples/multiplatform/iOSApp/Assets.xcassets"
689685
]
690686
},
691687
"is_swift": false,
@@ -876,9 +872,8 @@
876872
},
877873
"inputs": {
878874
"resources": [
879-
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
880-
"examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
881-
"examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json"
875+
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
876+
"examples/multiplatform/tvOSApp/Assets.xcassets"
882877
]
883878
},
884879
"is_swift": false,
@@ -952,9 +947,8 @@
952947
},
953948
"inputs": {
954949
"resources": [
955-
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
956-
"examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
957-
"examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json"
950+
"examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
951+
"examples/multiplatform/tvOSApp/Assets.xcassets"
958952
]
959953
},
960954
"is_swift": false,
@@ -1143,7 +1137,7 @@
11431137
},
11441138
"inputs": {
11451139
"resources": [
1146-
"examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
1140+
"examples/multiplatform/watchOSApp/Assets.xcassets"
11471141
]
11481142
},
11491143
"is_swift": false,
@@ -1201,7 +1195,7 @@
12011195
},
12021196
"inputs": {
12031197
"resources": [
1204-
"examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
1198+
"examples/multiplatform/watchOSApp/Assets.xcassets"
12051199
]
12061200
},
12071201
"is_swift": false,
@@ -1263,18 +1257,8 @@
12631257
},
12641258
"inputs": {
12651259
"resources": [
1266-
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
1267-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
1268-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
1269-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
1270-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
1271-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
1272-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
1273-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
1274-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
1275-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
1276-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
1277-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json"
1260+
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
1261+
"examples/multiplatform/watchOSAppExtension/Assets.xcassets"
12781262
]
12791263
},
12801264
"is_swift": false,
@@ -1348,18 +1332,8 @@
13481332
},
13491333
"inputs": {
13501334
"resources": [
1351-
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
1352-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
1353-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
1354-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
1355-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
1356-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
1357-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
1358-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
1359-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
1360-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
1361-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
1362-
"examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json"
1335+
"examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
1336+
"examples/multiplatform/watchOSAppExtension/Assets.xcassets"
13631337
]
13641338
},
13651339
"is_swift": false,

‎xcodeproj/internal/resources.bzl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
load("@build_bazel_rules_apple//apple:resources.bzl", "resources_common")
44
load("@bazel_skylib//lib:paths.bzl", "paths")
55
load(":configuration.bzl", "calculate_configuration")
6-
load(":files.bzl", "file_path", "join_paths_ignoring_empty")
6+
load(
7+
":files.bzl",
8+
"file_path",
9+
"join_paths_ignoring_empty",
10+
"normalized_file_path",
11+
)
712
load(":target_id.bzl", "get_id")
813

914
# Utility
@@ -35,8 +40,6 @@ def _process_resource(
3540
xccurrentversions.append(file)
3641
return None
3742

38-
fp = file_path(file)
39-
4043
if not file.is_source:
4144
generated.append(file)
4245
if bundle_path and file.basename == "Info.plist":
@@ -55,7 +58,7 @@ def _process_resource(
5558
# Folder Type detection.
5659
return None
5760

58-
return fp
61+
return normalized_file_path(file)
5962

6063
def _add_resources_to_bundle(
6164
*,

0 commit comments

Comments
 (0)