Add SwiftLint: Fix 'whitespace' rules (#283)

Fix 'whitespace' issues
okta · Apr 5, 2021 · e4b4234 · e4b4234
1 parent f3b43e1
commit e4b4234
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 6 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,6 +5,12 @@ only_rules:
   - closure_spacing
   - comma
   - colon
+  # Whitespace (Xcode configuration)
+  - leading_whitespace
+  - let_var_whitespace
+  - operator_whitespace
+  - operator_usage_whitespace
+  - return_arrow_whitespace
 
 # Spacing
 opening_brace:
@@ -17,6 +23,18 @@ comma:
   severity: error
 colon:
   severity: error
+# Whitespace
+leading_whitespace:
+  severity: error
+let_var_whitespace:
+  severity: error
+operator_whitespace:
+  severity: error
+operator_usage_whitespace:
+  severity: error
+return_arrow_whitespace:
+  severity: error
+
 # Paths to ignore
 excluded:
 - Pods
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ osx_image: xcode12.2
 before_install:
   - gem install xcpretty
   - gem install cocoapods
-  - brew outdated carthage || brew upgrade carthage
 jobs:
   include:
     - stage: Linting

diff --git a/Sources/OktaOidc/Common/OktaSignOutOptions.swift b/Sources/OktaOidc/Common/OktaSignOutOptions.swift
@@ -15,6 +15,7 @@ import Foundation
 public struct OktaSignOutOptions: OptionSet {
 
     public let rawValue: Int
+
     public init(rawValue: Int) {
         self.rawValue = rawValue
     }

diff --git a/Sources/OktaOidc/iOS/Internal/OktaOidcBrowserProtocolIOS.swift b/Sources/OktaOidc/iOS/Internal/OktaOidcBrowserProtocolIOS.swift
@@ -21,6 +21,6 @@ import UIKit
     func signOutOfOkta(_ authStateManager: OktaOidcStateManager,
                        from presenter: UIViewController,
                        callback: @escaping ((Error?) -> Void))
-    func cancelBrowserSession(completion: (()-> Void)?)
+    func cancelBrowserSession(completion: (() -> Void)?)
 }
 #endif
diff --git a/Sources/OktaOidc/iOS/OktaOidc+BrowserIOS.swift b/Sources/OktaOidc/iOS/OktaOidc+BrowserIOS.swift
@@ -80,7 +80,7 @@ extension OktaOidc: OktaOidcBrowserProtocolIOS {
                                completionHandler: completionHandler)
     }
 
-    @objc public func cancelBrowserSession(completion: (()-> Void)? = nil) {
+    @objc public func cancelBrowserSession(completion: (() -> Void)? = nil) {
         guard let userAgentSession = currentUserSessionTask?.userAgentSession else {
             completion?()
             return

diff --git a/Sources/OktaOidc/macOS/Internal/OktaOidcBrowserProtocolMAC.swift b/Sources/OktaOidc/macOS/Internal/OktaOidcBrowserProtocolMAC.swift
@@ -21,7 +21,7 @@ import AppKit
     func signOutOfOkta(authStateManager: OktaOidcStateManager,
                        redirectServerConfiguration: OktaRedirectServerConfiguration?,
                        callback: @escaping ((Error?) -> Void))
-    func cancelBrowserSession(completion: (()-> Void)?)
+    func cancelBrowserSession(completion: (() -> Void)?)
 }
 
 public extension OktaOidcBrowserProtocolMAC {
@@ -37,7 +37,7 @@ public extension OktaOidcBrowserProtocolMAC {
                       redirectServerConfiguration: redirectServerConfiguration,
                       callback: callback)
     }
-    func cancelBrowserSession(completion: (()-> Void)? = nil) {
+    func cancelBrowserSession(completion: (() -> Void)? = nil) {
         cancelBrowserSession(completion: completion)
     }
 }

diff --git a/Sources/OktaOidc/macOS/OktaOidc+BrowserMAC.swift b/Sources/OktaOidc/macOS/OktaOidc+BrowserMAC.swift
@@ -86,7 +86,7 @@ extension OktaOidc: OktaOidcBrowserProtocolMAC {
                                completionHandler: completionHandler)
     }
 
-    @objc public func cancelBrowserSession(completion: (()-> Void)? = nil) {
+    @objc public func cancelBrowserSession(completion: (() -> Void)? = nil) {
         guard let userAgentSession = currentUserSessionTask?.userAgentSession else {
             completion?()
             return

diff --git a/Tests/Common/OKTExternalUserAgentMacMock.swift b/Tests/Common/OKTExternalUserAgentMacMock.swift
@@ -17,6 +17,7 @@ import Foundation
 
 class OKTExternalUserAgentMacMock: OKTExternalUserAgentMac {
     let responseURL: URL
+
     init(with responseURL: URL) {
         self.responseURL = responseURL
     }

diff --git a/Tests/OktaOidcTests/OktaOidcMacTests.swift b/Tests/OktaOidcTests/OktaOidcMacTests.swift
@@ -18,6 +18,7 @@ import XCTest
 
 fileprivate class OktaOidcPartialMock: OktaOidc {
     var error: Error?
+
     override func signInWithBrowserTask(_ task: OktaOidcBrowserTask,
                                         callback: @escaping ((OktaOidcStateManager?, Error?) -> Void)) {
         DispatchQueue.main.async {