Updating Braze SDK

Appboy-iOS-SDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Appboy-iOS-SDK"
-  s.version      = "3.28.0"
+  s.version      = "3.29.0"
   s.summary      = "This is the Braze iOS SDK for Mobile Marketing Automation"
   s.homepage     = "http://www.braze.com"
   s.license      = { :type => 'Commercial', :text => 'Please refer to https://github.com/Appboy/appboy-ios-sdk/blob/master/LICENSE'}

AppboyKit/headers/AppboyKitLibrary/Appboy.h

@@ -13,7 +13,7 @@
 #import <UserNotifications/UserNotifications.h>
 
 #ifndef APPBOY_SDK_VERSION
-#define APPBOY_SDK_VERSION @"3.28.0"
+#define APPBOY_SDK_VERSION @"3.29.0"
 #endif
 
 #if !TARGET_OS_TV

AppboyUI/ABKContentCards/ViewControllers/ABKContentCardsTableViewController.m

@@ -51,7 +51,7 @@ @implementation ABKContentCardsTableViewController
 
 - (instancetype)init {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKContentCardsStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKContentCardsTableViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKContentCardsTableViewController class]]];
   ABKContentCardsTableViewController *vc = [st instantiateViewControllerWithIdentifier:@"ABKContentCardsTableViewController"];
   self = vc;
   return self;
@@ -409,14 +409,14 @@ - (void)cancelCachingCardImages {
 
 + (instancetype)getNavigationContentCardsViewController {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKContentCardsStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKContentCardsTableViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKContentCardsTableViewController class]]];
   ABKContentCardsTableViewController *vc = [st instantiateViewControllerWithIdentifier:@"ABKContentCardsTableViewController"];
   return vc;
 }
 
 - (NSString *)localizedAppboyContentCardsString:(NSString *)key {
   return [ABKUIUtils getLocalizedString:key
-                         inAppboyBundle:[NSBundle bundleForClass:[ABKContentCardsTableViewController class]]
+                         inAppboyBundle:[ABKUIUtils bundle:[ABKContentCardsTableViewController class]]
                                   table:@"AppboyContentCardsLocalizable"];
 }
 

AppboyUI/ABKContentCards/ViewControllers/ABKContentCardsViewController.m

@@ -1,10 +1,11 @@
 #import "ABKContentCardsViewController.h"
+#import "ABKUIUtils.h"
 
 @implementation ABKContentCardsViewController
 
 - (instancetype)init {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKContentCardsStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKContentCardsViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKContentCardsViewController class]]];
   ABKContentCardsViewController *nf = [st instantiateViewControllerWithIdentifier:@"ABKContentCardsViewController"];
   self = nf;
   self.contentCardsViewController = self.viewControllers[0];

AppboyUI/ABKContentCards/ViewControllers/Cells/ABKBaseContentCardCell.m

