Update Podspecs to use resource_bundles (#76)

Author: jspizziri

Sources/LCP/Toolkit/Bundle.swift

@@ -3,12 +3,28 @@
 //  Use of this source code is governed by the BSD-style license
 //  available in the top-level LICENSE file of the project.
 //
-
 import Foundation
 
 #if !SWIFT_PACKAGE
 extension Bundle {
+
+    #if !COCOAPODS
     /// Returns ReadiumLCP's bundle by querying an arbitrary type.
     static let module = Bundle(for: LCPService.self)
+    #else
+    /// Returns ReadiumLCP's bundle by querying for the cocoapods bundle.
+    static let module = Bundle.getCocoaPodsBundle()
+    static func getCocoaPodsBundle() -> Bundle {
+        let rootBundle = Bundle(for: LCPService.self)
+        guard let resourceBundleUrl = rootBundle.url(forResource: "ReadiumLCP", withExtension: "bundle") else {
+            fatalError("Unable to locate ReadiumLCP.bundle")
+        }
+        guard let bundle = Bundle(url: resourceBundleUrl) else {
+            fatalError("Unable to load ReadiumLCP.bundle")
+        }
+
+        return bundle
+    }
+    #endif
 }
 #endif

Sources/Navigator/Toolkit/Extensions/Bundle.swift

@@ -7,7 +7,24 @@ import Foundation
 
 #if !SWIFT_PACKAGE
 extension Bundle {
+
+    #if !COCOAPODS
     /// Returns R2Navigator's bundle by querying an arbitrary type.
     static let module = Bundle(for: EPUBNavigatorViewController.self)
+    #else
+    /// Returns R2Navigator's bundle by querying for the cocoapods bundle.
+    static let module = Bundle.getCocoaPodsBundle()
+    static func getCocoaPodsBundle() -> Bundle {
+        let rootBundle = Bundle(for: EPUBNavigatorViewController.self)
+        guard let resourceBundleUrl = rootBundle.url(forResource: "ReadiumNavigator", withExtension: "bundle") else {
+            fatalError("Unable to locate ReadiumNavigator.bundle")
+        }
+        guard let bundle = Bundle(url: resourceBundleUrl) else {
+            fatalError("Unable to load ReadiumNavigator.bundle")
+        }
+
+        return bundle
+    }
+    #endif
 }
 #endif

Sources/Shared/Toolkit/Extensions/Bundle.swift

@@ -3,12 +3,28 @@
 //  Use of this source code is governed by the BSD-style license
 //  available in the top-level LICENSE file of the project.
 //
-
 import Foundation
 
 #if !SWIFT_PACKAGE
 extension Bundle {
+
+    #if !COCOAPODS
     /// Returns R2Shared's bundle by querying an arbitrary type.
     static let module = Bundle(for: Publication.self)
+    #else
+    /// Returns R2Shared's bundle by querying for the cocoapods bundle.
+    static let module = Bundle.getCocoaPodsBundle()
+    static func getCocoaPodsBundle() -> Bundle {
+        let rootBundle = Bundle(for: Publication.self)
+        guard let resourceBundleUrl = rootBundle.url(forResource: "ReadiumShared", withExtension: "bundle") else {
+            fatalError("Unable to locate ReadiumShared.bundle")
+        }
+        guard let bundle = Bundle(url: resourceBundleUrl) else {
+            fatalError("Unable to load ReadiumShared.bundle")
+        }
+
+        return bundle
+    }
+    #endif
 }
 #endif

Sources/Streamer/Toolkit/Extensions/Bundle.swift

@@ -3,12 +3,28 @@
 //  Use of this source code is governed by the BSD-style license
 //  available in the top-level LICENSE file of the project.
 //
-
 import Foundation
 
 #if !SWIFT_PACKAGE
 extension Bundle {
+
+    #if !COCOAPODS
     /// Returns R2Streamer's bundle by querying an arbitrary type.
     static let module = Bundle(for: Streamer.self)
+    #else
+    /// Returns R2Streamer's bundle by querying for the cocoapods bundle.
+    static let module = Bundle.getCocoaPodsBundle()
+    static func getCocoaPodsBundle() -> Bundle {
+        let rootBundle = Bundle(for: Streamer.self)
+        guard let resourceBundleUrl = rootBundle.url(forResource: "ReadiumStreamer", withExtension: "bundle") else {
+            fatalError("Unable to locate ReadiumStreamer.bundle")
+        }
+        guard let bundle = Bundle(url: resourceBundleUrl) else {
+            fatalError("Unable to load ReadiumStreamer.bundle")
+        }
+
+        return bundle
+    }
+    #endif
 }
 #endif

Support/CocoaPods/ReadiumLCP.podspec

@@ -8,10 +8,12 @@ Pod::Spec.new do |s|
   s.author        = { "Readium" => "contact@readium.org" }
   s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
   s.requires_arc  = true
-  s.resources     = [
-    'Sources/LCP/Resources/**',
-    'Sources/LCP/**/*.xib'
-  ]
+  s.resource_bundles = {
+    'ReadiumLCP' => [
+      'Sources/LCP/Resources/**',
+      'Sources/LCP/**/*.xib',
+    ],
+  }
   s.source_files  = "Sources/LCP/**/*.{m,h,swift}"
   s.platform      = :ios
   s.ios.deployment_target = "10.0"

Support/CocoaPods/ReadiumNavigator.podspec

@@ -8,7 +8,12 @@ Pod::Spec.new do |s|
   s.author        = { "Readium" => "contact@readium.org" }
   s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
   s.requires_arc  = true
-  s.resources     = ['Sources/Navigator/Resources/**', 'Sources/Navigator/EPUB/Assets']
+  s.resource_bundles = {
+    'ReadiumNavigator' => [
+      'Sources/Navigator/Resources/**',
+      'Sources/Navigator/EPUB/Assets',
+    ],
+  }
   s.source_files  = "Sources/Navigator/**/*.{m,h,swift}"
   s.platform      = :ios
   s.ios.deployment_target = "10.0"

Support/CocoaPods/ReadiumOPDS.podspec

@@ -8,7 +8,9 @@ Pod::Spec.new do |s|
   s.author        = { "Readium" => "contact@readium.org" }
   s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
   s.requires_arc  = true
-  s.resources     = ['Sources/OPDS/Resources/**']
+  s.resource_bundles = {
+    'ReadiumOPDS' => ['Sources/OPDS/Resources/**'],
+  }
   s.source_files  = "Sources/OPDS/**/*.{m,h,swift}"
   s.platform      = :ios
   s.ios.deployment_target = "10.0"

Support/CocoaPods/ReadiumShared.podspec

@@ -9,7 +9,9 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :branch => "develop" }
   s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
   s.requires_arc = true
-  s.resources    = ['Sources/Shared/Resources/**']
+  s.resource_bundles = {
+    'ReadiumShared' => ['Sources/Shared/Resources/**'],
+  }
   s.source_files  = "Sources/Shared/**/*.{m,h,swift}"
   s.platform     = :ios
   s.ios.deployment_target = "10.0"

Support/CocoaPods/ReadiumStreamer.podspec

@@ -8,7 +8,12 @@ Pod::Spec.new do |s|
   s.author        = { "Readium" => "contact@readium.org" }
   s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
   s.requires_arc  = true
-  s.resources     = ['Sources/Streamer/Resources/**', 'Sources/Streamer/Assets']
+  s.resource_bundles = {
+    'ReadiumStreamer' => [
+      'Sources/Streamer/Resources/**',
+      'Sources/Streamer/Assets',
+    ],
+  }
   s.source_files  = "Sources/Streamer/**/*.{m,h,swift}"
   s.platform      = :ios
   s.ios.deployment_target = "10.0"