Couple of fixes for xcode12 support (SwiftKickMobile#418)

* Add resources to Package.swift

* Fix bundle search method

* Search for CocoaPods bunlde

* Remove redundant resources declaration

* Streamline implementation a bit and return a fallback value

Co-authored-by: Timothy Moose <tim@swiftkick.it>

Author: ollitapa

.gitignore

@@ -47,3 +47,4 @@ playground.xcworkspace
 *.pkey
 screenshots
 rvm.env
+.build

SwiftMessages.podspec

@@ -15,13 +15,13 @@ Pod::Spec.new do |spec|
 
     spec.subspec 'App' do |app|
         app.source_files = 'SwiftMessages/**/*.swift'
-        app.resource_bundles = {'SwiftMessages' => ['SwiftMessages/Resources/**/*']}
+        app.resource_bundles = {'SwiftMessages_SwiftMessages' => ['SwiftMessages/Resources/*.{xib,xcassets}']}
     end
 
     spec.subspec 'AppExtension' do |ext|
         ext.source_files  = 'SwiftMessages/**/*.swift'
         ext.exclude_files = 'SwiftMessages/**/SegueConvenienceClasses.swift'
-        ext.resource_bundles = {'SwiftMessages' => ['SwiftMessages/Resources/**/*']}
+        ext.resource_bundles = {'SwiftMessages_SwiftMessages' => ['SwiftMessages/Resources/**/*.{xib,xcassets}']}
 
         # For app extensions, disabling code paths using unavailable API
         ext.pod_target_xcconfig = {

SwiftMessages/NSBundle+Utils.swift

@@ -8,20 +8,41 @@
 
 import Foundation
 
+private class BundleToken {}
+
 extension Bundle {
+    // This is copied method from SPM generated Bundle.module for CocoaPods support
     static func sm_frameworkBundle() -> Bundle {
-        let bundle = Bundle(for: MessageView.self)
-        // Check for Swift Package Manager bundle name
-        if let path = bundle.path(forResource: "SwiftMessages_SwiftMessages", ofType: "bundle") {
-            return Bundle(path: path)!
-        }
-        // Check for CocoaPods or Carthage bundle name
-        else if let path = bundle.path(forResource: "SwiftMessages", ofType: "bundle") {
-            return Bundle(path: path)!
-        }
-        // Just return the app bundle
-        else {
-            return bundle
+
+        let candidates = [
+            // Bundle should be present here when the package is linked into an App.
+            Bundle.main.resourceURL,
+
+            // Bundle should be present here when the package is linked into a framework.
+            Bundle(for: BundleToken.self).resourceURL,
+
+            // For command-line tools.
+            Bundle.main.bundleURL,
+        ]
+
+        let bundleNames = [
+            // For Swift Package Manager
+            "SwiftMessages_SwiftMessages",
+
+            // For Carthage
+            "SwiftMessages",
+        ]
+
+        for bundleName in bundleNames {
+            for candidate in candidates {
+                let bundlePath = candidate?.appendingPathComponent(bundleName + ".bundle")
+                if let bundle = bundlePath.flatMap(Bundle.init(url:)) {
+                    return bundle
+                }
+            }
         }
+
+        // Return whatever bundle this code is in as a last resort.
+        return Bundle(for: BundleToken.self)
     }
 }