Merge branch 'master' into jae/samples

Author: thomaszurkan-optimizely

.travis.yml

@@ -1,45 +1,69 @@
-language: swift
-osx_image: xcode10.1
-branches:
-  only:
-    - master
-env:
-  matrix:
-    - SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air'
-    - SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7 Plus'
-    - SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.3.1 NAME='iPhone 7'
-    - SCHEME=OptimizelySwiftSDK-tvOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'
-before_install: 
-  - gem install slather --no-document --quiet 
-install: pod install --repo-update
-addons:
-  srcclr: true
-script:
-  - pod spec lint --quick
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -workspace OptimizelySDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES > buildoutput; fi
-  - more buildoutput | xcpretty
-after_success:
-  - slather
-  - sleep 5 # https://github.com/travis-ci/travis-ci/issues/4725
+language: minimal
+os: linux
 
 # Integration tests need to run first to reset the PR build status to pending
 stages:
-  - 'Integration tests'
-  - 'Test'
+  - name: 'Trigger Integration Tests'
+    if: env(RUN_COMPAT_SUITE) = true
+  - name: 'SourceClear and Lint'
+  - name: 'Unit Tests'
+  - name: 'Prepare for release'
+    if: env(PREP) = true and type = api
+  - name: 'Release'
+    if: env(RELEASE) = true and type = api
 
 jobs:
   include:
-    - stage: 'Integration tests'
-      if: env(RUN_COMPAT_SUITE) = true
+    - stage: 'Trigger Integration Tests'
+      language: minimal
+      os: linux
       env:
         - SDK=swift
         - BUILD_NUMBER=$TRAVIS_BUILD_NUMBER
         - TESTAPP_TAG=master
       cache: false
-      language: minimal
-      os: linux
       install:
         - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd
       script:
         - "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-sdk-compat.sh"
-      after_success: travis_terminate 0
+
+    - stage: 'SourceClear and Lint'
+      language: swift
+      os: osx
+      osx_image: xcode10.1
+      addons:
+        srcclr: true
+      install: gem install cocoapods
+      script:
+        - pod spec lint --quick
+
+    - &unittests
+      stage: 'Unit Tests'
+      language: swift
+      os: osx
+      osx_image: xcode10.1
+      branches:
+        only:
+          - master
+      env: SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air'
+      name: PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air'
+      before_install:
+        - gem install slather --no-document --quiet
+      install:
+        - pod install --repo-update
+      script:
+        - pod spec lint --quick
+        - if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -workspace OptimizelySDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES > buildoutput; fi
+        - cat buildoutput | xcpretty
+      after_success:
+        - slather
+        - sleep 5 # https://github.com/travis-ci/travis-ci/issues/4725
+    - <<: *unittests
+      env: SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7 Plus'
+      name: PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7 Plus'
+    - <<: *unittests
+      env: SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.3.1 NAME='iPhone 7'
+      name: PLATFORM='iOS Simulator' OS=10.3.1 NAME='iPhone 7'
+    - <<: *unittests
+      env: SCHEME=OptimizelySwiftSDK-tvOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'
+      name: PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'

DemoObjCApp/AppDelegate.m

@@ -16,7 +16,6 @@
 
 #import "AppDelegate.h"
 #import "VariationViewController.h"
-#import "FailureViewController.h"
 #import "CustomLogger.h"
 #import "SamplesForAPI.h"
 
@@ -40,14 +39,10 @@ @interface AppDelegate ()
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // most of the third-party integrations only support iOS, so the sample code is only targeted for iOS builds
-    #if TARGET_OS_IOS
-    
-    #endif
-    
-    self.userId = [NSString stringWithFormat:@"%d", arc4random()];
-    self.attributes = @{ @"browser_type": @"safari", @"bool_attr": @(false) };
 
