Prepare for release 2.0.2

CHANGELOG.md

@@ -1,45 +1,49 @@
+## 2.0.2
+* Supports analytics-ios 3.+ and Braze 3.10.0+.
+* Fixes a potential race condition when calling `identify`.
+
 ## 2.0.1
-* Supports analytics-ios 3.+ and Appboy 3.1.0+
-* Fixes an issue for those using `use_frameworks!` in their Podfile
+* Supports analytics-ios 3.+ and Braze 3.1.0+.
+* Fixes an issue for those using `use_frameworks!` in their Podfile.
 
 ## 2.0.0
-* Supports analytics-ios 3.+ and Appboy 3.0.0+
+* Supports analytics-ios 3.+ and Braze 3.0.0+.
 * Adds support for custom attribute values with array types.
 * Adds support for purchase revenue with NSNumber type.
 * Adds support for custom endpoints which can be set on the Segment dashboard.
 
 ## 1.0.7
-* Supports analytics-ios 3.+ and Appboy 2.30.0+
+* Supports analytics-ios 3.+ and Braze 2.30.0+.
 * Fixes an issue where install attribution data was being sent up as an event.
 
 ## 1.0.6
 * Updates the wrapper SDK to work with Xcode 9 beta 2.
 
 ## 1.0.5
-* Supports analytics-ios 3.+ and Appboy 2.29.0+
+* Supports analytics-ios 3.+ and Braze 2.29.0+.
 * Adds support for custom attribute values with date types.
 
 ## 1.0.4
-* Supports analytics-ios 3.+ and Appboy 2.21.0+
+* Supports analytics-ios 3.+ and Braze 2.21.0+.
 * Updates the wrapper SDK to work with the Cocoapod 1.0.x.
 
 ## 1.0.3
-* Supports analytics-ios 3.+ and Appboy 2.20.1+
+* Supports analytics-ios 3.+ and Braze 2.20.1+.
 * Updates the Podspec to use analytics-ios with the latest 3.x version.
 
 ## 1.0.2
-* Supports analytics-ios 3.0.+ and Appboy 2.19.1+
+* Supports analytics-ios 3.0.+ and Braze 2.19.1+.
 * Adds support for custom attribute values with short, long, and float types.
 * Modifies `SEGAppboyIntegrationFactory`'s `instance` method to return an `instancetype` for simpler Swift integration.
 
 ## 1.0.1
-* Supports analytics-ios 3.0.+ and Appboy 2.18.2+
+* Supports analytics-ios 3.0.+ and Braze 2.18.2+.
 * Fixes an issue where calling `changeUser:` would sporadically result in deadlock.
 
 ## 1.0.0
-* Supports analytics-ios 3.0.+ and Appboy 2.18.2+
+* Supports analytics-ios 3.0.+ and Braze 2.18.2+.
 * Initial release with push support.
 
 ## 1.0.0-alpha
-* Supports analytics-ios 3.0.+ and Appboy 2.15.+
+* Supports analytics-ios 3.0.+ and Braze 2.15.+.
 * Initial alpha release.

Example/Segment-Appboy.xcodeproj/project.pbxproj

@@ -206,7 +206,6 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				D3665A2A329991C788AD855F /* [CP] Embed Pods Frameworks */,
-				B7D8B7B344BC559F45D51EE6 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -226,7 +225,6 @@
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
 				8C97F5D383595BA7C234BB82 /* [CP] Embed Pods Frameworks */,
-				B7FF83C7C1E793F4BF195D61 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -356,36 +354,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Tests/Pods-Segment-Appboy_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B7D8B7B344BC559F45D51EE6 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Example/Pods-Segment-Appboy_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B7FF83C7C1E793F4BF195D61 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Tests/Pods-Segment-Appboy_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		D3665A2A329991C788AD855F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Example/Segment-Appboy.xcodeproj/xcshareddata/xcschemes/Segment-Appboy-Example.xcscheme

@@ -74,7 +74,6 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
-            value = "disable"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

Example/Segment-Appboy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/Segment-Appboy/SEGViewController.m

