optimizely · alda-optimizely · May 2, 2017 · Mar 21, 2017 · Mar 30, 2017 · Mar 31, 2017
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ xcuserdata/
 ## Other
 *.moved-aside
 *.xcuserstate
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "OptimizelySDKUniversal/OptimizelySDKUniversal/Frameworks/fmdb"]
+	path = OptimizelySDKUniversal/OptimizelySDKUniversal/Frameworks/fmdb
+	url = https://github.com/ccgus/fmdb.git
+[submodule "OptimizelySDKUniversal/OptimizelySDKUniversal/Frameworks/jsonmodel"]
+	path = OptimizelySDKUniversal/OptimizelySDKUniversal/Frameworks/jsonmodel
+	url = https://github.com/jsonmodel/jsonmodel.git
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ env:
   matrix:
     - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Retina'
     - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.3 NAME='iPhone 6s Plus'
-    - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7'
+    - SCHEME=OptimizelySDKiOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.2 NAME='iPhone 7'
     - SCHEME=OptimizelySDKTVOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=9.2 NAME='Apple TV 1080p'
 script:
   - pod spec lint --quick

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,29 @@
 # Optimizely Objective-C SDK Changelog
+## 1.1.0
+May 2, 2017
+
+### New Features
+* Added the Objective-C universal framework, which allows users to install the SDK without a third-party dependency manager.
+* Added the event tags parameter in the track API, which allows user to pass in more than one event tags at a time. The new events parameter is a map of event tag names to event tag values, which can be an NSNumber that contains a float, double, integer, or boolean, or an NSString:
+```
+- (void)track:(nonnull NSString *)eventKey
+       userId:(nonnull NSString *)userId
+    eventTags:(nonnull NSDictionary<NSString *, id> *)eventTags;
+```
+The track API with just one event value is still available, but will be deprecated after two releases:
+``` 
+- (void)track:(nonnull NSString *)eventKey
+       userId:(nonnull NSString *)userId
+   eventValue:(nonnull NSNumber *)eventValue __attribute 
+```
+
+* Updated the README with instructions for Carthage and Universal framework installations. 
+
+### Bug Fixes
+* Fixed multiple base conditions audience parsing (merged the external pull request from @docsimon: https://github.com/optimizely/objective-c-sdk/pull/124).
+* Fixed how NOT conditions are parsed in the audience evaluation. 
+* Fixed event negative timestamps for 32-bit architecture devices. 
+
 ## 1.0.1
 March 6, 2017
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,7 +3,7 @@ We welcome contributions and feedback! All contributors must sign our [Contribut
 
 ##Development process
 
-1. Create a branch off of `devel`: `git checkout -b YOUR_NAME/branch_name`.
+1. Create a branch off of `master`: `git checkout -b YOUR_NAME/branch_name`.
 2. Commit your changes. Make sure to add tests!
 3. Run Objective-C linter (TBD).
 4. `git push` your changes to GitHub.

diff --git a/OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj b/OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj
@@ -29,8 +29,8 @@
 		EA1E4B5F1E65065500BDDABD /* OptimizelySDKDatafileManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E4B541E65060300BDDABD /* OptimizelySDKDatafileManager.framework */; };
 		EA1E4B601E65065500BDDABD /* OptimizelySDKDatafileManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E4B541E65060300BDDABD /* OptimizelySDKDatafileManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA1E4B651E65072600BDDABD /* Pods_OptimizelyiOSDemoApp.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B8C4B923152B213925B727C4 /* Pods_OptimizelyiOSDemoApp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		EA1E4B661E65074E00BDDABD /* OptimizelySDKiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5249311DC72F3500AF6685 /* OptimizelySDKiOS.framework */; };
-		EA1E4B671E65075C00BDDABD /* OptimizelySDKiOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA5249311DC72F3500AF6685 /* OptimizelySDKiOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		EA1E4B661E65074E00BDDABD /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5249311DC72F3500AF6685 /* OptimizelySDKiOS.framework */; };
+		EA1E4B671E65075C00BDDABD /* ReferenceProxy in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA5249311DC72F3500AF6685 /* OptimizelySDKiOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA28AB311E5FBA900060BF44 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EA28AB301E5FBA900060BF44 /* GoogleService-Info.plist */; };
 		EA299EDC1E55311700931399 /* tvOSMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA299EDA1E55311700931399 /* tvOSMain.storyboard */; };
 		EA299EDF1E55312200931399 /* iOSMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA299EDD1E55312200931399 /* iOSMain.storyboard */; };
@@ -45,8 +45,8 @@
 		EA299EEF1E55316300931399 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA299EEE1E55316300931399 /* Assets.xcassets */; };
 		EA299EF01E55316300931399 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA299EEE1E55316300931399 /* Assets.xcassets */; };
 		EA299F081E55335300931399 /* Pods_OptimizelySDKiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA299F071E55335300931399 /* Pods_OptimizelySDKiOS.framework */; };
-		EA299F0A1E55336700931399 /* OptimizelySDKTVOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; };
-		EA299F0B1E55336700931399 /* OptimizelySDKTVOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		EA299F0A1E55336700931399 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; };
+		EA299F0B1E55336700931399 /* ReferenceProxy in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA299F0F1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA299F0E1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework */; };
 		EA299F101E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA299F0E1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA4A62BB1E566F3500F1C3CE /* demoTestDatafile.json in Resources */ = {isa = PBXBuildFile; fileRef = EA4A62BA1E566F3500F1C3CE /* demoTestDatafile.json */; };
