Merge pull request #954 from GetStream/dev/swiftformat-swiftlint-versions-and-configuration

Use explicit set of rules in SwiftFormat and SwiftLint and bump versions

Author: laevandus

.swiftformat

@@ -2,17 +2,65 @@
 --header "\nCopyright © {year} Stream.io Inc. All rights reserved.\n"
 --swiftversion 5.9
 
---ifdef no-indent
---disable redundantType
---disable extensionAccessControl
---disable andOperator
---disable blankLinesAtStartOfScope
+# Use allow-list
+--rules blankLinesAroundMark
+--rules blankLinesAtEndOfScope
+--rules blankLinesBetweenScopes
+--rules braces
+--rules consecutiveBlankLines
+--rules consecutiveSpaces
+--rules duplicateImports
+--rules elseOnSameLine
+--rules emptyBraces
+--rules enumNamespaces
+--rules fileHeader
+--rules indent
+--rules initCoderUnavailable
+--rules isEmpty
+--rules leadingDelimiters
+--rules linebreakAtEndOfFile
+--rules linebreaks
+--rules modifierOrder
+--rules numberFormatting
+--rules redundantBackticks
+--rules redundantBreak
+--rules redundantExtensionACL
+--rules redundantFileprivate
+--rules redundantLet
+--rules redundantLetError
+--rules redundantNilInit
+--rules redundantObjc
+--rules redundantPattern
+--rules redundantRawValues
+--rules redundantVoidReturnType
+--rules semicolons
+--rules sortImports
+--rules spaceAroundBraces
+--rules spaceAroundBrackets
+--rules spaceAroundComments
+--rules spaceAroundGenerics
+--rules spaceAroundOperators
+--rules spaceAroundParens
+--rules spaceInsideBraces
+--rules spaceInsideBrackets
+--rules spaceInsideComments
+--rules spaceInsideGenerics
+--rules spaceInsideParens
+--rules strongOutlets
+--rules strongifiedSelf
+--rules todos
+--rules trailingCommas
+--rules trailingSpace
+--rules unusedArguments
+--rules void
+--rules wrap
+--rules wrapArguments
+--rules wrapAttributes
+--rules yodaConditions
 
-# Rules inferred from Swift Standard Library:
---disable anyObjectProtocol, wrapMultilineStatementBraces
+# Configuration for enabled rules
+--ifdef no-indent
 --indent 4
---enable isEmpty
---disable redundantParens # it generates mistakes for e.g. "if (a || b), let x = ... {}"
 --semicolons inline
 --nospaceoperators ..., ..< # what about ==, +=?
 --commas inline

DemoApp/Sources/Components/DemoAppViewFactory.swift

@@ -88,7 +88,7 @@ final class DemoAppViewFactory: ViewFactory {
     func makeVideoParticipantsView(
         viewModel: CallViewModel,
         availableFrame: CGRect,
-        onChangeTrackVisibility: @escaping @MainActor(CallParticipant, Bool) -> Void
+        onChangeTrackVisibility: @escaping @MainActor (CallParticipant, Bool) -> Void
     ) -> some View {
         VideoParticipantsView(
             viewFactory: self,

DemoApp/Sources/Components/MemoryLogDestination/LogQueue.swift

@@ -28,7 +28,8 @@ enum LogQueue {
         let logContent = """
         Stream Video Logs - Generated: \(Date())
         \(logs.reversed().map { "\($0.level) - [\($0.fileName):\($0.lineNumber):\($0.functionName)] \($0.message)" }
-            .joined(separator: "\n"))
+            .joined(separator: "\n")
+        )
         """
 
         try logContent.write(to: fileURL, atomically: true, encoding: .utf8)

DemoApp/Sources/Components/MemoryLogDestination/MemoryLogViewer.swift

@@ -83,7 +83,8 @@ struct MemoryLogViewer: View {
             let logContent = """
             Stream Video Logs - Generated: \(Date())
             \(logs.reversed().map { "\($0.level) - [\($0.fileName):\($0.lineNumber):\($0.functionName)] \($0.message)" }
-                .joined(separator: "\n"))
+                .joined(separator: "\n")
+            )
             """
 
             // Write to file

DemoApp/Sources/Components/Router.swift

@@ -38,8 +38,7 @@ final class Router: ObservableObject {
 
         if
             appState.unsecureRepository.currentConfiguration() != AppEnvironment.configuration
-            || appState.unsecureRepository.currentBaseURL() != AppEnvironment.baseURL
-        {
+            || appState.unsecureRepository.currentBaseURL() != AppEnvironment.baseURL {
             // Clean up the currently logged in use, if we run in different
             // configuration since the last time.
             appState.unsecureRepository.removeCurrentUser()

DemoApp/Sources/Extensions/View+AlertWithTextField.swift

@@ -8,7 +8,7 @@ import SwiftUI
 private struct DemoAlertWithTextFieldViewModifier<Value: CustomStringConvertible>: ViewModifier {
 
     var title: String
-    var message: String? = nil
+    var message: String?
     var placeholder: String
     var presentationBinding: Binding<Bool>
     var valueBinding: Binding<Value>

DemoApp/Sources/Views/Login/LoginView.swift

@@ -215,7 +215,7 @@ struct AppUserView: View {
     @Injected(\.colors) var colors
     var user: User
     var size: CGFloat = 32
-    var overrideUserName: String? = nil
+    var overrideUserName: String?
 
     var body: some View {
         if user.imageURL != nil {

DemoApp/Sources/Views/StatsView/DemoStatsView.swift

@@ -185,8 +185,7 @@ struct DemoStatsView: View {
         )
         if
             resolution != .zero,
-            report.highestFramesPerSecond > 0
-        {
+            report.highestFramesPerSecond > 0 {
             return "\(Int(resolution.width))x\(Int(resolution.height))@\(report.highestFramesPerSecond)"
         } else {
             return "none"

Githubfile

@@ -9,6 +9,6 @@ export MINT_VERSION='0.17.5'
 export SONAR_VERSION='6.2.1.4610'
 export IPSW_VERSION='3.1.592'
 export INTERFACE_ANALYZER_VERSION='1.0.7'
-export SWIFT_LINT_VERSION='0.55.1'
-export SWIFT_FORMAT_VERSION='0.47.12'
+export SWIFT_LINT_VERSION='0.59.1'
+export SWIFT_FORMAT_VERSION='0.58.2'
 export SWIFT_GEN_VERSION='6.5.1'

Sources/StreamVideo/CallKit/CallKitAdapter.swift

@@ -86,7 +86,7 @@ open class CallKitAdapter {
 
 extension CallKitAdapter: InjectionKey {
     /// Provides the current instance of `CallKitAdapter`.
-    nonisolated(unsafe) public static var currentValue: CallKitAdapter = .init()
+    public nonisolated(unsafe) static var currentValue: CallKitAdapter = .init()
 }
 
 extension InjectedValues {