Use normalized_file_path for resources

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

@@ -1,7 +1,5 @@
 $(BAZEL_EXTERNAL)/build_bazel_rules_apple/apple/testing/DefaultTestBundle.plist
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/Contents.json
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png
+$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets
 $(BAZEL_EXTERNAL)/examples_ios_app_external/bundles/Utils.bundle
 $(BAZEL_EXTERNAL)/examples_ios_app_external/Info.plist
 $(BAZEL_EXTERNAL)/examples_ios_app_external/nested

examples/ios_app/test/fixtures/bwb_spec.json

@@ -27,9 +27,7 @@
             "_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Utils/Utils.swift.modulemap",
             "t": "g"
         },
-        "ExampleNestedResources/Assets.xcassets/Contents.json",
-        "ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-        "ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+        "ExampleNestedResources/Assets.xcassets",
         "ExampleNestedResources/en.lproj/Localizable.strings",
         "ExampleNestedResources/es.lproj/Localizable.strings",
         {
@@ -41,9 +39,7 @@
             "f": true,
             "t": "e"
         },
-        "ExampleResources/Assets.xcassets/Contents.json",
-        "ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-        "ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+        "ExampleResources/Assets.xcassets",
         {
             "_": "ExampleResources/nested",
             "f": true
@@ -63,18 +59,8 @@
             "i": false,
             "t": "g"
         },
-        "Example/PreviewContent/PreviewAssets.xcassets/Contents.json",
-        "Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/Contents.json",
-        "Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/Contents.json",
-        "Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon-1.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ios_3x_icon.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ios_store_icon.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ipad_1x_icon.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ipad_2x_icon.png",
-        "Example/Assets.xcassets/AppIcon.appiconset/ipadpro_2x_icon.png",
-        "Example/Assets.xcassets/Contents.json",
+        "Example/PreviewContent/PreviewAssets.xcassets",
+        "Example/Assets.xcassets",
         "Example/Model.xcdatamodeld/Model.xcdatamodel/contents",
         "Example/Model.xcdatamodeld/Model2.xcdatamodel/contents",
         "Example/en.lproj/Localizable.strings",
