Update to Swift 3 - Closes #4

VojtaStavik · Jan 3, 2017 · f4cfa3b · f4cfa3b
1 parent 2180eba
commit f4cfa3b
Show file tree

Hide file tree

Showing 364 changed files with 11,926 additions and 6,730 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,57 @@
+
+included:
+- Trackable
+- TrackableExample
+- TrackableTests
+
+whitelist_rules:
+- trailing_newline
+- vertical_whitespace
+- type_name
+- type_body_length
+- trailing_semicolon
+- statement_position
+- redundant_nil_coalesing
+- overridden_super_call
+- operator_whitespace
+- opening_brace
+- nesting
+- mark
+- legacy_constant
+- legacy_constructor
+- legacy_cggeometry_functions
+- function_body_length
+- force_try
+- explicit_init
+- empty_count
+- control_statement
+- conditional_returns_on_newline
+- comma
+- colon
+- closure_spacing
+- custom_rules
+- xcode_default_file_header
+- prohibited_super_call
+- redundant_nil_coalescing
+- redundant_string_enum_value
+- return_arrow_whitespace
+- syntactic_sugar
+- todo
+- trailing_comma
+- unused_closure_parameter
+- unused_enumerated
+- valid_docs
+- valid_ibinspectable
+- void_return
+- weak_delegate
+- closing_brace
+- closure_parameter_position
+- dynamic_inline
+- empty_parameters
+- empty_parentheses_with_trailing_closure
+- file_length
+- function_parameter_count
+- implicit_getter
+- leading_whitespace
+- legacy_nsgeometry_functions
+- nimble_operator
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode8.2
 
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 
-script: 
+script:
   - set -o pipefail && xcodebuild -scheme Trackable -workspace Trackable.xcworkspace -enableCodeCoverage YES -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6S,OS=9.1' build test | xcpretty
 
 after_success:

diff --git a/Podfile b/Podfile
@@ -1,9 +1,9 @@
-platform :ios, '8.0'
+platform :ios, '9.0'
 use_frameworks!
 
 target 'TrackableTests' do
-    pod 'Quick', '~> 0.8.0'
-    pod 'Nimble', '3.0.0'
+    pod 'Quick'
+    pod 'Nimble'
 end
 
 target 'TrackableExample' do

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,18 +1,20 @@
 PODS:
-  - Mixpanel (2.9.1):
-    - Mixpanel/Mixpanel (= 2.9.1)
-  - Mixpanel/Mixpanel (2.9.1)
-  - Nimble (3.0.0)
-  - Quick (0.8.0)
+  - Mixpanel (3.0.8):
+    - Mixpanel/Mixpanel (= 3.0.8)
+  - Mixpanel/Mixpanel (3.0.8)
+  - Nimble (5.1.1)
+  - Quick (1.0.0)
 
 DEPENDENCIES:
   - Mixpanel
-  - Nimble (= 3.0.0)
-  - Quick (~> 0.8.0)
+  - Nimble
+  - Quick
 
 SPEC CHECKSUMS:
