Swift 3.2/4 support (#41)

Adds support for Swift 3.2/4 with additional instructions on supporting Swift4 (with the exclusion of Mixpanel while we await a Swift4 release)

Author: yoyoyoseob

.swift-version

@@ -1 +1 @@
-3.0
+3.2

.travis.yml

@@ -4,7 +4,7 @@
 #
 
 language: objective-c
-osx_image: xcode8.1
+osx_image: xcode9
 cache: cocoapods
 podfile: Podfile
 before_install:

Podfile.lock

@@ -1,40 +1,40 @@
 PODS:
-  - AdobeMobileSDK (4.13.0):
-    - AdobeMobileSDK/iOS (= 4.13.0)
-  - AdobeMobileSDK/iOS (4.13.0)
-  - Mixpanel-swift (2.1.3)
-  - mParticle-Apple-SDK (6.11.1):
-    - mParticle-Apple-SDK/mParticle (= 6.11.1)
-  - mParticle-Apple-SDK/mParticle (6.11.1)
-  - Simcoe/Adobe (1.0.0):
+  - 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)
+  - Simcoe/Adobe (1.2.0):
     - AdobeMobileSDK (~> 4.13)
     - Simcoe/Core
-  - Simcoe/Core (1.0.0)
-  - Simcoe/Mixpanel (1.0.0):
-    - Mixpanel-swift (~> 2.1.3)
+  - Simcoe/Core (1.2.0)
+  - Simcoe/Mixpanel (1.2.0):
+    - Mixpanel-swift (~> 2.2.0)
     - Simcoe/Core
-  - Simcoe/mParticle (1.0.0):
+  - Simcoe/mParticle (1.2.0):
     - mParticle-Apple-SDK (~> 6)
     - Simcoe/Core
 
 DEPENDENCIES:
   - AdobeMobileSDK (~> 4.13)
-  - Mixpanel-swift (~> 2.1.3)
+  - Mixpanel-swift (~> 2.2.0)
   - mParticle-Apple-SDK (~> 6)
   - Simcoe/Adobe (from `./`)
   - Simcoe/Mixpanel (from `./`)
   - Simcoe/mParticle (from `./`)
 
 EXTERNAL SOURCES:
   Simcoe:
-    :path: "./"
+    :path: ./
 
 SPEC CHECKSUMS:
-  AdobeMobileSDK: 52c3fbf43b5b054132393b1486ecbefca0ba01db
-  Mixpanel-swift: a50fe20def8fc2ea0f2c912772ad835bd8524dae
-  mParticle-Apple-SDK: 8c7dfc195459870aa33be634f006342cb37d6a24
-  Simcoe: 3e77a2ef7f0a28b3184cd823cae9682613760d75
+  AdobeMobileSDK: de79920972a9abcf4e27b141fb79d0262fe9ee11
+  Mixpanel-swift: d0374c33e38a7f184203eef1c8eae64be54986ed
+  mParticle-Apple-SDK: 7be8af83582e0c2c99e78075142eb7be9e24aab3
+  Simcoe: d29afc62c1f5cbfe8d90522d2a46331b71c9a502
 
 PODFILE CHECKSUM: 3168a08aa3eb292250204b2bc967159b719878a0
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.3.1

Simcoe.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
 
   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.1.3' }
+  mixpanel  =   { :name => "Mixpanel",        :dependency => "Mixpanel-swift", :version => '~> 2.2.0' }
 
   all_specs = [adobe, mParticle, mixpanel]
 

Simcoe.xcodeproj/project.pbxproj