@@ -119,15 +105,7 @@
         },
         "ExampleUITests/BUILD",
         {
-            "_": "examples_ios_app_external/Assets.xcassets/Contents.json",
-            "t": "e"
-        },
-        {
-            "_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-            "t": "e"
-        },
-        {
-            "_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+            "_": "examples_ios_app_external/Assets.xcassets",
             "t": "e"
         },
         {

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

@@ -1,7 +1,5 @@
 $(BAZEL_EXTERNAL)/build_bazel_rules_apple/apple/testing/DefaultTestBundle.plist
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/Contents.json
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json
-$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png
+$(BAZEL_EXTERNAL)/examples_ios_app_external/Assets.xcassets
 $(BAZEL_EXTERNAL)/examples_ios_app_external/bundles/Utils.bundle
 $(BAZEL_EXTERNAL)/examples_ios_app_external/Info.plist
 $(BAZEL_EXTERNAL)/examples_ios_app_external/nested

examples/ios_app/test/fixtures/bwx_spec.json

@@ -251,18 +251,8 @@
             "inputs": {
                 "entitlements": "Example/app.entitlements",
                 "resources": [
-                    "Example/PreviewContent/PreviewAssets.xcassets/Contents.json",
-                    "Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/Contents.json",
-                    "Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/Contents.json",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon-1.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ios_2x_icon.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ios_3x_icon.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ios_store_icon.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ipad_1x_icon.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ipad_2x_icon.png",
-                    "Example/Assets.xcassets/AppIcon.appiconset/ipadpro_2x_icon.png",
-                    "Example/Assets.xcassets/Contents.json",
+                    "Example/PreviewContent/PreviewAssets.xcassets",
+                    "Example/Assets.xcassets",
                     "Example/Model.xcdatamodeld/Model.xcdatamodel/contents",
                     "Example/Model.xcdatamodeld/Model2.xcdatamodel/contents",
                     "Example/en.lproj/Localizable.strings",
@@ -425,9 +415,7 @@
             "info_plist": null,
             "inputs": {
                 "resources": [
-                    "ExampleNestedResources/Assets.xcassets/Contents.json",
-                    "ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-                    "ExampleNestedResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+                    "ExampleNestedResources/Assets.xcassets",
                     "ExampleNestedResources/en.lproj/Localizable.strings",
                     "ExampleNestedResources/es.lproj/Localizable.strings",
                     {
@@ -699,9 +687,7 @@
             "info_plist": null,
             "inputs": {
                 "resources": [
-                    "ExampleResources/Assets.xcassets/Contents.json",
-                    "ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-                    "ExampleResources/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+                    "ExampleResources/Assets.xcassets",
                     {
                         "_": "ExampleResources/nested",
                         "f": true
@@ -1292,15 +1278,7 @@
             "inputs": {
                 "resources": [
                     {
-                        "_": "examples_ios_app_external/Assets.xcassets/Contents.json",
-                        "t": "e"
-                    },
-                    {
-                        "_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/Contents.json",
-                        "t": "e"
-                    },
-                    {
-                        "_": "examples_ios_app_external/Assets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
+                        "_": "examples_ios_app_external/Assets.xcassets",
                         "t": "e"
                     },
                     {

test/fixtures/multiplatform/bwb_spec.json

@@ -19,10 +19,8 @@
             "_": "applebin_ios-ios_arm64-dbg-ST-28ac48b4d0bf/bin/examples/multiplatform/iOSApp/iOSApp-intermediates/Info.plist",
             "t": "g"
         },
-        "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-        "examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-        "examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
-        "examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json",
+        "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
+        "examples/multiplatform/iOSApp/Assets.xcassets",
         {
             "_": "applebin_ios-ios_x86_64-dbg-ST-e7c08a7bb9db/bin/examples/multiplatform/iOSApp/iOSApp-intermediates/Info.plist",
             "t": "g"
@@ -33,9 +31,8 @@
             "_": "applebin_tvos-tvos_arm64-dbg-ST-d6d3bf2233f2/bin/examples/multiplatform/tvOSApp/tvOSApp-intermediates/Info.plist",
             "t": "g"
         },
-        "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-        "examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-        "examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json",
+        "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
+        "examples/multiplatform/tvOSApp/Assets.xcassets",
         {
             "_": "applebin_tvos-tvos_x86_64-dbg-ST-ae85ff5caa67/bin/examples/multiplatform/tvOSApp/tvOSApp-intermediates/Info.plist",
             "t": "g"
@@ -46,7 +43,7 @@
             "_": "applebin_watchos-watchos_arm64_32-dbg-ST-01fecab27ffc/bin/examples/multiplatform/watchOSApp/watchOSApp-intermediates/Info.plist",
             "t": "g"
         },
-        "examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json",
+        "examples/multiplatform/watchOSApp/Assets.xcassets",
         {
             "_": "applebin_watchos-watchos_x86_64-dbg-ST-2fd25852cc8a/bin/examples/multiplatform/watchOSApp/watchOSApp-intermediates/Info.plist",
             "t": "g"
@@ -57,18 +54,8 @@
             "_": "applebin_watchos-watchos_arm64_32-dbg-ST-01fecab27ffc/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension-intermediates/Info.plist",
             "t": "g"
         },
-        "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
-        "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json",
+        "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
+        "examples/multiplatform/watchOSAppExtension/Assets.xcassets",
         {
             "_": "applebin_watchos-watchos_x86_64-dbg-ST-2fd25852cc8a/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension-intermediates/Info.plist",
             "t": "g"

test/fixtures/multiplatform/bwx_spec.json

@@ -604,10 +604,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
+                    "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/iOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -682,10 +680,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/Contents.json",
-                    "examples/multiplatform/iOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
+                    "examples/multiplatform/iOSApp/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/iOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -876,9 +872,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-                    "examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json"
+                    "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/tvOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -952,9 +947,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/tvOSApp/Assets.xcassets/AccentColor.colorset/Contents.json",
-                    "examples/multiplatform/tvOSApp/Assets.xcassets/Contents.json"
+                    "examples/multiplatform/tvOSApp/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/tvOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -1143,7 +1137,7 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
+                    "examples/multiplatform/watchOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -1201,7 +1195,7 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/watchOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json"
+                    "examples/multiplatform/watchOSApp/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -1263,18 +1257,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json"
+                    "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets"
                 ]
             },
             "is_swift": false,
@@ -1348,18 +1332,8 @@
             },
             "inputs": {
                 "resources": [
-                    "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json",
-                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets/Contents.json"
+                    "examples/multiplatform/watchOSAppExtension/PreviewContent/Preview Assets.xcassets",
+                    "examples/multiplatform/watchOSAppExtension/Assets.xcassets"
                 ]
             },
             "is_swift": false,

xcodeproj/internal/resources.bzl

@@ -3,7 +3,12 @@
 load("@build_bazel_rules_apple//apple:resources.bzl", "resources_common")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load(":configuration.bzl", "calculate_configuration")
-load(":files.bzl", "file_path", "join_paths_ignoring_empty")
+load(
+    ":files.bzl",
+    "file_path",
+    "join_paths_ignoring_empty",
+    "normalized_file_path",
+)
 load(":target_id.bzl", "get_id")
 
 # Utility
@@ -35,8 +40,6 @@ def _process_resource(
         xccurrentversions.append(file)
         return None
 
-    fp = file_path(file)
-
     if not file.is_source:
         generated.append(file)
         if bundle_path and file.basename == "Info.plist":
@@ -55,7 +58,7 @@ def _process_resource(
             #   Folder Type detection.
             return None
 
-    return fp
+    return normalized_file_path(file)
 
 def _add_resources_to_bundle(
         *,