diff --git a/Airship.podspec b/Airship.podspec index 575965bcb..57dbd248f 100644 --- a/Airship.podspec +++ b/Airship.podspec @@ -61,7 +61,6 @@ Pod::Spec.new do |s| s.subspec "PreferenceCenter" do |preferenceCenter| preferenceCenter.ios.source_files = "Airship/AirshipPreferenceCenter/Source/**/*.{h,m,swift}" preferenceCenter.ios.exclude_files = "Airship/AirshipPreferenceCenter/Source/AirshipPreferenceCenter.h" - preferenceCenter.ios.resource_bundle = { 'AirshipPreferenceCenterResources' => "Airship/AirshipPreferenceCenter/Resources/**/*" } preferenceCenter.dependency "Airship/Core" end end diff --git a/Airship/AirshipPreferenceCenter/Source/PreferenceCenterResources.swift b/Airship/AirshipPreferenceCenter/Source/PreferenceCenterResources.swift index 794862ad0..196505f89 100644 --- a/Airship/AirshipPreferenceCenter/Source/PreferenceCenterResources.swift +++ b/Airship/AirshipPreferenceCenter/Source/PreferenceCenterResources.swift @@ -9,35 +9,11 @@ import AirshipCore /// Resources for AirshipPreferenceCenter. class PreferenceCenterResources { - /** - * Resource bundle for AirshipPreferenceCenter. - * - Returns: The preference center bundle. - */ - @objc - public static func bundle() -> Bundle? { - let mainBundle = Bundle.main - let sourceBundle = Bundle(for: Self.self) - - let path = - mainBundle.path( - forResource: "Airship_AirshipPreferenceCenter", - ofType: "bundle" - ) ?? mainBundle.path( - forResource: "AirshipPreferenceCenterResources", - ofType: "bundle" - ) ?? sourceBundle.path( - forResource: "AirshipPreferenceCenterResources", - ofType: "bundle" - ) ?? "" - - return Bundle(path: path) ?? sourceBundle - } - public static func localizedString(key: String) -> String? { return LocalizationUtils.localizedString( key, withTable: "UrbanAirship", - moduleBundle: bundle() + moduleBundle: AirshipCoreResources.bundle ) } }