@@ -94,7 +94,7 @@ - (void)applyCard:(ABKContentCard *)card {
 - (UIImage *)getPlaceHolderImage {
   return [ABKUIUtils getImageWithName:@"appboy_cc_noimage_lrg"
                                  type:@"png"
-                       inAppboyBundle:[NSBundle bundleForClass:[ABKBaseContentCardCell class]]];
+                       inAppboyBundle:[ABKUIUtils bundle:[ABKBaseContentCardCell class]]];
 }
 
 - (void)applyAppboyAttributedTextStyleFrom:(NSString *)text forLabel:(UILabel *)label {

AppboyUI/ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.m

@@ -84,7 +84,7 @@ - (void)viewDidAppear:(BOOL)animated {
 }
 
 - (void)loadView {
-  [[NSBundle bundleForClass:[ABKInAppMessageFullViewController class]] loadNibNamed:@"ABKInAppMessageFullViewController"
+  [[ABKUIUtils bundle:[ABKInAppMessageFullViewController class]] loadNibNamed:@"ABKInAppMessageFullViewController"
                                                                                owner:self
                                                                              options:nil];
   self.inAppMessageHeaderLabel.font = HeaderLabelDefaultFont;

AppboyUI/ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.m

@@ -105,7 +105,7 @@ - (void)viewDidLayoutSubviews {
 }
 
 - (void)loadView {
-  [[NSBundle bundleForClass:[ABKInAppMessageModalViewController class]]
+  [[ABKUIUtils bundle:[ABKInAppMessageModalViewController class]]
                loadNibNamed:@"ABKInAppMessageModalViewController"
                       owner:self
                     options:nil];

AppboyUI/ABKInAppMessage/ViewControllers/ABKInAppMessageSlideupViewController.m

@@ -26,7 +26,7 @@ @interface ABKInAppMessageSlideupViewController()
 @implementation ABKInAppMessageSlideupViewController
 
 - (void)loadView {
-  [[NSBundle bundleForClass:[ABKInAppMessageSlideupViewController class]] loadNibNamed:@"ABKInAppMessageSlideupViewController"
+  [[ABKUIUtils bundle:[ABKInAppMessageSlideupViewController class]] loadNibNamed:@"ABKInAppMessageSlideupViewController"
                                                                                  owner:self
                                                                                options:nil];
   self.inAppMessageMessageLabel.font = MessageLabelDefaultFont;

AppboyUI/ABKInAppMessage/ViewControllers/ABKInAppMessageViewController.m

@@ -73,7 +73,7 @@ - (BOOL)applyIconToLabelView:(UILabel *)iconLabelView {
     // Check if font awesome is already registered in the application. If not, register it.
     // The size can be any number here.
     if ([UIFont fontWithName:FontAwesomeName size:30] == nil) {
-      NSString *fontPath = [[NSBundle bundleForClass:[ABKInAppMessageViewController class]]
+      NSString *fontPath = [[ABKUIUtils bundle:[ABKInAppMessageViewController class]]
                                      pathForResource:FontAwesomeName
                                               ofType:@"otf"];
       NSData *fontData = [NSData dataWithContentsOfFile:fontPath];

AppboyUI/ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.m

@@ -5,6 +5,7 @@
 #import "ABKUIUtils.h"
 #import "ABKFeedWebViewController.h"
 #import "ABKUIURLUtils.h"
+
 #import <SDWebImage/SDWebImagePrefetcher.h>
 #import <SDWebImage/UIImageView+WebCache.h>
 
@@ -14,7 +15,7 @@ @implementation ABKNewsFeedTableViewController
 
 - (instancetype)init {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKNewsFeedCardStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKNewsFeedTableViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKNewsFeedTableViewController class]]];
   ABKNewsFeedTableViewController *nf = [st instantiateViewControllerWithIdentifier:@"ABKNewsFeedTableViewController"];
   self = nf;
   return self;
@@ -232,14 +233,14 @@ - (void)cacheAllCardImages {
 
 + (instancetype)getNavigationFeedViewController {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKNewsFeedCardStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKNewsFeedTableViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKNewsFeedTableViewController class]]];
   ABKNewsFeedTableViewController *nf = [st instantiateViewControllerWithIdentifier:@"ABKNewsFeedTableViewController"];
   return nf;
 }
 
 - (NSString *)localizedAppboyFeedString:(NSString *)key {
   return [ABKUIUtils getLocalizedString:key
-                         inAppboyBundle:[NSBundle bundleForClass:[ABKNewsFeedTableViewController class]]
+                         inAppboyBundle:[ABKUIUtils bundle:[ABKNewsFeedTableViewController class]]
                                   table:@"AppboyFeedLocalizable"];
 }
 

AppboyUI/ABKNewsFeed/ViewControllers/ABKNewsFeedViewController.m

@@ -1,11 +1,12 @@
 #import "ABKNewsFeedViewController.h"
 #import "ABKNewsFeedTableViewController.h"
+#import "ABKUIUtils.h"
 
 @implementation ABKNewsFeedViewController
 
 - (instancetype)init {
   UIStoryboard *st = [UIStoryboard storyboardWithName:@"ABKNewsFeedCardStoryboard"
-                                               bundle:[NSBundle bundleForClass:[ABKNewsFeedViewController class]]];
+                                               bundle:[ABKUIUtils bundle:[ABKNewsFeedViewController class]]];
   ABKNewsFeedViewController *nf = [st instantiateViewControllerWithIdentifier:@"ABKNewsFeedViewController"];
   self = nf;
   _newsFeed = self.viewControllers[0];

AppboyUI/ABKNewsFeed/ViewControllers/Cells/ABKNFBaseCardCell.m

@@ -95,7 +95,7 @@ + (NSString *)findCellIdentifierWithCard:(ABKCard *)card {
 - (UIImage *)getPlaceHolderImage {
   return [ABKUIUtils getImageWithName:@"img-noimage-lrg"
                                  type:@"png"
-                       inAppboyBundle:[NSBundle bundleForClass:[ABKNFBaseCardCell class]]];
+                       inAppboyBundle:[ABKUIUtils bundle:[ABKNFBaseCardCell class]]];
 }
 
 @end

AppboyUI/ABKUIUtils/ABKUIUtils.h

@@ -28,6 +28,11 @@
  */
 @property (class, readonly) UIStatusBarStyle applicationStatusBarStyle;
 
+/*!
+ * Given a class, this method searches across multiple locations and returns the associated bundle for that class
+ */
++ (NSBundle *)bundle:(Class)bundleClass;
+
 + (NSString *)getLocalizedString:(NSString *)key inAppboyBundle:(NSBundle *)appboyBundle table:(NSString *)table;
 + (BOOL)objectIsValidAndNotEmpty:(id)object;
 + (Class)getSDWebImageProxyClass;

AppboyUI/ABKUIUtils/ABKUIUtils.m

@@ -1,6 +1,8 @@
 #import "ABKUIUtils.h"
 #import "ABKSDWebImageProxy.h"
 
+#define ABKUISPMBundlePath @"/Appboy_iOS_SDK_AppboyUI.bundle/"
+
 static NSString *const LocalizedAppboyStringNotFound = @"not found";
 static NSUInteger const iPhoneXHeight = 2436.0;
 static NSUInteger const iPhoneXRHeight = 1792.0;
@@ -9,6 +11,16 @@
 
 @implementation ABKUIUtils
 
+#pragma mark - Bundle Helper
+
++ (NSBundle *)bundle:(Class)bundleClass {
+  NSString *spmBundleAt = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:ABKUISPMBundlePath];
+  if ([[NSFileManager defaultManager] fileExistsAtPath:spmBundleAt]) {
+    return [NSBundle bundleWithPath:spmBundleAt];
+  }
+  return  [NSBundle bundleForClass:bundleClass];
+}
+
 #pragma mark - View Hierarchy Helpers
 
 // Used in unit tests to mock the UIApplication instance used.

AppboyUI/include/AppboyUI/ABKBannerContentCardCell.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/Cells/ABKBannerContentCardCell.h

AppboyUI/include/AppboyUI/ABKBaseContentCardCell.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/Cells/ABKBaseContentCardCell.h

AppboyUI/include/AppboyUI/ABKCaptionedImageContentCardCell.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/Cells/ABKCaptionedImageContentCardCell.h

AppboyUI/include/AppboyUI/ABKClassicContentCardCell.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/Cells/ABKClassicContentCardCell.h

AppboyUI/include/AppboyUI/ABKClassicImageContentCardCell.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/Cells/ABKClassicImageContentCardCell.h

AppboyUI/include/AppboyUI/ABKContentCardsTableViewController.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/ABKContentCardsTableViewController.h

AppboyUI/include/AppboyUI/ABKContentCardsViewController.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/ABKContentCardsViewController.h

AppboyUI/include/AppboyUI/ABKContentCardsWebViewController.h

@@ -0,0 +1 @@
+../../ABKContentCards/ViewControllers/ABKContentCardsWebViewController.h

AppboyUI/include/AppboyUI/ABKFeedWebViewController.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/ABKFeedWebViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageFullViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageHTMLBaseViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageHTMLBaseViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageHTMLFullViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageHTMLFullViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageHTMLViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageHTMLViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageImmersiveViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageImmersiveViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageModalViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageSlideupViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageSlideupViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageUIButton.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ABKInAppMessageUIButton.h

AppboyUI/include/AppboyUI/ABKInAppMessageUIController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ABKInAppMessageUIController.h

AppboyUI/include/AppboyUI/ABKInAppMessageUIDelegate.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ABKInAppMessageUIDelegate.h

AppboyUI/include/AppboyUI/ABKInAppMessageView.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ABKInAppMessageView.h

AppboyUI/include/AppboyUI/ABKInAppMessageViewController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageViewController.h

AppboyUI/include/AppboyUI/ABKInAppMessageWindow.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ABKInAppMessageWindow.h

AppboyUI/include/AppboyUI/ABKInAppMessageWindowController.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/ViewControllers/ABKInAppMessageWindowController.h

AppboyUI/include/AppboyUI/ABKNFBannerCardCell.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/Cells/ABKNFBannerCardCell.h

AppboyUI/include/AppboyUI/ABKNFBaseCardCell.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/Cells/ABKNFBaseCardCell.h

AppboyUI/include/AppboyUI/ABKNFCaptionedMessageCardCell.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/Cells/ABKNFCaptionedMessageCardCell.h

AppboyUI/include/AppboyUI/ABKNFClassicCardCell.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/Cells/ABKNFClassicCardCell.h

AppboyUI/include/AppboyUI/ABKNewsFeedTableViewController.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.h

AppboyUI/include/AppboyUI/ABKNewsFeedViewController.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/ViewControllers/ABKNewsFeedViewController.h

AppboyUI/include/AppboyUI/ABKUIURLUtils.h

@@ -0,0 +1 @@
+../../ABKUIUtils/ABKUIURLUtils.h

AppboyUI/include/AppboyUI/ABKUIUtils.h

@@ -0,0 +1 @@
+../../ABKUIUtils/ABKUIUtils.h

AppboyUI/include/AppboyUI/AppboyContentCards.h

@@ -0,0 +1 @@
+../../ABKContentCards/AppboyContentCards.h

AppboyUI/include/AppboyUI/AppboyInAppMessage.h

@@ -0,0 +1 @@
+../../ABKInAppMessage/AppboyInAppMessage.h

AppboyUI/include/AppboyUI/AppboyNewsFeed.h

@@ -0,0 +1 @@
+../../ABKNewsFeed/AppboyNewsFeed.h

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 3.29.0
+
+##### Added
+- Adds initial support for Swift Package Manager. There are 2 new packages that have been added: `AppboyKit` for the core SDK and `AppboyUI` for the full SDK (including UI elements), which correspond to the `Appboy-iOS-SDK/Core` and `Appboy-iOS-SDK` pods, respectively.
+  - Note that tvOS support is not available via Swift Package Manager for this release. Push Stories is only available through a side-by-side integration with Cocoapods.
+  - To add the package to your project follow these steps:
+    - Select `File > Swift Packages > Add Package Dependency`.
+      - In the search bar, enter `https://github.com/Appboy/Appboy-ios-sdk`.
+      - Select _one_ of `AppboyKit` or `AppboyUI`. Note that `AppboyUI` includes `AppboyKit` automatically.
+    - In your app's target, under `Build Settings > Other Linker Flags`, add the `-ObjC` linker flag.
+    - In the Xcode menu, click `Product > Scheme > Edit Scheme...`
+      - Click the expand ▶️ next to `Build` and select `Post-actions`. Press `+` and select `New Run Script Action`. 
+      - In the dropdown next to `Provide build settings from`, select your app's target.
+      - Copy this script into the open field:
+        ```
+        rm -rf "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Frameworks/libAppboyKitLibrary.a"
+        rm -rf "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Plugins/libAppboyKitLibrary.a"
+        ```
+
 ## 3.28.0
 
 ##### Breaking