@@ -427,16 +427,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Prolific Interactive";
 				TargetAttributes = {
 					72897FDC1C79E25800393482 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					F902ED111C68FA07007975F5 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -482,13 +482,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Simcoe-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../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";
+			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;
 		};
 		3BD8A183EE1390D19A959186 /* [CP] Check Pods Manifest.lock */ = {
@@ -497,13 +500,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Simcoe-SimcoeTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../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";
+			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;
 		};
 		92508C4DD7CFB48C39292C10 /* [CP] Copy Pods Resources */ = {
@@ -542,9 +548,18 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Simcoe-SimcoeTests/Pods-Simcoe-SimcoeTests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AdobeMobileSDK/AdobeMobileSDK.framework",
+				"${BUILT_PRODUCTS_DIR}/Mixpanel-swift/Mixpanel.framework",
+				"${BUILT_PRODUCTS_DIR}/Simcoe/Simcoe.framework",
+				"${BUILT_PRODUCTS_DIR}/mParticle-Apple-SDK/mParticle_Apple_SDK.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AdobeMobileSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mixpanel.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Simcoe.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mParticle_Apple_SDK.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -647,6 +662,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.SimcoeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
@@ -659,6 +675,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.SimcoeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
@@ -672,14 +689,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -724,14 +747,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -781,6 +810,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
@@ -804,6 +834,7 @@
 				PRODUCT_NAME = Simcoe;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;

Simcoe.xcodeproj/xcshareddata/xcschemes/Simcoe.xcscheme

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

Simcoe.xcodeproj/xcshareddata/xcschemes/SimcoeTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,6 +10,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -39,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SimcoeTests/mParticle/MPEventTests.swift

@@ -29,9 +29,9 @@ class MPEventTests: XCTestCase {
         }
 
         XCTAssertNil(eventError,
-            "Expected error to be nil; got \(eventError)")
+                     "Expected error to be nil; got \(String(describing: eventError))")
         XCTAssertNotNil(event,
-            "Expected event to not be nil; got nil")
+                        "Expected event to not be nil; got nil")
     }
 
     func test_that_name_error_thrown_when_missing() {
@@ -51,9 +51,9 @@ class MPEventTests: XCTestCase {
         }
 
         XCTAssertNil(event,
-            "Expected event to fail initialization and return nil; got \(event).")
+                     "Expected event to fail initialization and return nil; got \(String(describing: event)).")
         XCTAssertEqual(expected, eventError as? MPEventGenerationError,
-            "Expected result = \(expected); got \(eventError)")
+                       "Expected result = \(expected); got \(String(describing: eventError))")
     }
 
     func test_that_type_error_thrown_when_missing() {
@@ -73,9 +73,9 @@ class MPEventTests: XCTestCase {
         }
 
         XCTAssertNil(event,
-            "Expected event to be nil; got \(event)")
+                     "Expected event to be nil; got \(String(describing: event))")
         XCTAssertEqual(expected, eventError as? MPEventGenerationError,
-            "Expected result = \(expected); got \(eventError)")
+                       "Expected result = \(expected); got \(String(describing: eventError))")
     }
 
     func test_that_init_error_thrown_when_bad_data_input() {
@@ -95,11 +95,11 @@ class MPEventTests: XCTestCase {
         XCTAssertNil(event,
             "Expected result = event is nil; got not-nil.")
         XCTAssertEqual(expected, eventError,
-            "Expected result = \(expected); got \(eventError)")
+                       "Expected result = \(expected); got \(String(describing: eventError))")
     }
 
     func test_that_MPEvent_has_type() {
-        let type = MPEventType.media
+        let type = MPEventType.social
 
         let data = MPEvent.eventData(type: type, name: "Event Type")
         let result = try! MPEvent.toEvent(usingData: data)
@@ -125,7 +125,7 @@ class MPEventTests: XCTestCase {
         let result = try! MPEvent.toEvent(usingData: data)
 
         XCTAssertEqual(category, result.category,
-            "Expected result = \(category); got \(result.category)")
+                       "Expected result = \(category); got \(String(describing: result.category))")
     }
 
     func test_that_MPEvent_has_duration() {
@@ -135,7 +135,7 @@ class MPEventTests: XCTestCase {
         let result = try! MPEvent.toEvent(usingData: data)
 
         XCTAssertEqual(duration, result.duration as! Float,
-            "Expected result = \(duration); got \(result.duration)")
+                       "Expected result = \(duration); got \(String(describing: result.duration))")
     }
 
     func test_that_MPEvent_has_customFlags() {