@@ -127,7 +127,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				EA1E4B671E65075C00BDDABD /* OptimizelySDKiOS.framework in Embed Frameworks */,
+				EA1E4B671E65075C00BDDABD /* ReferenceProxy in Embed Frameworks */,
 				EA1E4B651E65072600BDDABD /* Pods_OptimizelyiOSDemoApp.framework in Embed Frameworks */,
 				EA1E4B5A1E65065500BDDABD /* OptimizelySDKShared.framework in Embed Frameworks */,
 				EA1E4B601E65065500BDDABD /* OptimizelySDKDatafileManager.framework in Embed Frameworks */,
@@ -146,7 +146,7 @@
 			files = (
 				EA1E4B4D1E65060300BDDABD /* OptimizelySDKShared.framework in Embed Frameworks */,
 				EA1E4B561E65060300BDDABD /* OptimizelySDKDatafileManager.framework in Embed Frameworks */,
-				EA299F0B1E55336700931399 /* OptimizelySDKTVOS.framework in Embed Frameworks */,
+				EA299F0B1E55336700931399 /* ReferenceProxy in Embed Frameworks */,
 				EA1E4B501E65060300BDDABD /* OptimizelySDKCore.framework in Embed Frameworks */,
 				EA299F101E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework in Embed Frameworks */,
 				EA1E4B531E65060300BDDABD /* OptimizelySDKUserProfile.framework in Embed Frameworks */,
@@ -199,7 +199,7 @@
 			files = (
 				EA1E4B4C1E65060300BDDABD /* OptimizelySDKShared.framework in Frameworks */,
 				EA1E4B551E65060300BDDABD /* OptimizelySDKDatafileManager.framework in Frameworks */,
-				EA299F0A1E55336700931399 /* OptimizelySDKTVOS.framework in Frameworks */,
+				EA299F0A1E55336700931399 /* ReferenceProxy in Frameworks */,
 				EA1E4B4F1E65060300BDDABD /* OptimizelySDKCore.framework in Frameworks */,
 				EA299F0F1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework in Frameworks */,
 				EA1E4B521E65060300BDDABD /* OptimizelySDKUserProfile.framework in Frameworks */,
@@ -211,7 +211,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EA1E4B661E65074E00BDDABD /* OptimizelySDKiOS.framework in Frameworks */,
+				EA1E4B661E65074E00BDDABD /* ReferenceProxy in Frameworks */,
 				EA1E4B591E65065500BDDABD /* OptimizelySDKShared.framework in Frameworks */,
 				EA1E4B5B1E65065500BDDABD /* OptimizelySDKCore.framework in Frameworks */,
 				EA299F081E55335300931399 /* Pods_OptimizelySDKiOS.framework in Frameworks */,

diff --git a/...DemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyTVOSDemoApp.xcscheme b/...DemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyTVOSDemoApp.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA7000001E552EBD00590BEF"
+               BuildableName = "OptimizelyTVOSDemoApp.app"
+               BlueprintName = "OptimizelyTVOSDemoApp"
+               ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA7000001E552EBD00590BEF"
+            BuildableName = "OptimizelyTVOSDemoApp.app"
+            BlueprintName = "OptimizelyTVOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA7000001E552EBD00590BEF"
+            BuildableName = "OptimizelyTVOSDemoApp.app"
+            BlueprintName = "OptimizelyTVOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA7000001E552EBD00590BEF"
+            BuildableName = "OptimizelyTVOSDemoApp.app"
+            BlueprintName = "OptimizelyTVOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...yDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyiOSDemoApp.xcscheme b/...yDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyiOSDemoApp.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA70FFE01E552E9E00590BEF"
+               BuildableName = "OptimizelyiOSDemoApp.app"
+               BlueprintName = "OptimizelyiOSDemoApp"
+               ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA70FFE01E552E9E00590BEF"
+            BuildableName = "OptimizelyiOSDemoApp.app"
+            BlueprintName = "OptimizelyiOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA70FFE01E552E9E00590BEF"
+            BuildableName = "OptimizelyiOSDemoApp.app"
+            BlueprintName = "OptimizelyiOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA70FFE01E552E9E00590BEF"
+            BuildableName = "OptimizelyiOSDemoApp.app"
+            BlueprintName = "OptimizelyiOSDemoApp"
+            ReferencedContainer = "container:OptimizelyDemoApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/OptimizelySDK.xcworkspace/contents.xcworkspacedata b/OptimizelySDK.xcworkspace/contents.xcworkspacedata
diff --git a/OptimizelySDKCore.podspec b/OptimizelySDKCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                    = "OptimizelySDKCore"
-  s.version                 = "1.0.1"
+  s.version                 = "1.1.0"
   s.summary                 = "Optimizely server-side testing core framework."
   s.homepage                = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
   s.license                 = { :type => "Apache License, Version 2.0", :file => "LICENSE" }

diff --git a/OptimizelySDKCore/.DS_Store b/OptimizelySDKCore/.DS_Store