Merge branch 'master' into app_nav

Libraries/Segment-Firebase/Classes/SEGFirebaseIntegration.m

@@ -1,5 +1,7 @@
 #import "SEGFirebaseIntegration.h"
-#import <Firebase/Firebase.h>
+
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseAnalytics/FirebaseAnalytics.h>
 
 #if defined(__has_include) && __has_include(<Analytics/SEGAnalytics.h>)
 #import <Analytics/SEGAnalyticsUtils.h>
@@ -128,10 +130,10 @@ - (NSString *)formatFirebaseEventNames:(NSString *)event
                                              kFIREventAddToCart, @"Product Added",
                                              kFIREventRemoveFromCart, @"Product Removed",
                                              kFIREventBeginCheckout, @"Checkout Started",
-                                             kFIREventPresentOffer, @"Promotion Viewed",
+                                             kFIREventViewPromotion, @"Promotion Viewed",
                                              kFIREventAddPaymentInfo, @"Payment Info Entered",
                                              kFIREventPurchase, @"Order Completed",
-                                             kFIREventPurchaseRefund, @"Order Refunded",
+                                             kFIREventRefund, @"Order Refunded",
                                              kFIREventViewItemList, @"Product List Viewed",
                                              kFIREventAddToWishlist, @"Product Added to Wishlist",
                                              kFIREventShare, @"Product Shared",
@@ -185,8 +187,9 @@ + (NSDictionary *)mapToFirebaseParameters:(NSDictionary *)properties withMap:(NS
             if ([data isKindOfClass:[NSDictionary class]]) {
                 data = [self mapToFirebaseParameters:data withMap:mapper];
             } else if ([data isKindOfClass: [NSArray class]]) {
+                NSArray *originalData = (NSArray *)data;
                 NSMutableArray *newArray = [NSMutableArray array];
-                for (id entry in newArray) {
+                for (id entry in originalData) {
                     if ([entry isKindOfClass:[NSDictionary class]]) {
                         id newEntry = [self mapToFirebaseParameters:entry withMap:mapper];
                         [newArray addObject:newEntry];

Podfile

@@ -6,26 +6,28 @@ source 'https://github.com/CocoaPods/Specs.git'
 project 'edX.xcodeproj'
 
 target 'edX' do
-  pod 'Analytics', '= 4.1.6'
-  pod 'Segment-GoogleAnalytics', '= 1.3.3'
+  pod 'Analytics', '= 4.1.8'
+  pod 'BranchSDK', '= 2.0.0'
   pod 'DateTools', '= 2.0.0'
-  pod 'GoogleSignIn', '~> 6.1.0'
+  pod 'FBSDKCoreKit', '= 16.0.0'
+  pod 'FBSDKLoginKit', '= 16.0.0'
+  pod 'Firebase', '= 10.5.0', :modular_headers => true
+  pod 'FirebaseAnalytics', '= 10.5.0'
+  pod 'FirebaseCore', '= 10.5.0', :modular_headers => true
+  pod 'FirebaseCoreInternal', '= 10.5.0', :modular_headers => true
+  pod 'FirebaseCrashlytics', '= 10.5.0'
+  pod 'FirebaseInAppMessaging', '= 10.5.0-beta'
+  pod 'FirebaseMessaging', '= 10.5.0'
+  pod 'FirebasePerformance', '= 10.5.0'
+  pod 'GoogleSignIn', '~> 7.0.0'
+  pod 'GoogleUtilities', '= 7.11.0', :modular_headers => true
   pod 'Masonry', '= 1.1.0'
-  pod 'NewRelicAgent', '= 7.3.3'
-  pod 'FBSDKCoreKit', '=  12.0.0'
-  pod 'FBSDKLoginKit', '= 12.0.0'
+  pod 'MSAL', '= 1.2.5'
+  pod 'NewRelicAgent', '= 7.4.2'
+  pod 'Segment-Appboy', '= 4.6.0'
+  pod 'Segment-GoogleAnalytics', '= 1.3.3'
   pod 'Smartling.i18n', '~> 1.0.14'
-  pod 'Firebase','= 8.10.0'
-  pod 'FirebaseCrashlytics', '=8.10.0'
-  pod 'FirebaseCore','= 8.10.0'
-  pod 'FirebaseInAppMessaging', '= 8.8.0-beta'
-  pod 'FirebaseAnalytics', '= 8.10.0'
-  pod 'FirebasePerformance', '= 8.10.0'
-  pod 'FirebaseMessaging', '= 8.10.0'
-  pod 'Branch', '= 1.40.0'
   pod 'YoutubePlayer-in-WKWebView', '~> 0.3.8'
-  pod 'Segment-Appboy', '=4.3.0'
-
 end
 
 target 'edXTests' do
@@ -34,6 +36,18 @@ target 'edXTests' do
   pod 'OHHTTPStubs', '~> 4.0'
 end
 
+dynamic_frameworks = ['MSAL']
+
+pre_install do |installer|
+  installer.pod_targets.each do |pod|
+    if dynamic_frameworks.include?(pod.name)
+      def pod.build_type;
+        Pod::BuildType.new(:linkage => :dynamic, :packaging => :framework)
+      end
+    end
+  end
+end
+
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|