Merge branch 'stable'

# Conflicts:
#	README.md
#	sample-apps/objc-sample-app/objc-sample-app/AppDelegate.m

Author: tapashmajumder

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode10.2
+osx_image: xcode10
 language: swift
 
 before_install:

README.md

@@ -106,7 +106,7 @@ See the Iterable guide on how to setup your Iterable push integration and obtain
 	
 ### 3. Set userId or email. 
 Once you know the email or userId of the user, set the value.
-
+> ⚠ Don't specify both email and userId in the same session, as they will be treated as different users by the SDK. Only use one type of identifier, email or userId, to identify the user.
 *Swift*
 	
 ```swift
@@ -417,7 +417,7 @@ To do this, Iterable sends a silent push notification some time (currently, twel
 
 # Rich Push Notifications
 
-Push notifications may contain media attachments with images, animated gifs or video, and with an upcoming update, there will be a way to create action buttons. For this to work within your app, you need to create a Notification Service Extension. More instructions here: [Rich Push Notifications in iOS 10 and Android - Media Attachments](https://support.iterable.com/hc/en-us/articles/115003982203-Rich-Push-Notifications-in-iOS-10-and-Android-Media-Attachments).   
+Push notifications may contain media attachments with images, animated gifs or video, and action buttons. For this to work within your app, you need to create a Notification Service Extension. More instructions here: [Rich Push Notifications in iOS 10 and Android - Media Attachments](https://support.iterable.com/hc/en-us/articles/115003982203-Rich-Push-Notifications-in-iOS-10-and-Android-Media-Attachments).   
 
 Iterable SDK provides an implementation that handles media attachments and action buttons. 
 

sample-apps/objc-sample-app/Podfile

@@ -2,12 +2,11 @@ platform :ios, '11.0'
 
 # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
 use_frameworks!
-swift_version = '4.0'
 
 target 'objc-sample-app' do
-  pod 'Iterable-iOS-SDK', :path => '../../../swift-sdk'
+  pod 'Iterable-iOS-SDK'
 end
 
 target 'objc-sample-app-notification-extension' do
-  pod 'Iterable-iOS-AppExtensions', :path => '../../../swift-sdk'
+  pod 'Iterable-iOS-AppExtensions'
 end

sample-apps/objc-sample-app/objc-sample-app.xcodeproj/project.pbxproj

@@ -353,7 +353,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-objc-sample-app/Pods-objc-sample-app-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-objc-sample-app/Pods-objc-sample-app-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Iterable-iOS-SDK/IterableSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/Iterable-iOS-AppExtensions/IterableAppExtensions.framework",
 			);
@@ -364,7 +364,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-objc-sample-app/Pods-objc-sample-app-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-objc-sample-app/Pods-objc-sample-app-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		459DDAFDFA23308D87287385 /* [CP] Check Pods Manifest.lock */ = {

sample-apps/objc-sample-app/objc-sample-app/AppDelegate.m

@@ -98,7 +98,6 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 
 #pragma mark - Url handling
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
-
     //ITBL:
     NSURL *url = userActivity.webpageURL;
     if (url == nil) {

sample-apps/swift-sample-app/swift-sample-app.xcodeproj/project.pbxproj

@@ -322,7 +322,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-swift-sample-app/Pods-swift-sample-app-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-swift-sample-app/Pods-swift-sample-app-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Iterable-iOS-SDK/IterableSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/Iterable-iOS-AppExtensions/IterableAppExtensions.framework",
 			);
@@ -333,7 +333,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-swift-sample-app/Pods-swift-sample-app-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-swift-sample-app/Pods-swift-sample-app-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		37DFA1A5B0E68594B76BF513 /* [CP] Check Pods Manifest.lock */ = {

scripts/build-target-module-framework.sh

@@ -19,8 +19,8 @@ UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal
 mkdir -p "${UNIVERSAL_OUTPUTFOLDER}"
 
 # Step 1. Build Device and Simulator versions
-xcodebuild -target "${TARGET}" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos  BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_DIR}" clean build
-xcodebuild -target "${TARGET}" -configuration ${CONFIGURATION} -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_DIR}" clean build
+xcodebuild -target "${TARGET}" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos  BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_DIR}" BITCODE_GENERATION_MODE=bitcode clean build 
+xcodebuild -target "${TARGET}" -configuration ${CONFIGURATION} -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_DIR}" BITCODE_GENERATION_MODE=bitcode clean build
 
 # Step 2. Copy the framework structure (from iphoneos build) to the universal folder
 cp -R "${BUILD_DIR}/${CONFIGURATION}-iphoneos/${MODULE_NAME}.framework" "${UNIVERSAL_OUTPUTFOLDER}/"