Bump Segment version to 4.1.8 and Firebase to 11.1.0

.circleci/config.yml

@@ -3,15 +3,15 @@ version: 2
 jobs:
   build_and_test:
     macos:
-      xcode: "12.0"
+      xcode: "15.4"
     steps:
       - checkout
       - run: xcrun simctl list
       - run:
           name: Install build dependencies
           command: |
             sudo gem install xcpretty
-            sudo gem install cocoapods -v 1.10.0
+            sudo gem install cocoapods -v 1.15.2
       - run:
           name: Fetch Cocoapods specs
           command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf

.gitignore

@@ -32,3 +32,5 @@ Carthage
 #
 Pods/
 .clang-format
+
+.build/

Example/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '11.0'
+platform :ios, '13.0'
 
 use_frameworks!
 

Example/Podfile.lock

@@ -1,101 +1,109 @@
 PODS:
-  - Analytics (4.1.6)
+  - Analytics (4.1.8)
   - Expecta (1.0.6)
-  - Firebase (10.6.0):
-    - Firebase/Core (= 10.6.0)
-  - Firebase/Core (10.6.0):
+  - Firebase (11.1.0):
+    - Firebase/Core (= 11.1.0)
+  - Firebase/Core (11.1.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 10.6.0)
-  - Firebase/CoreOnly (10.6.0):
-    - FirebaseCore (= 10.6.0)
-  - FirebaseAnalytics (10.6.0):
-    - FirebaseAnalytics/AdIdSupport (= 10.6.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (10.6.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleAppMeasurement (= 10.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseCore (10.6.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.6.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.6.0):
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.1)
-  - GoogleAppMeasurement (10.6.0):
-    - GoogleAppMeasurement/AdIdSupport (= 10.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.6.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.6.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.0):
+    - FirebaseAnalytics (~> 11.1.0)
+  - Firebase/CoreOnly (11.1.0):
+    - FirebaseCore (= 11.1.0)
+  - FirebaseAnalytics (11.1.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.1.0)
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/AdIdSupport (11.1.0):
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleAppMeasurement (= 11.1.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseCore (11.1.0):
+    - FirebaseCoreInternal (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreInternal (11.1.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseInstallations (11.1.0):
+    - FirebaseCore (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleAppMeasurement (11.1.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.1.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/AdIdSupport (11.1.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.1.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.1.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.0):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.0.2):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.0.2):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.11.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.0.2):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.11.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.0.2):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.0)"
-  - GoogleUtilities/Reachability (7.11.0):
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
-  - OCHamcrest (8.0.0)
-  - OCMockito (6.0.0):
-    - OCHamcrest (~> 8.0)
-  - PromisesObjC (2.2.0)
-  - Segment-Firebase (2.7.12):
+    - GoogleUtilities/Privacy
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - OCHamcrest (9.0.3)
+  - OCMockito (7.0.2):
+    - OCHamcrest (~> 9.0)
+  - PromisesObjC (2.4.0)
+  - Segment-Firebase (2.7.14):
     - Analytics
-    - Firebase (~> 10.6.0)
-    - Firebase/Core (~> 10.6.0)
-    - FirebaseAnalytics (~> 10.6.0)
-    - Segment-Firebase/Core (= 2.7.12)
-  - Segment-Firebase/Core (2.7.12):
+    - Firebase (~> 11.1.0)
+    - Firebase/Core (~> 11.1.0)
+    - FirebaseAnalytics (~> 11.1.0)
+    - Segment-Firebase/Core (= 2.7.14)
+  - Segment-Firebase/Core (2.7.14):
     - Analytics
-    - Firebase (~> 10.6.0)
-    - Firebase/Core (~> 10.6.0)
-    - FirebaseAnalytics (~> 10.6.0)
+    - Firebase (~> 11.1.0)
+    - Firebase/Core (~> 11.1.0)
+    - FirebaseAnalytics (~> 11.1.0)
   - Specta (2.0.0)
 
 DEPENDENCIES:
@@ -126,22 +134,22 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc
+  Analytics: 9655e0e1c71ea98107cfcb2b14891168acc6c6c9
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
-  Firebase: f13680471b021937f2230ea8503c7809d8c29806
-  FirebaseAnalytics: 9f382605c5ee412b039212f054bf7a403d9850c1
-  FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4
-  FirebaseCoreInternal: c7cd505e2136811096b225ac388d6254a2622362
-  FirebaseInstallations: 13dde135fa0524e15bddb133ccc8465c53a1b3f3
-  GoogleAppMeasurement: 686b48c3c895f3c55c70719041913d5d150b74f6
-  GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5
-  OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b
-  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  Segment-Firebase: 51000eb031fd9b990fb79c9a38ad5d73cebd4f9c
+  Firebase: fdb3bd378401f26a7adfcf446b0a630f8c20c0e8
+  FirebaseAnalytics: 9fcdb2e9844174bb405b34cc47092c9b91993d83
+  FirebaseCore: 6e2a2782e234b14d48e880ed369ac55cda87fed7
+  FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c
+  FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57
+  GoogleAppMeasurement: 8bb20efc67c8fc1cff9c42a06c256caf55289bbf
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  OCHamcrest: f8185bd5d90c25317e36856f079e43ef8b84b02d
+  OCMockito: 6e00e5d888305c3631928e0137853be8877352c1
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  Segment-Firebase: e447a05a4d1c59a128826df037c4414788a05c92
   Specta: b79d84043684b35ffdc2680df578dc318ec2efc2
 
-PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30
+PODFILE CHECKSUM: 6cf4dd0f3db20a564a64fa091a6c42d0fc7df1b1
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2

Example/Segment-Firebase.xcodeproj/project.pbxproj

@@ -63,7 +63,7 @@
 		7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Tests.debug.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Tests/Pods-Segment-Firebase_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		9301B7DB964FA80B7500923D /* Pods-Segment-Firebase_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Example.debug.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Example/Pods-Segment-Firebase_Example.debug.xcconfig"; sourceTree = "<group>"; };
-		D7E7ACFD02F7E6AD4828D86C /* Segment-Firebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Segment-Firebase.podspec"; path = "../Segment-Firebase.podspec"; sourceTree = "<group>"; };
+		D7E7ACFD02F7E6AD4828D86C /* Segment-Firebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Segment-Firebase.podspec"; path = "../Segment-Firebase.podspec"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Tests.release.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Tests/Pods-Segment-Firebase_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		E01872888A825206BE6BED4C /* Pods_Segment_Firebase_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Firebase_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E406BCE490DBD09282372A92 /* Pods_Segment_Firebase_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Firebase_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -103,7 +103,6 @@
 				7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */,
 				DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -249,7 +248,11 @@
 				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = wcjohnson11;
 				TargetAttributes = {
+					6003F589195388D20070C39A = {
+						DevelopmentTeam = 4VKSL5HV39;
+					};
 					6003F5AD195388D20070C39A = {
+						DevelopmentTeam = 4VKSL5HV39;
 						TestTargetID = 6003F589195388D20070C39A;
 					};
 				};
@@ -526,10 +529,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 4VKSL5HV39;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Segment-Firebase/Segment-Firebase-Prefix.pch";
 				INFOPLIST_FILE = "Segment-Firebase/Segment-Firebase-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$PODS_CONFIGURATION_BUILD_DIR/Analytics\"",
@@ -549,10 +554,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 4VKSL5HV39;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Segment-Firebase/Segment-Firebase-Prefix.pch";
 				INFOPLIST_FILE = "Segment-Firebase/Segment-Firebase-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -565,6 +572,8 @@
 			baseConfigurationReference = 7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				DEVELOPMENT_TEAM = 4VKSL5HV39;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -589,6 +598,8 @@
 			baseConfigurationReference = DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				DEVELOPMENT_TEAM = 4VKSL5HV39;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",

Example/Tests/Tests.m

@@ -384,7 +384,7 @@
             integrations:@{}];
 
         [integration track:payload];
-        [verify(mockFirebase) logEventWithName:@"present_offer" parameters:@{
+        [verify(mockFirebase) logEventWithName:@"view_promotion" parameters:@{
             @"item_id" : @"507f1f77bcf86cd799439011",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly 3rd Edition",
@@ -425,7 +425,7 @@
             integrations:@{}];
 
         [integration track:payload];
-        [verify(mockFirebase) logEventWithName:@"purchase_refund" parameters:@{
+        [verify(mockFirebase) logEventWithName:@"refund" parameters:@{
             @"transaction_id" : @"50314b8e9bcf000000000000"
         }];
     });

Makefile

@@ -1,5 +1,5 @@
 SDK ?= "iphonesimulator"
-DESTINATION ?= "platform=iOS Simulator,name=iPhone 8"
+DESTINATION ?= "platform=iOS Simulator,name=iPhone 15 Pro"
 PROJECT := Segment-Firebase
 XC_ARGS := -scheme $(PROJECT)-Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO