[Feature] mParticle Migration Update (SDK v7+) (#43)

yoyoyoseob · web-flow · commit a973147d0732 · 2018-08-13T11:55:22.000-04:00
[Feature] Update mParticle initialization for v7+
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.2
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -3,17 +3,16 @@
 # # * https://github.com/supermarin/xcpretty#usage
 #
 
-language: objective-c
-osx_image: xcode9
+language: swift
+osx_image: xcode9.3
 cache: cocoapods
 podfile: Podfile
 before_install:
 - rvm install $(cat .ruby-version) 
 - rvm use $(cat .ruby-version)
 - gem install bundler
 - bundle install
-- pod repo update --silent
-- pod install
+- pod install --repo-update
 script:
 - set -o pipefail && xcodebuild test -workspace Simcoe.xcworkspace -scheme SimcoeTests -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest' | xcpretty
 - pod lib lint
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '1.1.1'
+gem 'cocoapods', '1.3.1'
 gem 'xcpretty', '0.2.4'
diff --git a/Podfile b/Podfile
@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 use_frameworks!
-inhibit_all_warnings!
+# inhibit_all_warnings!
 
 install! 'cocoapods', :deterministic_uuids => false
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -2,25 +2,27 @@ PODS:
   - AdobeMobileSDK (4.13.8):
     - AdobeMobileSDK/iOS (= 4.13.8)
   - AdobeMobileSDK/iOS (4.13.8)
-  - Mixpanel-swift (2.2.1)
-  - mParticle-Apple-SDK (6.15.10):
-    - mParticle-Apple-SDK/mParticle (= 6.15.10)
-  - mParticle-Apple-SDK/mParticle (6.15.10)
+  - Mixpanel-swift (2.4.4):
+    - Mixpanel-swift/Complete (= 2.4.4)
+  - Mixpanel-swift/Complete (2.4.4)
+  - mParticle-Apple-SDK (7.5.1):
+    - mParticle-Apple-SDK/mParticle (= 7.5.1)
+  - mParticle-Apple-SDK/mParticle (7.5.1)
   - Simcoe/Adobe (1.2.0):
     - AdobeMobileSDK (~> 4.13)
     - Simcoe/Core
   - Simcoe/Core (1.2.0)
   - Simcoe/Mixpanel (1.2.0):
-    - Mixpanel-swift (~> 2.2.0)
+    - Mixpanel-swift (~> 2.4.4)
     - Simcoe/Core
   - Simcoe/mParticle (1.2.0):
-    - mParticle-Apple-SDK (~> 6)
+    - mParticle-Apple-SDK (= 7.5.1)
     - Simcoe/Core
 
 DEPENDENCIES:
   - AdobeMobileSDK (~> 4.13)
-  - Mixpanel-swift (~> 2.2.0)
-  - mParticle-Apple-SDK (~> 6)
+  - Mixpanel-swift (~> 2.4.4)
+  - mParticle-Apple-SDK (= 7.5.1)
   - Simcoe/Adobe (from `./`)
   - Simcoe/Mixpanel (from `./`)
   - Simcoe/mParticle (from `./`)
@@ -31,10 +33,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AdobeMobileSDK: de79920972a9abcf4e27b141fb79d0262fe9ee11
-  Mixpanel-swift: d0374c33e38a7f184203eef1c8eae64be54986ed
-  mParticle-Apple-SDK: 7be8af83582e0c2c99e78075142eb7be9e24aab3
-  Simcoe: d29afc62c1f5cbfe8d90522d2a46331b71c9a502
+  Mixpanel-swift: 1908db7a972b362fcab1a0c3b37ec6087b95d8d9
+  mParticle-Apple-SDK: e901dec4147c3f1c041c2cb493b129ae652e26f1
+  Simcoe: 014cb7317cc7f51472dfd3202db86fd960288696
 
-PODFILE CHECKSUM: 3168a08aa3eb292250204b2bc967159b719878a0
+PODFILE CHECKSUM: 8d8a42d64db1433bbfb67a53162f9258ec0d74fb
 
 COCOAPODS: 1.3.1
diff --git a/Simcoe.podspec b/Simcoe.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Simcoe"
-  s.version      = "1.1.0"
+  s.version      = "1.2.0"
   s.summary      = "An analytics framework that provides a base layer of simple APIs for managing analytics frameworks."
   s.description  = <<-DESC
                     Simcoe is an analytics framework that aims to provide a simple, extensible API for managing and handling various analytics frameworks. It makes very few assumptions about your analytics implementations, allowing the implementer to customize it to their needs.
@@ -34,8 +34,8 @@ Pod::Spec.new do |s|
   # Each subspec represents an analytics library implemented using Simcoe.
 
   adobe		  =   { :name => "Adobe",           :dependency => "AdobeMobileSDK", :version => '~> 4.13' }
-  mParticle =   { :name => "mParticle",       :dependency => "mParticle-Apple-SDK", :version => '~> 6' }
-  mixpanel  =   { :name => "Mixpanel",        :dependency => "Mixpanel-swift", :version => '~> 2.2.0' }
+  mParticle =   { :name => "mParticle",       :dependency => "mParticle-Apple-SDK", :version => '7.5.1' }
+  mixpanel  =   { :name => "Mixpanel",        :dependency => "Mixpanel-swift", :version => '~> 2.4.4' }
 
   all_specs = [adobe, mParticle, mixpanel]
 
diff --git a/Simcoe.xcodeproj/project.pbxproj b/Simcoe.xcodeproj/project.pbxproj
@@ -427,7 +427,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Prolific Interactive";
 				TargetAttributes = {
 					72897FDC1C79E25800393482 = {
@@ -663,7 +663,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.SimcoeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -676,7 +676,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.SimcoeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -693,12 +693,14 @@
 				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_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;
@@ -726,12 +728,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -751,12 +753,14 @@
 				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_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;
@@ -778,11 +782,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -811,7 +815,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -835,7 +839,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Simcoe.xcodeproj/xcshareddata/xcschemes/Simcoe.xcscheme b/Simcoe.xcodeproj/xcshareddata/xcschemes/Simcoe.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   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>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Simcoe.xcodeproj/xcshareddata/xcschemes/SimcoeTests.xcscheme b/Simcoe.xcodeproj/xcshareddata/xcschemes/SimcoeTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -40,7 +39,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Simcoe.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Simcoe.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>
diff --git a/Simcoe/EnumerationListable.swift b/Simcoe/EnumerationListable.swift
@@ -20,7 +20,7 @@ extension EnumerationListable where Self: RawRepresentable {
     /// - Parameter properties: The properties.
     /// - Returns: The unfound keys.
     fileprivate static func unfoundKeys(_ properties: Properties) -> [String] {
-        let allKeyRawValues: [String] = Self.allKeys.flatMap { $0.rawValue as? String }
+        let allKeyRawValues: [String] = Self.allKeys.compactMap { $0.rawValue as? String }
         let allKeyRawValuesSet = Set(allKeyRawValues)
         let allPropertiesKeysSet = Set(properties.keys)
 
diff --git a/Simcoe/Simcoe.swift b/Simcoe/Simcoe.swift
@@ -88,7 +88,7 @@ public final class Simcoe {
 
         return activeProviders
             .map { provider in return provider as? T }
-            .flatMap { $0 }
+            .compactMap { $0 }
     }
 
     // MARK: - CartLogging
diff --git a/Simcoe/Tracker.swift b/Simcoe/Tracker.swift
@@ -39,7 +39,7 @@ public final class Tracker {
             }
         }
 
-        write(event.description, forProviders: successfulProviders.flatMap { $0 })
+        write(event.description, forProviders: successfulProviders.compactMap { $0 })
     }
 
     fileprivate func handleError(usingMessage message: String, inProvider provider: AnalyticsTracking) {
diff --git a/Simcoe/mParticle/mParticle.swift b/Simcoe/mParticle/mParticle.swift
@@ -13,27 +13,18 @@ public class mParticle {
 
     fileprivate static let unknownErrorMessage = "An unknown error occurred."
 
+    fileprivate var currentUser: MParticleUser? {
+        return MParticle.sharedInstance().identity.currentUser
+    }
+
     /// The name of the tracker.
     public let name = "mParticle"
 
-    /// Initializes and starts the SDK with the input key and secret.
+    /// Initializes and starts the SDK with the input options.
     ///
-    /// - Parameters:
-    ///   - key: The key.
-    ///   - secret: The secret.
-    ///   - installationType: The installation type.
-    ///   - environment: The environment.
-    ///   - proxyAppDelegate: Determines if app delegate proxy should be used.
-    public init(key: String,
-                secret: String,
-                installationType: MPInstallationType = .autodetect,
-                environment: MPEnvironment = .autoDetect,
-                proxyAppDelegate: Bool = true) {
-        MParticle.sharedInstance().start(withKey: key,
-                                                secret:secret,
-                                                installationType: installationType,
-                                                environment: environment,
-                                                proxyAppDelegate: proxyAppDelegate)
+    /// - Parameter options: The mParticle SDK options.
+    public init(options: MParticleOptions) {
+        MParticle.sharedInstance().start(with: options)
     }
 
     /// Starts the mParticle SDK with the api_key and api_secret saved in MParticleConfig.plist.
@@ -356,7 +347,7 @@ extension mParticle: UserAttributeTracking {
     ///   - value: The attribute value to log.
     /// - Returns: A tracking result.
     public func setUserAttribute(_ key: String, value: Any) -> TrackingResult {
-        MParticle.sharedInstance().setUserAttribute(key, value: value)
+        currentUser?.setUserAttribute(key, value: value)
 
         return .success
     }
@@ -367,7 +358,7 @@ extension mParticle: UserAttributeTracking {
     /// - Returns: A tracking result.
     public func setUserAttributes(_ attributes: Properties) -> TrackingResult {
         attributes.forEach {
-            MParticle.sharedInstance().setUserAttribute($0, value: $1)
+            currentUser?.setUserAttribute($0, value: $1)
         }
 
         return .success
diff --git a/mParticleExample/mParticleExample.xcodeproj/project.pbxproj b/mParticleExample/mParticleExample.xcodeproj/project.pbxproj
diff --git a/mParticleExample/mParticleExample.xcodeproj/xcshareddata/xcschemes/mParticleExample.xcscheme b/mParticleExample/mParticleExample.xcodeproj/xcshareddata/xcschemes/mParticleExample.xcscheme