-  Mixpanel: 5ca24b2a05f4c77fe9bcfe7671d681d0f3f8d76f
-  Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
-  Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
+  Mixpanel: 550a23d5dd95f8e9cda21e697661ffddbc8da46b
+  Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
+  Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 031fe2fe8b28f8440262c2a0de4ecf774036cd62
+
+COCOAPODS: 1.2.0.beta.3
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerChangeRequestMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerChangeRequestMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerChangeResponseMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerChangeResponseMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerClearRequestMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerClearRequestMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerClearResponseMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerClearResponseMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerConnection.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerConnection.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerDeviceInfoRequestMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerDeviceInfoRequestMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerDeviceInfoResponseMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerDeviceInfoResponseMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerDisconnectMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerDisconnectMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerSnapshotRequestMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerSnapshotRequestMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerSnapshotResponseMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerSnapshotResponseMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerTweakRequestMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerTweakRequestMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPABTestDesignerTweakResponseMessage.h b/Pods/Headers/Private/Mixpanel/MPABTestDesignerTweakResponseMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPAbstractABTestDesignerMessage.h b/Pods/Headers/Private/Mixpanel/MPAbstractABTestDesignerMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPApplicationStateSerializer.h b/Pods/Headers/Private/Mixpanel/MPApplicationStateSerializer.h
diff --git a/Pods/Headers/Private/Mixpanel/MPClassDescription.h b/Pods/Headers/Private/Mixpanel/MPClassDescription.h
diff --git a/Pods/Headers/Private/Mixpanel/MPDesignerEventBindingMessage.h b/Pods/Headers/Private/Mixpanel/MPDesignerEventBindingMessage.h
diff --git a/Pods/Headers/Private/Mixpanel/MPDesignerSessionCollection.h b/Pods/Headers/Private/Mixpanel/MPDesignerSessionCollection.h
diff --git a/Pods/Headers/Private/Mixpanel/MPEnumDescription.h b/Pods/Headers/Private/Mixpanel/MPEnumDescription.h
diff --git a/Pods/Headers/Private/Mixpanel/MPEventBinding.h b/Pods/Headers/Private/Mixpanel/MPEventBinding.h
diff --git a/Pods/Headers/Private/Mixpanel/MPLogger.h b/Pods/Headers/Private/Mixpanel/MPLogger.h
diff --git a/Pods/Headers/Private/Mixpanel/MPNotification.h b/Pods/Headers/Private/Mixpanel/MPNotification.h
diff --git a/Pods/Headers/Private/Mixpanel/MPNotificationViewController.h b/Pods/Headers/Private/Mixpanel/MPNotificationViewController.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectIdentifierProvider.h b/Pods/Headers/Private/Mixpanel/MPObjectIdentifierProvider.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectIdentityProvider.h b/Pods/Headers/Private/Mixpanel/MPObjectIdentityProvider.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectSelector.h b/Pods/Headers/Private/Mixpanel/MPObjectSelector.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectSerializer.h b/Pods/Headers/Private/Mixpanel/MPObjectSerializer.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectSerializerConfig.h b/Pods/Headers/Private/Mixpanel/MPObjectSerializerConfig.h
diff --git a/Pods/Headers/Private/Mixpanel/MPObjectSerializerContext.h b/Pods/Headers/Private/Mixpanel/MPObjectSerializerContext.h
diff --git a/Pods/Headers/Private/Mixpanel/MPPropertyDescription.h b/Pods/Headers/Private/Mixpanel/MPPropertyDescription.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSequenceGenerator.h b/Pods/Headers/Private/Mixpanel/MPSequenceGenerator.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSurvey.h b/Pods/Headers/Private/Mixpanel/MPSurvey.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSurveyNavigationController.h b/Pods/Headers/Private/Mixpanel/MPSurveyNavigationController.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSurveyQuestion.h b/Pods/Headers/Private/Mixpanel/MPSurveyQuestion.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSurveyQuestionViewController.h b/Pods/Headers/Private/Mixpanel/MPSurveyQuestionViewController.h
diff --git a/Pods/Headers/Private/Mixpanel/MPSwizzler.h b/Pods/Headers/Private/Mixpanel/MPSwizzler.h
diff --git a/Pods/Headers/Private/Mixpanel/MPTweak.h b/Pods/Headers/Private/Mixpanel/MPTweak.h
diff --git a/Pods/Headers/Private/Mixpanel/MPTweakInline.h b/Pods/Headers/Private/Mixpanel/MPTweakInline.h
diff --git a/Pods/Headers/Private/Mixpanel/MPTweakInlineInternal.h b/Pods/Headers/Private/Mixpanel/MPTweakInlineInternal.h
diff --git a/Pods/Headers/Private/Mixpanel/MPTweakStore.h b/Pods/Headers/Private/Mixpanel/MPTweakStore.h
diff --git a/Pods/Headers/Private/Mixpanel/MPTypeDescription.h b/Pods/Headers/Private/Mixpanel/MPTypeDescription.h
diff --git a/Pods/Headers/Private/Mixpanel/MPUIControlBinding.h b/Pods/Headers/Private/Mixpanel/MPUIControlBinding.h
diff --git a/Pods/Headers/Private/Mixpanel/MPUITableViewBinding.h b/Pods/Headers/Private/Mixpanel/MPUITableViewBinding.h
diff --git a/Pods/Headers/Private/Mixpanel/MPValueTransformers.h b/Pods/Headers/Private/Mixpanel/MPValueTransformers.h
diff --git a/Pods/Headers/Private/Mixpanel/MPVariant.h b/Pods/Headers/Private/Mixpanel/MPVariant.h
diff --git a/Pods/Headers/Private/Mixpanel/MPWebSocket.h b/Pods/Headers/Private/Mixpanel/MPWebSocket.h
diff --git a/Pods/Headers/Private/Mixpanel/Mixpanel.h b/Pods/Headers/Private/Mixpanel/Mixpanel.h
diff --git a/Pods/Headers/Private/Mixpanel/NSData+MPBase64.h b/Pods/Headers/Private/Mixpanel/NSData+MPBase64.h
diff --git a/Pods/Headers/Private/Mixpanel/NSInvocation+MPHelpers.h b/Pods/Headers/Private/Mixpanel/NSInvocation+MPHelpers.h
diff --git a/Pods/Headers/Private/Mixpanel/UIColor+MPColor.h b/Pods/Headers/Private/Mixpanel/UIColor+MPColor.h
diff --git a/Pods/Headers/Private/Mixpanel/UIImage+MPAverageColor.h b/Pods/Headers/Private/Mixpanel/UIImage+MPAverageColor.h
diff --git a/Pods/Headers/Private/Mixpanel/UIImage+MPImageEffects.h b/Pods/Headers/Private/Mixpanel/UIImage+MPImageEffects.h
diff --git a/Pods/Headers/Private/Mixpanel/UIView+MPHelpers.h b/Pods/Headers/Private/Mixpanel/UIView+MPHelpers.h
diff --git a/Pods/Headers/Private/Mixpanel/_MPTweakBindObserver.h b/Pods/Headers/Private/Mixpanel/_MPTweakBindObserver.h
diff --git a/Pods/Headers/Private/Nimble/DSL.h b/Pods/Headers/Private/Nimble/DSL.h
diff --git a/Pods/Headers/Private/Nimble/NMBExceptionCapture.h b/Pods/Headers/Private/Nimble/NMBExceptionCapture.h
diff --git a/Pods/Headers/Private/Nimble/Nimble.h b/Pods/Headers/Private/Nimble/Nimble.h
diff --git a/Pods/Headers/Private/Quick/NSString+QCKSelectorName.h b/Pods/Headers/Private/Quick/NSString+QCKSelectorName.h
diff --git a/Pods/Headers/Private/Quick/QCKDSL.h b/Pods/Headers/Private/Quick/QCKDSL.h
diff --git a/Pods/Headers/Private/Quick/Quick.h b/Pods/Headers/Private/Quick/Quick.h
diff --git a/Pods/Headers/Private/Quick/QuickConfiguration.h b/Pods/Headers/Private/Quick/QuickConfiguration.h
diff --git a/Pods/Headers/Private/Quick/QuickSpec.h b/Pods/Headers/Private/Quick/QuickSpec.h
diff --git a/Pods/Headers/Private/Quick/World+DSL.h b/Pods/Headers/Private/Quick/World+DSL.h
diff --git a/Pods/Headers/Private/Quick/World.h b/Pods/Headers/Private/Quick/World.h
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Mixpanel/LICENSE b/Pods/Mixpanel/LICENSE
diff --git a/Pods/Mixpanel/Mixpanel/AutomaticEventsConstants.h b/Pods/Mixpanel/Mixpanel/AutomaticEventsConstants.h
diff --git a/...sets/MPArrowLeft.imageset/MPArrowLeft.png → .../Mixpanel/Mixpanel/Images/MPArrowLeft.png b/...sets/MPArrowLeft.imageset/MPArrowLeft.png → .../Mixpanel/Mixpanel/Images/MPArrowLeft.png
diff --git a/...s/MPArrowLeft.imageset/[email protected] → ...xpanel/Mixpanel/Images/[email protected] b/...s/MPArrowLeft.imageset/[email protected] → ...xpanel/Mixpanel/Images/[email protected]
diff --git a/...ts/MPArrowRight.imageset/MPArrowRight.png → ...Mixpanel/Mixpanel/Images/MPArrowRight.png b/...ts/MPArrowRight.imageset/MPArrowRight.png → ...Mixpanel/Mixpanel/Images/MPArrowRight.png
diff --git a/...MPArrowRight.imageset/[email protected] → ...panel/Mixpanel/Images/[email protected] b/...MPArrowRight.imageset/[email protected] → ...panel/Mixpanel/Images/[email protected]
diff --git a/...sets/MPCheckmark.imageset/MPCheckmark.png → .../Mixpanel/Mixpanel/Images/MPCheckmark.png b/...sets/MPCheckmark.imageset/MPCheckmark.png → .../Mixpanel/Mixpanel/Images/MPCheckmark.png
diff --git a/...s/MPCheckmark.imageset/[email protected] → ...xpanel/Mixpanel/Images/[email protected] b/...s/MPCheckmark.imageset/[email protected] → ...xpanel/Mixpanel/Images/[email protected]
diff --git a/Pods/Mixpanel/Mixpanel/Images/MPCloseButton.png b/Pods/Mixpanel/Mixpanel/Images/MPCloseButton.png
diff --git a/Pods/Mixpanel/Mixpanel/Images/[email protected] b/Pods/Mixpanel/Mixpanel/Images/[email protected]
diff --git a/Pods/Mixpanel/Mixpanel/Images/[email protected] b/Pods/Mixpanel/Mixpanel/Images/[email protected]
diff --git a/...ssKeyboard.imageset/MPDismissKeyboard.png → ...nel/Mixpanel/Images/MPDismissKeyboard.png b/...ssKeyboard.imageset/MPDismissKeyboard.png → ...nel/Mixpanel/Images/MPDismissKeyboard.png
diff --git a/...eyboard.imageset/[email protected] → .../Mixpanel/Images/[email protected] b/...eyboard.imageset/[email protected] → .../Mixpanel/Images/[email protected]
diff --git a/...Media.xcassets/MPLogo.imageset/MPLogo.png → Pods/Mixpanel/Mixpanel/Images/MPLogo.png b/...Media.xcassets/MPLogo.imageset/MPLogo.png → Pods/Mixpanel/Mixpanel/Images/MPLogo.png
diff --git a/...ia.xcassets/MPLogo.imageset/[email protected] → Pods/Mixpanel/Mixpanel/Images/[email protected] b/...ia.xcassets/MPLogo.imageset/[email protected] → Pods/Mixpanel/Mixpanel/Images/[email protected]