+    self.userId = [NSString stringWithFormat:@"%d", arc4random_uniform(300000)];
+    self.attributes = @{ @"browser_type": @"safari" };
+
     // initialize SDK in one of these two ways:
     // (1) asynchronous SDK initialization (RECOMMENDED)
     //     - fetch a JSON datafile from the server
@@ -70,7 +65,6 @@ -(void)initializeOptimizelySDKAsynchronous {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
             NSLog(@"Optimizely SDK initiliazation failed: %@", error.localizedDescription);
-            self.optimizely = nil;
         }
 
         [self startWithRootViewController];
@@ -81,7 +75,6 @@ -(void)initializeOptimizelySDKSynchronous {
     NSString *localDatafilePath = [[NSBundle mainBundle] pathForResource:kOptimizelyDatafileName ofType:@"json"];
     if (localDatafilePath == nil) {
         NSAssert(false, @"Local datafile cannot be found");
-        self.optimizely = nil;
         return;
     }
 
@@ -91,15 +84,13 @@ -(void)initializeOptimizelySDKSynchronous {
 
     if (datafileJSON == nil) {
         NSLog(@"Invalid JSON format");
-        self.optimizely = nil;
     } else {
         NSError *error;
         BOOL status = [self.optimizely startWithDatafile:datafileJSON error:&error];
         if (status) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
             NSLog(@"Optimizely SDK initiliazation failed: %@", error.localizedDescription);
-            self.optimizely = nil;
         }
     }
 
@@ -134,8 +125,13 @@ -(void)initializeOptimizelySDKWithCustomization {
                                                                                                   NSDictionary<NSString *,id> *attributes, NSDictionary<NSString *,id> *eventTags, NSDictionary<NSString *,id> *event) {
         NSLog(@"Received track notification: %@ %@ %@ %@ %@", eventKey, userId, attributes, eventTags, event);
 
+
 #if TARGET_OS_IOS
+        // most of the third-party integrations only support iOS, so the sample code is only targeted for iOS builds
+
         // Amplitude example
+        [Amplitude.instance initializeApiKey:@"YOUR_API_KEY_HERE"];
+
         NSString *propertyKey = [NSString stringWithFormat:@"[Optimizely] %@", eventKey];
         AMPIdentify *identify = [[AMPIdentify alloc] init];
         [identify set:propertyKey value:userId];
@@ -150,7 +146,6 @@ -(void)initializeOptimizelySDKWithCustomization {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
             NSLog(@"Optimizely SDK initiliazation failed: %@", error.localizedDescription);
-            self.optimizely = nil;
         }
 
         [self startWithRootViewController];
@@ -168,7 +163,7 @@ -(void)startWithRootViewController {
                                                                      userId:self.userId
                                                                  attributes:self.attributes
                                                                       error:&error];
-        
+
         if (variationKey != nil) {
             [self openVariationViewWithVariationKey:variationKey];
         } else {

DemoObjCApp/DemoObjcApp.xcodeproj/project.pbxproj

@@ -25,11 +25,7 @@
 		6E9681B221EEA3D8009B7FEC /* ProximaNova-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6E9681A921EEA3D8009B7FEC /* ProximaNova-Regular.otf */; };
 		6E9681B321EEA3D8009B7FEC /* ProximaNova-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6E9681A921EEA3D8009B7FEC /* ProximaNova-Regular.otf */; };
 		6E9681BA21EEB361009B7FEC /* VariationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456521EE5DE3005346CC /* VariationViewController.m */; };
-		6E9681BB21EEB361009B7FEC /* FailureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456721EE5DE3005346CC /* FailureViewController.m */; };
-		6E9681BC21EEB361009B7FEC /* SplashScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456921EE5DE3005346CC /* SplashScreenViewController.m */; };
 		6E9681BD21EEB364009B7FEC /* VariationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456521EE5DE3005346CC /* VariationViewController.m */; };