@@ -2,6 +2,7 @@
 #import "SEGAnalytics.h"
 #import "AppboyKit.h"
 #import "ABKModalFeedbackViewController.h"
+#import "ABKNewsFeedViewController.h"
 
 @interface SEGViewController ()
 
@@ -95,9 +96,8 @@ - (IBAction)feedbackButtonPress:(id)sender {
 - (IBAction)feedButtonPress:(id)sender {
   if ([Appboy sharedInstance] != nil) {
     // gate Appboy functionality based on [Appboy sharedInstance].
-    ABKFeedViewControllerModalContext *feedModal = [[ABKFeedViewControllerModalContext alloc] init];
-    feedModal.navigationItem.title = @"Modal Context";
-    [self presentViewController:feedModal animated:YES completion:nil];
+    ABKNewsFeedViewController *newsFeed = [[ABKNewsFeedViewController alloc] init];
+    [self.navigationController presentViewController:newsFeed animated:YES completion:nil];
   }
 }
 @end

Example/Segment-Appboy/Segment-Appboy-Info.plist

@@ -2,6 +2,11 @@
 <!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>
+	<dict>
+		<key>LogLevel</key>
+		<string>0</string>
+	</dict>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Please share your location.</string>
 	<key>CFBundleDevelopmentRegion</key>

Pod/Classes/SEGAppboyIntegration.m

@@ -70,22 +70,16 @@ - (id)initWithSettings:(NSDictionary *)settings
 
 - (void)identify:(SEGIdentifyPayload *)payload
 {
+  if (![NSThread isMainThread]) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self identify:payload];
+    });
+    return;
+  }
   // Ensure that the userID is set and valid (i.e. a non-empty string).
   if (payload.userId != nil && [payload.userId length] != 0) {
-    // `changeUser:` should always be called in the main thread. If we are already in the main thread,
-    // calling dispatch_sync will cause hanging.
-    if ([NSThread isMainThread]) {
-      [[Appboy sharedInstance] changeUser:payload.userId];
-      SEGLog(@"[[Appboy sharedInstance] changeUser:%@]", payload.userId);
-    } else {
-      // Note: this must be async because segmentio synchronizes in forwardSelector - if identify is called from a different thread
-      // and then forwardSelector is called, we can get into deadlock where the forwardSelector on the main thread is waiting
-      // for the SEGAnalytics class lock and a separate call has it and is waiting here for the main thread.
-      dispatch_async(dispatch_get_main_queue(), ^{
-        [[Appboy sharedInstance] changeUser:payload.userId];
-        SEGLog(@"[[Appboy sharedInstance] changeUser:%@]", payload.userId);
-      });
-    }
+    [[Appboy sharedInstance] changeUser:payload.userId];
+    SEGLog(@"[[Appboy sharedInstance] changeUser:%@]", payload.userId);
   }
 
   if ([payload.traits[@"birthday"] isKindOfClass:[NSString class]]) {

Segment-Appboy.podspec

@@ -1,20 +1,20 @@
 Pod::Spec.new do |s|
   s.name             = "Segment-Appboy"
-  s.version          = "2.0.1"
-  s.summary          = "Appboy Integration for Segment's analytics-ios library."
+  s.version          = "2.0.2"
+  s.summary          = "Braze Integration for Segment's analytics-ios library."
 
   s.description      = <<-DESC
                        Analytics for iOS provides a single API that lets you
                        integrate with over 100s of tools.
 
-                       This is the Appboy integration for the iOS library.
+                       This is the Braze integration for the iOS library.
                        DESC
 
   s.homepage         = "https://github.com/appboy/appboy-segment-ios"
   s.license          =  { :type => 'MIT' }
-  s.author           = { "Appboy" => "hello@appboy.com" }
+  s.author           = { "Appboy" => "hello@braze.com" }
   s.source           = { :git => "https://github.com/appboy/appboy-segment-ios.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/appboy'
+  s.social_media_url = 'https://twitter.com/Braze'
 
   s.platform     = :ios, '8.0'
   s.requires_arc = true