Format.

mluisbrown · mluisbrown · commit 36434e7afa24 · 2020-07-08T00:27:58.000+01:00
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -18,6 +18,6 @@ jobs:
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Run swift-format
-          branch: 'main'
+          branch: 'master'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift b/Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift
@@ -1,5 +1,5 @@
-import ReactiveSwift
 import ComposableArchitecture
+import ReactiveSwift
 import UIKit
 
 struct RootState {
@@ -253,26 +253,30 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
 // Typically this live implementation of the dependency would live in its own module so that the
 // main feature doesn't need to compile it.
 func liveNumberFact(for n: Int) -> Effect<String, NumbersApiError> {
-  URLSession.shared.reactive.data(with: URLRequest(url: URL(string: "http://numbersapi.com/\(n)/trivia")!))
-    .map { data, _ in String(decoding: data, as: UTF8.self) }
-    .flatMapError { _ in
-      Effect(value: "\(n) is a good number Brent")
-        .delay(1, on: QueueScheduler.main)
-    }
-    .promoteError(NumbersApiError.self)
+  URLSession.shared.reactive.data(
+    with: URLRequest(url: URL(string: "http://numbersapi.com/\(n)/trivia")!)
+  )
+  .map { data, _ in String(decoding: data, as: UTF8.self) }
+  .flatMapError { _ in
+    Effect(value: "\(n) is a good number Brent")
+      .delay(1, on: QueueScheduler.main)
+  }
+  .promoteError(NumbersApiError.self)
 }
 
 // This is the "live" trivia dependency that reaches into the outside world to fetch trivia.
 // Typically this live implementation of the dependency would live in its own module so that the
 // main feature doesn't need to compile it.
 func liveTrivia(for n: Int) -> Effect<String, TriviaApiError> {
-  URLSession.shared.reactive.data(with: URLRequest(url: URL(string: "http://numbersapi.com/\(n)/trivia")!))
-    .map { data, _ in String.init(decoding: data, as: UTF8.self) }
-    .flatMapError { _ in
-      Effect(value: "\(n) is a good number Brent")
-        .delay(1, on: QueueScheduler.main)
-    }
-    .promoteError(TriviaApiError.self)
+  URLSession.shared.reactive.data(
+    with: URLRequest(url: URL(string: "http://numbersapi.com/\(n)/trivia")!)
+  )
+  .map { data, _ in String.init(decoding: data, as: UTF8.self) }
+  .flatMapError { _ in
+    Effect(value: "\(n) is a good number Brent")
+      .delay(1, on: QueueScheduler.main)
+  }
+  .promoteError(TriviaApiError.self)
 }
 
 private func liveFetchNumber() -> Effect<Int, Never> {
@@ -283,4 +287,3 @@ private func liveFetchNumber() -> Effect<Int, Never> {
 private let liveUserDidTakeScreenshot = NotificationCenter.default
   .reactive.notifications(forName: UIApplication.userDidTakeScreenshotNotification)
   .map { _ in () }
-
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift b/Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift
@@ -51,7 +51,7 @@ let animationsReducer = Reducer<AnimationsState, AnimationsAction, AnimationsEnv
             ? Effect(value: .setColor(color))
             : Effect(value: .setColor(color))
               .delay(1, on: environment.mainQueue)
-      }
+        }
     )
 
   case let .setColor(color):
@@ -105,7 +105,7 @@ struct AnimationsView: View {
           )
           .padding()
           Button("Rainbow") { viewStore.send(.rainbowButtonTapped) }
-          .padding([.leading, .trailing, .bottom])
+            .padding([.leading, .trailing, .bottom])
         }
       }
     }
@@ -121,7 +121,7 @@ struct AnimationsView_Previews: PreviewProvider {
             initialState: AnimationsState(circleCenter: CGPoint(x: 50, y: 50)),
             reducer: animationsReducer,
             environment: AnimationsEnvironment(
-                mainQueue: QueueScheduler.main
+              mainQueue: QueueScheduler.main
             )
           )
         )
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift
@@ -1,5 +1,5 @@
-import ReactiveSwift
 import ComposableArchitecture
