Merge head from appboy segment integration

CHANGELOG.md

@@ -1,9 +1,52 @@
+## 4.6.1
+
+**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
+
+#### Changed
+- Updated to [Braze iOS SDK 4.5.4+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#454).
+
+## 4.6.0
+
+**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
+
+#### Breaking
+- Updated to [Braze iOS SDK 4.5.1+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#451).
+
+#### Fixed
+- Fixed a bug where birthdays were not being logged properly from `identify` calls.
+
+#### Added
+- Adds `Other`, `Unknown`, `Not Applicable`, and `Prefer Not to Say` options for user gender.
+
+## 4.5.0
+
+**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
+
+#### Breaking
+- Updated to [Braze iOS SDK 4.4.1+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#441).
+
+## 4.4.0
+
+**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
+
+#### Breaking
+- Renames SPM packages to `AppboySegment` and `AppboySegmentCore` from `Full-SDK` and `Core`.
+  - In order to migrate, update the package and change import statements to `import AppboySegment` or `import AppboySegmentCore`.
+
+## 4.3.0
+
+**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
+
+#### Breaking
+- Updated to [Braze tvOS SDK 4.3.x](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#430).
+- A `track` call with event name `Completed Order` will now be treated as a purchase event for backwards compatibility with Segment eCommerce v1 API.
+
 ## 4.2.0
 
 **Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version.
 
 #### Breaking
-- Updated to [Braze iOS SDK 4.3.0](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#430).
+- Updated to [Braze iOS SDK 4.3.x](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#430).
 
 ## 4.1.0
 
@@ -49,7 +92,7 @@ And add the functionality to your `AppDelegate.m`:
   - Note that tvOS support is not available via Swift Package Manager for this release. 
   - 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/segment-ios.
+      - In the search bar, enter https://github.com/Appboy/appboy-segment-ios.
         - Select `Full-SDK` or `Core`, depending on your use case.
       - 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...`

CarthageExample/Cartfile.resolved

@@ -1,3 +1,3 @@
-binary "https://raw.githubusercontent.com/Appboy/appboy-segment-ios/master/Segment_Appboy.json" "3.3.0"
-github "appboy/appboy-ios-sdk" "3.27.0"
-github "segmentio/analytics-ios" "4.0.5"
+binary "https://raw.githubusercontent.com/Appboy/appboy-segment-ios/master/Segment_Appboy.json" "4.5.0"
+github "appboy/appboy-ios-sdk" "4.4.2"
+github "segmentio/analytics-ios" "4.1.6"

CocoaPodsTVOSExample/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - Analytics (4.1.3)
-  - Appboy-tvOS-SDK (3.27.0)
-  - Segment-Appboy/tvOS (3.6.1):
+  - Analytics (4.1.6)
+  - Appboy-tvOS-SDK (4.3.2)
+  - Segment-Appboy/tvOS (4.5.0):
     - Analytics
-    - Appboy-tvOS-SDK (~> 3.27.0)
+    - Appboy-tvOS-SDK (~> 4.3.0)
 
 DEPENDENCIES:
   - Analytics
@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Analytics: 4c01e3e19d4be86705bad6581a1c2aa5a15a9d22
-  Appboy-tvOS-SDK: 22993e5e47387695fe1ecec5177c16a55d427b12
-  Segment-Appboy: 5497f90416c09cfd603de1047c155e26a6cf4adb
+  Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc
+  Appboy-tvOS-SDK: f4e874c118474ebe0152c888191d22878d667df5
+  Segment-Appboy: 3ccf7ffd34701e11029e1d013e57eae0756a8eb1
 
 PODFILE CHECKSUM: 230825da8fa8732fc38070eef05987c5967046f4
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		061BC0680D461E3B23952D78 /* Pods_Segment_Appboy_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59FBC548877E32C15D404499 /* Pods_Segment_Appboy_Example.framework */; };
+		35C142FB277051674658B309 /* libPods-Segment-Appboy_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAA62634F643AF5267499188 /* libPods-Segment-Appboy_Example.a */; };
 		5D23953225D6CFA600DA929D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D23953125D6CFA600DA929D /* AppDelegate.m */; };
 		5D23953525D6CFA600DA929D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D23953425D6CFA600DA929D /* ViewController.m */; };
 		5D23953825D6CFA600DA929D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D23953625D6CFA600DA929D /* Main.storyboard */; };
@@ -17,7 +17,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		59FBC548877E32C15D404499 /* Pods_Segment_Appboy_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Appboy_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D23952D25D6CFA600DA929D /* Segment-Appboy_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Segment-Appboy_Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D23953025D6CFA600DA929D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		5D23953125D6CFA600DA929D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -30,14 +29,15 @@
 		5D23953F25D6CFAB00DA929D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		A4DD16D62D97ED29D6077DE5 /* Pods-Segment-Appboy_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Appboy_Example.release.xcconfig"; path = "Target Support Files/Pods-Segment-Appboy_Example/Pods-Segment-Appboy_Example.release.xcconfig"; sourceTree = "<group>"; };
 		E1B569F23E59A56EE361E93D /* Pods-Segment-Appboy_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Appboy_Example.debug.xcconfig"; path = "Target Support Files/Pods-Segment-Appboy_Example/Pods-Segment-Appboy_Example.debug.xcconfig"; sourceTree = "<group>"; };
+		EAA62634F643AF5267499188 /* libPods-Segment-Appboy_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Segment-Appboy_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		5D23952A25D6CFA600DA929D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				061BC0680D461E3B23952D78 /* Pods_Segment_Appboy_Example.framework in Frameworks */,
+				35C142FB277051674658B309 /* libPods-Segment-Appboy_Example.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -81,7 +81,7 @@
 		A0F9256B8A1EE9C85F010D22 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				59FBC548877E32C15D404499 /* Pods_Segment_Appboy_Example.framework */,
+				EAA62634F643AF5267499188 /* libPods-Segment-Appboy_Example.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -355,7 +355,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 9JGP78W4NA;
+				DEVELOPMENT_TEAM = 5GLZKGNWQ3;
 				INFOPLIST_FILE = "Segment-Appboy_Example/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -378,7 +378,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 9JGP78W4NA;
+				DEVELOPMENT_TEAM = 5GLZKGNWQ3;
 				INFOPLIST_FILE = "Segment-Appboy_Example/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

CocoaPodsTVOSExample/Segment-Appboy_Example/Info.plist

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Appboy</key>
+	<key>Braze</key>
 	<dict>
 		<key>LogLevel</key>
 		<string>0</string>

CocoapodsExample/Segment-Appboy.xcodeproj/project.pbxproj

@@ -251,6 +251,7 @@
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
 						DevelopmentTeam = 5GLZKGNWQ3;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -261,6 +262,7 @@
 						};
 					};
 					6003F5AD195388D20070C39A = {
+						ProvisioningStyle = Automatic;
 						TestTargetID = 6003F589195388D20070C39A;
 					};
 				};
@@ -571,18 +573,19 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = "Segment-Appboy_Example.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer: Appboy Appboy (QWFN3H2ZPW)";
-				DEVELOPMENT_TEAM = 5GLZKGNWQ3;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Segment-Appboy/Segment-Appboy-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.appboy.SegmentSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "$(sigh_com.appboy.SegmentSample_development)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -594,19 +597,19 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = "Segment-Appboy_Example.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Appboy Inc. (5GLZKGNWQ3)";
-				DEVELOPMENT_TEAM = 5GLZKGNWQ3;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Segment-Appboy/Segment-Appboy-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.appboy.SegmentSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "2af4d04c-d8ec-4398-a825-442e3060fa08";
-				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc com.appboy.SegmentSample";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -616,6 +619,10 @@
 			baseConfigurationReference = 27DBD57E45C0D4DEADCB5EAA /* Pods-Segment-Appboy_Tests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
@@ -625,6 +632,8 @@
 				);
 				INFOPLIST_FILE = "Tests/Tests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Segment-Appboy_Example.app/Segment-Appboy_Example";
 				WRAPPER_EXTENSION = xctest;
 			};
@@ -635,11 +644,17 @@
 			baseConfigurationReference = F098DD1A877DE2E944D7137E /* Pods-Segment-Appboy_Tests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
 				INFOPLIST_FILE = "Tests/Tests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Segment-Appboy_Example.app/Segment-Appboy_Example";
 				WRAPPER_EXTENSION = xctest;
 			};

CocoapodsExample/Segment-Appboy/SEGViewController.m

@@ -49,10 +49,10 @@ - (IBAction)identifyButtonPress:(id)sender {
                                               @"integerAttribute" : @(integerAttribute),
                                               @"floatAttribute" : @(floatAttribute),
                                               @"shortAttribute" : @(shortAttribute),
-                                              //@"dateAttribute" : dateAttribute,
+                                              @"dateAttribute" : dateAttribute,
                                               @"arrayAttribute" : @[@"one", @"two", @"three"],
                                               @"gender" : @"female",
-                                              //@"birthday" : [NSDate dateWithTimeIntervalSince1970:564559200],
+                                              @"birthday" : [NSDate dateWithTimeIntervalSince1970:564559200],
                                               @"firstName" : @"Appboy",
                                               @"lastName" : @"Appboy",
                                               @"phone" : @"1234567890",

CocoapodsExample/Segment-Appboy/Segment-Appboy-Info.plist

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Appboy</key>
+	<key>Braze</key>
 	<dict>
 		<key>LogLevel</key>
 		<string>0</string>

CocoapodsExample/Tests/SEGAppboyIntegrationFactoryTest.m

@@ -2,7 +2,7 @@
 #import "SEGAppboyIntegration.h"
 #import "AppboyKit.h"
 #import <OCMock/OCMock.h>
-#import <Analytics/SEGIntegration.h>
+#import <Segment/SEGIntegration.h>
 #import "SEGAnalyticsUtils.h"
 
 SpecBegin(SEGAppboyIntegrationFactory)