Release 2.0.2-beta2 (#273)

* revert get enabled features sorted (#229)

* coveralls code coverage (#221)

* coveralls added
* enable code coverage

* add style guide (#233)

* data file CDN url changed (#234)

* example to show folio3 how to refactor code (#238)

* example to show folio3 how to refactor code

* write failing test

* fix single quote test

* get record id to attach with event to remove

* fix for TVOS events removal

* Remedying Xcode 9.2 compiler warnings in unit tests (#244)

* use new notification listeners (#243)

* use new notification listeners

* fix TVOS errors and rename notification listener methods that were incorrect

* Kroach/oasis 2519 release20 master (#246)

* Release iOS 2.0.0-beta1 (#230)

* Bump version number to 2.2.0-beta1

* Remove unused Beta and RC XCBuildConfiguration's

* Update workspace *.xcscheme's and *.pbxproj to Xcode 9.2 recommended settings

* Remove static library 'Pods...' from tvOS demo app's Embedded Binaries

* CURRENT_PROJECT_VERSION's can't have version suffixes like '-beta1'

* Additional OptimizelyTVOSDemoApp images required for App Store 'Validation...'

* unexported_symbols.txt update

* Update release.sh

* Rebuild universal frameworks

* CHANGELOG.md update

* Major release.sh overhaul. + Conflate all _VERSION's to single OPTIMIZELY_SDK_VERSION .

* Improved release.sh

* Resolve conflicts between '2.0.x' and 'master'

* Release 2.0.0 GA (#245)

* Bump version number to 2.0.0

* 'Optimizely Bucketing ID' --> '' per reference java-sdk and design doc

* Update CHANGELOG.md

* Add 'Bug Fixes' to CHANGELOG.md

* unexported_symbols.txt update

* Rebuild universal frameworks

* Add 1.5.1 message to CHANGELOG.md

* Merge 2.0.0 GA changes from 2.0.x into master branch.

Summary:
Pull request 2.0.0 GA changes made to 2.0.x branch into the
master branch.  This amounts to cherry-picking commits from
2.0.x and resolving conflicts.

Test Plan:
* sh ./Scripts/build_all.sh PASSED
* 4 Analyze PASSED
* 8+1 iOS test suites PASSED
* 7+1 tvOS test suites PASSED
We seemed to have some issues with tvos test suites last
week, but they PASSED 3x in a row today.

Reviewers: mike.ng, thomas.zurkan

JIRA Issues: OASIS-2519

Differential Revision: https://phabricator.optimizely.com/D19752

* Resolve conflicts (generated-frameworks) (#248)

* fix to send new events to new endpoint and any old events that might … (#249)

* fix to send new events to new endpoint and any old events that might be around to the old events endpoints

* use clientEngine instead of client_engine

* add a couple of tests for sending to new and old endpoints

* Kroach/oasis 2768 upgradev2 (#251)

* Forcing old datafile to include anonymizeIP required by V4 format.

* Add testOlderV2Datafile unit test

* Pre-Release 2.0.2-beta1 (#252) (#253)

* fix to send new events to new endpoint and any old events that might … (#249)

* fix to send new events to new endpoint and any old events that might be around to the old events endpoints

* use clientEngine instead of client_engine

* add a couple of tests for sending to new and old endpoints

* Kroach/oasis 2768 upgradev2 (#251)

* Forcing old datafile to include anonymizeIP required by V4 format.

* Add testOlderV2Datafile unit test

* Bump version number to 2.0.2-beta1

* Rebuild universal frameworks

* Update CHANGELOG.md

* Enabling Source Clear (#255)

* Kroach/oasis 2442 xcode94 (#254)

* Update Project Settings to Xcode 9.4 recommended settings

* Add ', strong, nonnull' to anonymizeIP @Property

* Accept Xcode 9.4's recommended Fix's which add 'self->'

* Eliminate Xcode Aanalyze warning for line in OPTLYFMDBDatabase.m

* Add weakSelf and strongSelf to setupNetworkTimer:

* setupNetworkTimer: nit

* Kroach/oasis 2442 swift (#256)

* Update OptimizelyiOSDemoApp to Swift 4

* 'pod update' and Localytics version update

* Localytics version update

* Revert "Enabling Source Clear (#255)"

This reverts commit 390856e.

* Xcode 9.4 recommended upgrade to Pods project settings

* Kroach/oasis 2978 variables (#257)

* Revive Live Variables API's

* Add 2 V3.json datafiles

* Repair all broken tests.  Make OptimizelyV3Test live variables tests pass.

* Add Live Variables (DEPRECATED) code comments

* Add 2 'Mobile 1.x Live Variables are DEPRECATED' block comments

* Add OPTLYLoggerMessagesLiveVariablesDeprecated log message to deprecated API's

* Add #pragms's to get deprecated warnings to emit in old code using Mobile 1.x Variables

* Managment -> Management

* OPTLYDatafileKeysVariationVariableUsageInstances --> OPTLYDatafileKeysVariationVariables

* re-enabled srcclr on every build (#263)

* Added SourceClear to run in one build per commit (#258)

* added sourceclear to only run in one build per commit

* moved sourceclear.sh into Scripts folder

* fix typo

* it -> is, 'skipping sourceclear'

* Add Release 1.5.2 message to master CHANGELOG.md (#267)

* Fix impression sent from feature experiment variation toggled off. (#270)

* Add environments support to SDK with SDK key initialization (#264)

* iOS Environment refactor to use OPTLYDatafileConfig

Test Plan: all tests pass on iOS and tvOS.

Reviewers: ali, kelly.roach, thomas.zurkan

Differential Revision: https://phabricator.optimizely.com/D19924

* Add unit test for initializing with SDK and fix a typo.

* Undo disabling of MxP.

* projectConfigURLPath: declaration removed

* Improve initWithProjectId:withSDKKey:

* Use BOOL values YES/NO

* Add parentheses and formatting to improve code readability

* Add areNilOrEqual:y: and refactor isEqual: for code clarity

* Improved OPTLYDatafileConfig.m hash method

* NSString+OPTLYCategory.m+.h dropped in favor of adding static method to OPTLYManagerBase.m+.h

* Refer to 6 identical strings by SSOT OPTLY_DATAFILE_URL global

* Changed enum type SqliteValueType to OPTLYSqliteValueType (#271)

* changed enum type SqliteValueType to OPTLYSqliteValueType

* Copyright headers updated

* Suppress deprecated warnings in OptimizelyV3Test

* Correct downloadDatafile:completionHandler: signature in OPTLYDatafileManagerTest.m

* Suppress -Wnonnull warnings in tests for illegitmate args

* Two nil --> [NSData data] in OPTLYDatafileManagerTest.m

* 3x (NSObject *) casts in OPTLYDecisionServiceTest.m

* OPTLYUserProfile --> NSDictionary in 2 places in OPTLYDecisionServiceTest.m

* Bump version number to 2.0.2-beta2

* Update CHANGELOG.md and 2 code comments in OPTLYManagerBase.h

* Improved unexported_symbols.sh

* unexported_symbols.sh comment

* Rebuild universal frameworks

Author: kellyroach-optimizely

.travis.yml

@@ -5,18 +5,21 @@ branches:
     - master
 env:
   matrix:
-    - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air'
+    - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air' RUN_SOURCECLEAR=true
     - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7 Plus'
     - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.3.1 NAME='iPhone 7'
     - SCHEME=OptimizelySDKiOS-Universal TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.3 NAME='iPhone 6s'
     - SCHEME=OptimizelySDKTVOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'
     - SCHEME=OptimizelySDKTVOS-Universal TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=9.2 NAME='Apple TV 1080p'
 before_install: 
   - gem install slather --no-rdoc --no-ri --no-document --quiet
+addons:
+  srcclr: true
 script:
   - pod spec lint --quick
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -quiet -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 | egrep -B 10 -A 10 "(error|warning|failed|crash|exit|FAILED|Failing|failures)"; fi
 after_success:
+  - ./Scripts/sourceclear.sh
   - slather
   - sleep 5 # https://github.com/travis-ci/travis-ci/issues/4725
 

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Optimizely Objective-C SDK Changelog
-## 2.0.2-beta1
-May 17, 2018
+## 2.0.2-beta2
+Jun 25, 2018
 
-**This "-beta1" pre-release corrects two significant bugs present in the
+**This "-beta2" pre-release corrects two significant bugs present in the
 previous 2.0.x releases which have been withdrawn.  Please note that
 2.0+ SDKs are incompatible with existing 1.x Mobile Optimizely
 projects.  Before you use 2.0+ and Feature Management, please contact
@@ -78,6 +78,8 @@ with Notification Listeners APIs
 - (void)clearNotificationListeners:(OPTLYNotificationType)type;
 - (void)clearAllNotificationListeners;
 ```
+* Add environments support to SDK with SDK key initialization. A new sdkKey property has been added to OPTLYManagerBuilder
+that is an alternative to the older projectId property.
 * Added `@"$opt_bucketing_id"` in the attribute map for overriding bucketing using the user id.  This string is
 available as OptimizelyBucketId in OPTLYEventBuilder.h .
 
@@ -93,6 +95,13 @@ unable to be deleted from data store due to syntax error.
 * Removed track APIs with revenue as a parameter.
 * Deprecated live variable APIs.
 
+## 1.5.2
+June 15, 2018
+
+### New Features
+* Updated SDK targets to Xcode 9.4 recommended settings, pod update'd third party Cocoapods used by the 2 demo apps,
+and eliminated Xcode 9.4 Build and Analyze warnings for SDK targets.
+
 ## 1.5.1
 April 17, 2018
 

OptimizelyDemoApp/AppDelegate.swift

@@ -36,7 +36,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     // customizable settings
     let datafileName = "demoTestDatafile" // default parameter for initializing Optimizely from saved datafile
-    var projectId = "8182362857" // project name: X Mobile - Sample App
+    var projectId = "10657931863" // project name: X Mobile - Sample App
     var experimentKey = "background_experiment"
     var eventKey = "sample_conversion"
     let attributes = ["sample_attribute_key":"sample_attribute_value"]
@@ -73,12 +73,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // ---- Create the Datafile Manager ----
         let datafileManager = OPTLYDatafileManagerDefault.init{(builder) in
             // builder!.datafileFetchInterval = TimeInterval(self.datafileManagerDownloadInterval)
-            builder!.projectId = self.projectId
+            builder!.datafileConfig = OPTLYDatafileConfig(projectId: nil, withSDKKey:self.projectId)!;
         }
 
         // ---- Create the Manager ----
         let optimizelyManager = OPTLYManager.init {(builder) in
-            builder!.projectId = self.projectId
+            builder!.projectId = nil;
+            builder!.sdkKey = self.projectId
             builder!.datafileManager = datafileManager!
             builder!.eventDispatcher = eventDispatcher
         }
@@ -93,7 +94,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 // ---- Amplitude ----
                 let propertyKey : String! = "[Optimizely] " + experiment.experimentKey
                 let identify : AMPIdentify = AMPIdentify()
-                identify.set(propertyKey, value:variation.variationKey as NSObject!)
+                identify.set(propertyKey, value:variation.variationKey as NSObject?)
                 // Track impression event (optional)
                 let eventIdentifier : String = "[Optimizely] " + experiment.experimentKey + " - " + variation.variationKey
                 Amplitude.instance().logEvent(eventIdentifier)
@@ -103,7 +104,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 let label : String = "Variation - " + variation.variationKey
                 // Build and send a non-interaction Event
                 let builder = GAIDictionaryBuilder.createEvent(withCategory: "Optimizely", action: action, label: label, value: nil).build()
-                tracker?.send(builder as [NSObject : AnyObject]!)
+                tracker?.send(builder as [NSObject : AnyObject]?)
                 // ---- Mixpanel ----
                 let mixpanel : MixpanelInstance = Mixpanel.mainInstance()
                 mixpanel.registerSuperProperties([propertyKey: variation.variationKey])
@@ -120,6 +121,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             })
 #endif
             let variation = optimizelyClient?.activate((self?.experimentKey)!, userId: (self?.userId)!, attributes: (self?.attributes))
+            
             self?.setRootViewController(optimizelyClient: optimizelyClient, bucketedVariation:variation)
         })
 

OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		3E3AD1412061E09E00081305 /* Pods_OptimizelyiOSDemoApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E3AD1422061E09E00081305 /* Pods_OptimizelyiOSDemoApp.framework */; };
 		3E62A2602061E71500D1AC12 /* OptimizelySDKUserProfileService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EB7197B1EC6589600B54F89 /* OptimizelySDKUserProfileService.framework */; };
 		3EB7197C1EC6589600B54F89 /* OptimizelySDKUserProfileService.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3EB7197B1EC6589600B54F89 /* OptimizelySDKUserProfileService.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		3EEC2AD520CB399500D096E4 /* demoTestDatafileV3.json in Resources */ = {isa = PBXBuildFile; fileRef = 3EEC2AD220CB399500D096E4 /* demoTestDatafileV3.json */; };
+		3EEC2AD620CB399500D096E4 /* demoTestDatafileV3.json in Resources */ = {isa = PBXBuildFile; fileRef = 3EEC2AD220CB399500D096E4 /* demoTestDatafileV3.json */; };
 		3EF452841ECA639300BA82CB /* OptimizelySDKUserProfileService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EF452831ECA639300BA82CB /* OptimizelySDKUserProfileService.framework */; };
 		EA1E4B491E65060300BDDABD /* OptimizelySDKEventDispatcher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E4B481E65060300BDDABD /* OptimizelySDKEventDispatcher.framework */; };
 		EA1E4B4A1E65060300BDDABD /* OptimizelySDKEventDispatcher.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E4B481E65060300BDDABD /* OptimizelySDKEventDispatcher.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -158,6 +160,7 @@
 		3E39BD0E2072E05E00F73BD0 /* Pods_OptimizelyTVOSDemoApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_OptimizelyTVOSDemoApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3E3AD1422061E09E00081305 /* Pods_OptimizelyiOSDemoApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_OptimizelyiOSDemoApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3EB7197B1EC6589600B54F89 /* OptimizelySDKUserProfileService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OptimizelySDKUserProfileService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		3EEC2AD220CB399500D096E4 /* demoTestDatafileV3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = demoTestDatafileV3.json; sourceTree = "<group>"; };
 		3EF452831ECA639300BA82CB /* OptimizelySDKUserProfileService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OptimizelySDKUserProfileService.framework; path = "../Debug-appletvos/OptimizelySDKUserProfileService.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		920E4FB688AA1A8926800320 /* Pods-OptimizelyTVOSDemoApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelyTVOSDemoApp.release.xcconfig"; path = "../Pods/Target Support Files/Pods-OptimizelyTVOSDemoApp/Pods-OptimizelyTVOSDemoApp.release.xcconfig"; sourceTree = "<group>"; };
 		B8C4B923152B213925B727C4 /* Pods_OptimizelyiOSDemoApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OptimizelyiOSDemoApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -253,6 +256,7 @@
 				EA70FFC31E552D0B00590BEF /* Roboto-Medium.ttf */,
 				EA70FFC41E552D0B00590BEF /* SF-UI-Text-Regular.otf */,
 				EA4A62BA1E566F3500F1C3CE /* demoTestDatafile.json */,
+				3EEC2AD220CB399500D096E4 /* demoTestDatafileV3.json */,
 				EAF6953A1FA07BF800C73CC2 /* optimizely_6372300739.json */,
 				EAF6953D1FA08DD900C73CC2 /* optimizely_8182362857.json */,
 			);
@@ -345,8 +349,6 @@
 				EA7000041E552EBD00590BEF /* Sources */,
 				EA7000091E552EBD00590BEF /* Frameworks */,
 				EA70000C1E552EBD00590BEF /* Resources */,
-				EA7000131E552EBD00590BEF /* [CP] Embed Pods Frameworks */,
-				EA7000141E552EBD00590BEF /* [CP] Copy Pods Resources */,
 				EA7000151E552EBD00590BEF /* Embed Frameworks */,
 			);
 			buildRules = (
@@ -369,7 +371,6 @@
 				EA70FFEB1E552E9E00590BEF /* Frameworks */,
 				EA70FFEE1E552E9E00590BEF /* Resources */,
 				EA70FFF61E552E9E00590BEF /* [CP] Embed Pods Frameworks */,
-				EA70FFF71E552E9E00590BEF /* [CP] Copy Pods Resources */,
 				EA299F031E55331000931399 /* Embed Frameworks */,
 			);
 			buildRules = (
@@ -390,14 +391,14 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Optimizely;
 				TargetAttributes = {
 					EA7000001E552EBD00590BEF = {
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0940;
 					};
 					EA70FFE01E552E9E00590BEF = {
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0940;
 					};
 				};
 			};
@@ -473,6 +474,7 @@
 				3E19F86C1F0176AC001FC077 /* Assets.xcassets in Resources */,
 				EA299EDC1E55311700931399 /* tvOSMain.storyboard in Resources */,
 				EA7000121E552EBD00590BEF /* ProximaNova-Regular.otf in Resources */,
+				3EEC2AD620CB399500D096E4 /* demoTestDatafileV3.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -487,6 +489,7 @@
 				EA4A62BB1E566F3500F1C3CE /* demoTestDatafile.json in Resources */,
 				EA70FFF41E552E9E00590BEF /* SF-UI-Text-Regular.otf in Resources */,
 				EA299EEF1E55316300931399 /* Assets.xcassets in Resources */,
+				3EEC2AD520CB399500D096E4 /* demoTestDatafileV3.json in Resources */,
 				EA70FFF51E552E9E00590BEF /* ProximaNovaCond-Regular.otf in Resources */,
 				EAF6953E1FA08DD900C73CC2 /* optimizely_8182362857.json in Resources */,
 			);
@@ -513,36 +516,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EA7000131E552EBD00590BEF /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelyTVOSDemoApp/Pods-OptimizelyTVOSDemoApp-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		EA7000141E552EBD00590BEF /* [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-OptimizelyTVOSDemoApp/Pods-OptimizelyTVOSDemoApp-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		EA70FFE51E552E9E00590BEF /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -570,7 +543,7 @@
 				"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelyiOSDemoApp/Pods-OptimizelyiOSDemoApp-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Amplitude-iOS/Amplitude_iOS.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
-				"${PODS_ROOT}/Localytics/Localytics-iOS-4.4.1/Localytics.framework",
+				"${PODS_ROOT}/Localytics/Localytics-iOS-5.1.0/Localytics.framework",
 				"${BUILT_PRODUCTS_DIR}/Mixpanel-swift/Mixpanel.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -585,21 +558,6 @@
 			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelyiOSDemoApp/Pods-OptimizelyiOSDemoApp-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EA70FFF71E552E9E00590BEF /* [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-OptimizelyiOSDemoApp/Pods-OptimizelyiOSDemoApp-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -684,13 +642,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -747,13 +707,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -806,7 +768,8 @@
 				SDKROOT = appletvos;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -827,7 +790,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -849,7 +813,7 @@
 					"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
 					"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
 					"\"${PODS_ROOT}/Google/Frameworks\"",
-					"\"${PODS_ROOT}/Localytics/Localytics-iOS-4.4.1\"",
+					"\"${PODS_ROOT}/Localytics/Localytics-iOS-5.1.0\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OptimizelyiOSDemoApp/OptimizelyiOSDemoApp-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -858,7 +822,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OptimizelyDemoApp-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
@@ -877,7 +842,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Optimizely.OptimizelyiOSDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OptimizelyDemoApp-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;

OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyTVOSDemoApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyiOSDemoApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"