Merge pull request #29 from BoltsFramework/nlutsenko.lint

Add swiftlint to Travis-CI.

Author: nlutsenko

.travis.yml

@@ -11,18 +11,21 @@ env:
     - TEST_TYPE=iOS
     - TEST_TYPE=OSX
     - TEST_TYPE=tvOS
-    - TEST_TYPE=CocoaPods
-    - TEST_TYPE=Carthage
+    - TEST_TYPE=Lint
+    - TEST_TYPE=Distribution
 before_install:
+- |
+  if [ "$TEST_TYPE" = Lint ] || [ "$TEST_TYPE" = Distribution ]; then
+    brew update
+  fi
+install:
 - |
   if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = OSX ] || [ "$TEST_TYPE" = tvOS ]; then
     gem install xcpretty -N --no-ri --no-rdoc
-  elif [ "$TEST_TYPE" = CocoaPods ]; then
+  elif [ "$TEST_TYPE" = Lint ]; then
+    brew install swiftlint || brew upgrade swiftlint
+  elif [ "$TEST_TYPE" = Distribution ]; then
     gem install cocoapods --pre --quiet --no-ri --no-rdoc
-    pod setup --silent
-    pod repo update --silent
-  elif [ "$TEST_TYPE" = Carthage ]; then
-    brew update
     brew install carthage || brew upgrade carthage
   fi
 script:
@@ -39,9 +42,10 @@ script:
       set -o pipefail
       xcodebuild test -project BoltsSwift.xcodeproj -sdk appletvsimulator -scheme BoltsSwift-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
       xcodebuild test -project BoltsSwift.xcodeproj -sdk appletvsimulator -scheme BoltsSwift-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
-    elif [ "$TEST_TYPE" = CocoaPods ]; then
+    elif [ "$TEST_TYPE" = Lint ]; then
+      swiftlint lint
+    elif [ "$TEST_TYPE" = Distribution ]; then
       pod lib lint Bolts-Swift.podspec
-    elif [ "$TEST_TYPE" = Carthage ]; then
       carthage build --no-skip-current
     fi
 after_success:

Sources/BoltsSwift/Task+ContinueWith.swift

@@ -23,7 +23,10 @@ extension Task {
 
      - returns: The task resulting from the continuation
      */
-    private func continueWithTask<S>(executor: Executor, options: TaskContinuationOptions, continuation: (Task throws -> Task<S>)) -> Task<S> {
+    private func continueWithTask<S>(executor: Executor,
+                                  options: TaskContinuationOptions,
+                                  continuation: (Task throws -> Task<S>)
+        ) -> Task<S> {
         let taskCompletionSource = TaskCompletionSource<S>()
         let wrapperContinuation = {
             switch self.state {