Merge pull request #331 from wordpress-mobile/fix/font-resource-bundle-not-found

Fix resource bundle for WordPressShared when installed from CocoaPods

Author: dvdchr

Sources/WordPressSharedObjC/Utility/WPFontManager.m

@@ -108,12 +108,7 @@ + (void)loadFontNamed:(NSString *)fontName resourceNamed:(NSString *)resourceNam
 
 + (void)loadFontResourceNamed:(NSString *)name withExtension:(NSString *)extension
 {
-#if SWIFT_PACKAGE
-    NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
-#else
-    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-#endif
-    NSURL *url = [bundle URLForResource:name withExtension:extension];
+    NSURL *url = [[self resourceBundle] URLForResource:name withExtension:extension];
 
     CFErrorRef error;
     if (!CTFontManagerRegisterFontsForURL((CFURLRef)url, kCTFontManagerScopeProcess, &error)) {
@@ -125,4 +120,20 @@ + (void)loadFontResourceNamed:(NSString *)name withExtension:(NSString *)extensi
     return;
 }
 
++ (NSBundle *)resourceBundle {
+#if SWIFT_PACKAGE
+    return SWIFTPM_MODULE_BUNDLE;
+#else
+    // When installed via CocoaPods, the resources will be bundled under `WordPressShared.bundle`.
+    // This follows the implementation from `NSBundle+WordPressShared`.
+    NSBundle *defaultBundle = [NSBundle bundleForClass:[self class]];
+    NSURL *sharedBundleURL = [defaultBundle.resourceURL URLByAppendingPathComponent:@"WordPressShared.bundle"];
+    NSBundle *sharedBundle = [NSBundle bundleWithURL:sharedBundleURL];
+    if (sharedBundle) {
+        return sharedBundle;
+    }
+    return defaultBundle;
+#endif
+}
+
 @end

WordPressShared.podspec

@@ -4,7 +4,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressShared'
-  s.version       = '2.0.0'
+  s.version       = '2.0.1-beta.1'
 
   s.summary       = 'Shared components used in building the WordPress iOS apps and other library components.'
   s.description   = <<-DESC