+import ReactiveSwift
 import SwiftUI
 
 private let readMe = """
@@ -148,9 +148,11 @@ struct WebSocketView: View {
           )
 
           Button(
-            viewStore.connectivityState == .connected ? "Disconnect"
-              : viewStore.connectivityState == .disconnected ? "Connect"
-              : "Connecting..."
+            viewStore.connectivityState == .connected
+              ? "Disconnect"
+              : viewStore.connectivityState == .disconnected
+                ? "Connect"
+                : "Connecting..."
           ) {
             viewStore.send(.connectButtonTapped)
           }
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AnimationsTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AnimationsTests.swift
@@ -1,5 +1,5 @@
-import ReactiveSwift
 import ComposableArchitecture
+import ReactiveSwift
 import XCTest
 
 @testable import SwiftUICaseStudies
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-WebSocketTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-WebSocketTests.swift
@@ -1,5 +1,5 @@
-import ReactiveSwift
 import ComposableArchitecture
+import ReactiveSwift
 import XCTest
 
 @testable import SwiftUICaseStudies
diff --git a/Examples/MotionManager/MotionManager/MotionManagerView.swift b/Examples/MotionManager/MotionManager/MotionManagerView.swift
@@ -50,10 +50,11 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
     return .none
 
   case .motionUpdate(.failure):
-    state.alert = .init(title: """
-      We encountered a problem with the motion manager. Make sure you run this demo on a real \
-      device, not the simulator.
-      """)
+    state.alert = .init(
+      title: """
+        We encountered a problem with the motion manager. Make sure you run this demo on a real \
+        device, not the simulator.
+        """)
     state.isRecording = false
     return .none
 
diff --git a/Examples/MotionManager/MotionManagerTests/MotionTests.swift b/Examples/MotionManager/MotionManagerTests/MotionTests.swift
@@ -1,7 +1,7 @@
-import ReactiveSwift
 import ComposableArchitecture
 import ComposableCoreMotion
 import CoreMotion
+import ReactiveSwift
 import XCTest
 
 @testable import MotionManagerDemo
diff --git a/Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift b/Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift
@@ -79,9 +79,10 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
       return .none
 
     case .denied:
-      state.alert = .init(title: """
-        You denied access to speech recognition. This app needs access to transcribe your speech.
-        """)
+      state.alert = .init(
+        title: """
+          You denied access to speech recognition. This app needs access to transcribe your speech.
+          """)
       return .none
 
     case .restricted:
diff --git a/Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift b/Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift
@@ -28,8 +28,8 @@ class SpeechRecognitionTests: XCTestCase {
       .receive(.speechRecognizerAuthorizationStatusResponse(.denied)) {
         $0.alert = .init(
           title: """
-          You denied access to speech recognition. This app needs access to transcribe your speech.
-          """
+            You denied access to speech recognition. This app needs access to transcribe your speech.
+            """
         )
         $0.isRecording = false
         $0.speechRecognizerAuthorizationStatus = .denied
diff --git a/Examples/TicTacToe/Sources/Core/GameCore.swift b/Examples/TicTacToe/Sources/Core/GameCore.swift
@@ -93,9 +93,11 @@ extension Array where Element == [Player?] {
     ]
 
     for condition in winConditions {
-      let matches = condition
+      let matches =
+        condition
         .map { self[$0 % 3][$0 / 3] }
-      let matchCount = matches
+      let matchCount =
+        matches
         .filter { $0 == player }
         .count
 
diff --git a/Examples/VoiceMemos/VoiceMemos/VoiceMemo.swift b/Examples/VoiceMemos/VoiceMemos/VoiceMemo.swift
@@ -1,6 +1,6 @@
 import ComposableArchitecture
-import ReactiveSwift
 import Foundation
+import ReactiveSwift
 import SwiftUI
 
 struct VoiceMemo: Equatable {
@@ -70,7 +70,7 @@ let voiceMemoReducer = Reducer<VoiceMemo, VoiceMemoAction, VoiceMemoEnvironment>
         Effect.timer(id: TimerId(), every: .milliseconds(500), on: environment.mainQueue)
           .map { date -> VoiceMemoAction in
             .timerUpdated(
-                date.timeIntervalSinceReferenceDate - start.timeIntervalSinceReferenceDate
+              date.timeIntervalSinceReferenceDate - start.timeIntervalSinceReferenceDate
             )
           }
       )
diff --git a/Sources/ComposableCoreLocation/Live.swift b/Sources/ComposableCoreLocation/Live.swift
@@ -129,7 +129,7 @@ extension LocationManager {
     manager.locationServicesEnabled = CLLocationManager.locationServicesEnabled
 
     manager.location = { id in dependencies[id]?.manager.location.map(Location.init(rawValue:)) }
-    
+
     manager.requestLocation = { id in
       .fireAndForget { dependencies[id]?.manager.requestLocation() }
     }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ let animationsReducer = Reducer<AnimationsState, AnimationsAction, AnimationsEnv`
`51`	`51`	`? Effect(value: .setColor(color))`
`52`	`52`	`: Effect(value: .setColor(color))`
`53`	`53`	`.delay(1, on: environment.mainQueue)`
`54`		`- }`
	`54`	`+ }`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`case let .setColor(color):`
`@@ -105,7 +105,7 @@ struct AnimationsView: View {`
`105`	`105`	`)`
`106`	`106`	`.padding()`
`107`	`107`	`Button("Rainbow") { viewStore.send(.rainbowButtonTapped) }`
`108`		`- .padding([.leading, .trailing, .bottom])`
	`108`	`+ .padding([.leading, .trailing, .bottom])`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -121,7 +121,7 @@ struct AnimationsView_Previews: PreviewProvider {`
`121`	`121`	`initialState: AnimationsState(circleCenter: CGPoint(x: 50, y: 50)),`
`122`	`122`	`reducer: animationsReducer,`
`123`	`123`	`environment: AnimationsEnvironment(`
`124`		`- mainQueue: QueueScheduler.main`
	`124`	`+ mainQueue: QueueScheduler.main`
`125`	`125`	`)`
`126`	`126`	`)`
`127`	`127`	`)`