-		6E9681BE21EEB364009B7FEC /* FailureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456721EE5DE3005346CC /* FailureViewController.m */; };
-		6E9681BF21EEB364009B7FEC /* SplashScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456921EE5DE3005346CC /* SplashScreenViewController.m */; };
 		6E9681D821EFA5B2009B7FEC /* CustomLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E9681D721EFA5B2009B7FEC /* CustomLogger.m */; };
 		6E9681D921EFA5B2009B7FEC /* CustomLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E9681D721EFA5B2009B7FEC /* CustomLogger.m */; };
 		6EB8456B21EE5DE3005346CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456421EE5DE3005346CC /* AppDelegate.m */; };
@@ -180,13 +176,9 @@
 		6E9681A921EEA3D8009B7FEC /* ProximaNova-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ProximaNova-Regular.otf"; sourceTree = "<group>"; };
 		6E9681D421EFA5B2009B7FEC /* CustomLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomLogger.h; sourceTree = "<group>"; };
 		6E9681D721EFA5B2009B7FEC /* CustomLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomLogger.m; sourceTree = "<group>"; };
-		6EB8456321EE5DE3005346CC /* SplashScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplashScreenViewController.h; sourceTree = "<group>"; };
 		6EB8456421EE5DE3005346CC /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		6EB8456521EE5DE3005346CC /* VariationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VariationViewController.m; sourceTree = "<group>"; };
 		6EB8456621EE5DE3005346CC /* VariationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariationViewController.h; sourceTree = "<group>"; };
-		6EB8456721EE5DE3005346CC /* FailureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FailureViewController.m; sourceTree = "<group>"; };
-		6EB8456821EE5DE3005346CC /* FailureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FailureViewController.h; sourceTree = "<group>"; };
-		6EB8456921EE5DE3005346CC /* SplashScreenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashScreenViewController.m; sourceTree = "<group>"; };
 		6EB8456A21EE5DE3005346CC /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		6EF7498E21E404BB008B22A0 /* DemoObjciOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoObjciOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6EF7499F21E404BC008B22A0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -311,10 +303,6 @@
 				6EB8456421EE5DE3005346CC /* AppDelegate.m */,
 				6EB8456621EE5DE3005346CC /* VariationViewController.h */,
 				6EB8456521EE5DE3005346CC /* VariationViewController.m */,
-				6EB8456821EE5DE3005346CC /* FailureViewController.h */,
-				6EB8456721EE5DE3005346CC /* FailureViewController.m */,
-				6EB8456321EE5DE3005346CC /* SplashScreenViewController.h */,
-				6EB8456921EE5DE3005346CC /* SplashScreenViewController.m */,
 				6E96812021EE957B009B7FEC /* Customization */,
 				6EFA322A227CDDF0006FA572 /* Samples */,
 				6E96817721EEA321009B7FEC /* DemoObjciOS */,
@@ -654,10 +642,9 @@
 				6E9681BA21EEB361009B7FEC /* VariationViewController.m in Sources */,
 				6EB8456B21EE5DE3005346CC /* AppDelegate.m in Sources */,
 				6E9681D821EFA5B2009B7FEC /* CustomLogger.m in Sources */,
+
 				6EFA3206227CD55E006FA572 /* SamplesForAPI.m in Sources */,
-				6E9681BB21EEB361009B7FEC /* FailureViewController.m in Sources */,
 				6E4DD7F721E51E5500B0C2C7 /* main.m in Sources */,
-				6E9681BC21EEB361009B7FEC /* SplashScreenViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -669,9 +656,7 @@
 				6EB8456C21EE5DE3005346CC /* AppDelegate.m in Sources */,
 				6E9681D921EFA5B2009B7FEC /* CustomLogger.m in Sources */,
 				6EFA3207227CD55E006FA572 /* SamplesForAPI.m in Sources */,
-				6E9681BE21EEB364009B7FEC /* FailureViewController.m in Sources */,
 				6E4DD7F821E51E5600B0C2C7 /* main.m in Sources */,
-				6E9681BF21EEB364009B7FEC /* SplashScreenViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};