fix: ensure that the generated resource bundle finder class has a unique name (#803)

`rules_swift_package_manager` generates a resource bundle accessor for
ObjC code that has resources. The generated code includes a private
class that is used to find the resources. We need to ensure that the
finder class has a unique name.

- Generate a unique name for the ObjC resource bundle finder class.
- Update the `resources_example` to include a second Swift package that
has an ObjC resource module.
- Update the `README.md` for the `resources_example` with information
about one of the cases being tested.

Closes #798.

Author: cgrindel

examples/resources_example/MODULE.bazel

@@ -53,5 +53,6 @@ use_repo(
     "swiftpkg_app_lovin_sdk",
     "swiftpkg_googlesignin_ios",
     "swiftpkg_package_with_resources",
+    "swiftpkg_sdwebimageswiftui",
 )
 # swift_deps END

examples/resources_example/MODULE.bazel.lock

@@ -8,6 +8,7 @@ let package = Package(
         .package(path: "third_party/another_package_with_resources"),
         .package(path: "third_party/app_lovin_sdk"),
         .package(path: "third_party/package_with_resources"),
+        .package(url: "https://github.com/SDWebImage/SDWebImageSwiftUI.git", from: "2.0.0"),
         .package(url: "https://github.com/google/GoogleSignIn-iOS", from: "7.0.0"),
     ]
 )

examples/resources_example/Package.resolved

@@ -3,3 +3,11 @@
 This example demonstrates using an external package that has its resources under a directory. The
 generated Bazel build files should ensure that the resources are found and made available in a
 resource bundle.
+
+## Notes
+
+### Multiple Swift packages with Objc targets that contain resources
+
+Both the `third_party/app_lovin_sdk` and the `SDWebImageSwiftUI` packages have or use Objective-C
+code that have resources. The inclusion of both in this project ensures that the resource bundle
+accessors that are generated for these packages work properly.

examples/resources_example/Package.swift

@@ -14,6 +14,7 @@ swift_library(
         "@swiftpkg_another_package_with_resources//:MoreCoolUI",
         "@swiftpkg_googlesignin_ios//:GoogleSignInSwift_Sources_GoogleSignInSwift",
         "@swiftpkg_package_with_resources//:Sources_CoolUI",
+        "@swiftpkg_sdwebimageswiftui//:SDWebImageSwiftUI_Classes_SDWebImageSwiftUI",
     ],
 )
 

examples/resources_example/README.md

@@ -1,6 +1,7 @@
 import CoolUI
 import GoogleSignInSwift
 import MoreCoolUI
+import SDWebImageSwiftUI
 import SwiftUI
 
 @main
@@ -12,6 +13,9 @@ struct MyApp: App {
                 CoolStuff.image().resizable()
                 MoreCoolStuff.title()
                 MoreCoolStuff.image().resizable()
+                WebImage(url: URL(string: "https://nokiatech.github.io/heif/content/images/ski_jump_1440x960.heic"))
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
                 // Ensure that Google sign-in can find its resources.
                 GoogleSignInButton {
                     print("Signing in")

examples/resources_example/Sources/MyApp/BUILD.bazel

@@ -3,7 +3,8 @@
     "another_package_with_resources",
     "app_lovin_sdk",
     "googlesignin-ios",
-    "package_with_resources"
+    "package_with_resources",
+    "sdwebimageswiftui"
   ],
   "modules": [
     {
@@ -142,6 +143,37 @@
       "product_memberships": [
         "CoolUI"
       ]
+    },
+    {
+      "name": "SDWebImageMapKit",
+      "c99name": "SDWebImageMapKit",
+      "src_type": "objc",
+      "label": "@swiftpkg_sdwebimage//:SDWebImageMapKit_SDWebImageMapKit",
+      "package_identity": "sdwebimage",
+      "product_memberships": [
+        "SDWebImageMapKit"
+      ]
+    },
+    {
+      "name": "SDWebImage",
+      "c99name": "SDWebImage",
+      "src_type": "objc",
+      "label": "@swiftpkg_sdwebimage//:SDWebImage_SDWebImage",
+      "package_identity": "sdwebimage",
+      "product_memberships": [
+        "SDWebImage",
+        "SDWebImageMapKit"
+      ]
+    },
+    {
+      "name": "SDWebImageSwiftUI",
+      "c99name": "SDWebImageSwiftUI",
+      "src_type": "swift",
+      "label": "@swiftpkg_sdwebimageswiftui//:SDWebImageSwiftUI_Classes_SDWebImageSwiftUI",
+      "package_identity": "sdwebimageswiftui",
+      "product_memberships": [
+        "SDWebImageSwiftUI"
+      ]
     }
   ],
   "products": [
@@ -249,6 +281,30 @@
       "target_labels": [
         "@swiftpkg_package_with_resources//:Sources_CoolUI"
       ]
+    },
+    {
+      "identity": "sdwebimageswiftui",
+      "name": "SDWebImageSwiftUI",
+      "type": "library",
+      "target_labels": [
+        "@swiftpkg_sdwebimageswiftui//:SDWebImageSwiftUI_Classes_SDWebImageSwiftUI"
+      ]
+    },
+    {
+      "identity": "sdwebimage",
+      "name": "SDWebImage",
+      "type": "library",
+      "target_labels": [
+        "@swiftpkg_sdwebimage//:SDWebImage_SDWebImage"
+      ]
+    },
+    {
+      "identity": "sdwebimage",
+      "name": "SDWebImageMapKit",
+      "type": "library",
+      "target_labels": [
+        "@swiftpkg_sdwebimage//:SDWebImageMapKit_SDWebImageMapKit"
+      ]
     }
   ],
   "packages": [
@@ -308,6 +364,24 @@
       "local": {
         "path": "third_party/package_with_resources"
       }
+    },
+    {
+      "name": "swiftpkg_sdwebimage",
+      "identity": "sdwebimage",
+      "remote": {
+        "commit": "e278c13e46e8d20c895c221e922c6ac6b72aaca9",
+        "remote": "https://github.com/SDWebImage/SDWebImage",
+        "version": "5.18.7"
+      }
+    },
+    {
+      "name": "swiftpkg_sdwebimageswiftui",
+      "identity": "sdwebimageswiftui",
+      "remote": {
+        "commit": "aee64ef39b570c44ccf0f884c440fc6494a23c76",
+        "remote": "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
+        "version": "2.2.5"
+      }
     }
   ]
 }

examples/resources_example/Sources/MyApp/MyApp.swift

@@ -1,15 +1,15 @@
 #import <Foundation/Foundation.h>
 
-@interface __CurrentBundleFinder : NSObject
+@interface __{MODULE_NAME}_CurrentBundleFinder : NSObject
 @end
 
-@implementation __CurrentBundleFinder
+@implementation __{MODULE_NAME}_CurrentBundleFinder
 @end
 
 NSBundle* {MODULE_NAME}_SWIFTPM_MODULE_BUNDLE() {
     NSArray *candidates = @[
         [[NSBundle mainBundle] bundleURL],
-        [[NSBundle bundleForClass:[__CurrentBundleFinder class]] bundleURL],
+        [[NSBundle bundleForClass:[__{MODULE_NAME}_CurrentBundleFinder class]] bundleURL],
     ];
     for (id obj in candidates) {
         NSURL *baseURL = obj;