Lint で利用する Swift のバージョンを 5.8 -> 5.10 にあげる

.swift-version

@@ -1 +1 @@
-5.8
+5.10

Podfile.dev

@@ -6,6 +6,6 @@ platform :ios, '13.0'
 target 'Sora' do
   use_frameworks!
   pod 'WebRTC', '127.6533.1.1'
-  pod 'SwiftLint', '0.51.0'
-  pod 'SwiftFormat/CLI', '0.53.2'
+  pod 'SwiftLint', '0.56.1'
+  pod 'SwiftFormat/CLI', '0.54.3'
 end

Sora/AspectRatio.swift

@@ -8,9 +8,9 @@ public enum AspectRatio {
     public func height(forWidth width: CGFloat) -> CGFloat {
         switch self {
         case .standard:
-            return width / 4 * 3
+            width / 4 * 3
         case .wide:
-            return width / 16 * 9
+            width / 16 * 9
         }
     }
 

Sora/AudioMode.swift

@@ -57,9 +57,9 @@ public enum AudioOutput {
     var portOverride: AVAudioSession.PortOverride {
         switch self {
         case .default:
-            return .none
+            .none
         case .speaker:
-            return .speaker
+            .speaker
         }
     }
 }

Sora/CameraVideoCapturer.swift

@@ -15,22 +15,18 @@ public final class CameraVideoCapturer {
     public static var devices: [AVCaptureDevice] { RTCCameraVideoCapturer.captureDevices() }
 
     /// 前面のカメラに対応するデバイス
-    public private(set) static var front: CameraVideoCapturer? = {
-        if let device = device(for: .front) {
-            return CameraVideoCapturer(device: device)
-        } else {
-            return nil
-        }
-    }()
+    public private(set) static var front: CameraVideoCapturer? = if let device = device(for: .front) {
+        CameraVideoCapturer(device: device)
+    } else {
+        nil
+    }
 
     /// 背面のカメラに対応するデバイス
-    public private(set) static var back: CameraVideoCapturer? = {
-        if let device = device(for: .back) {
-            return CameraVideoCapturer(device: device)
-        } else {
-            return nil
-        }
-    }()
+    public private(set) static var back: CameraVideoCapturer? = if let device = device(for: .back) {
+        CameraVideoCapturer(device: device)
+    } else {
+        nil
+    }
 
     /// 起動中のデバイス
     public private(set) static var current: CameraVideoCapturer?
@@ -359,26 +355,26 @@ public struct CameraSettings: CustomStringConvertible {
         /// 横方向のピクセル数を返します。
         public var width: Int32 {
             switch self {
-            case .qvga240p: return 320
-            case .vga480p: return 640
-            case .qhd540p: return 960
-            case .hd720p: return 1280
-            case .hd1080p: return 1920
-            case .uhd2160p: return 3840
-            case .uhd3024p: return 4032
+            case .qvga240p: 320
+            case .vga480p: 640
+            case .qhd540p: 960
+            case .hd720p: 1280
+            case .hd1080p: 1920
+            case .uhd2160p: 3840
+            case .uhd3024p: 4032
             }
         }
 
         /// 縦方向のピクセル数を返します。
         public var height: Int32 {
             switch self {
-            case .qvga240p: return 240
-            case .vga480p: return 480
-            case .qhd540p: return 540
-            case .hd720p: return 720
-            case .hd1080p: return 1080
-            case .uhd2160p: return 2160
-            case .uhd3024p: return 3024
+            case .qvga240p: 240
+            case .vga480p: 480
+            case .qhd540p: 540
+            case .hd720p: 720
+            case .hd1080p: 1080
+            case .uhd2160p: 2160
+            case .uhd3024p: 3024
             }
         }
     }

Sora/Configuration.swift

@@ -92,17 +92,17 @@ public struct Configuration {
     var isMultistream: Bool {
         switch role {
         default:
-            return multistreamEnabled
+            multistreamEnabled
         }
     }
 
     /// :nodoc:
     var isSender: Bool {
         switch role {
         case .sendonly, .sendrecv:
-            return true
+            true
         default:
-            return false
+            false
         }
     }
 

Sora/ConnectionState.swift

@@ -24,9 +24,9 @@ public enum ConnectionState {
     var isDisconnected: Bool {
         switch self {
         case .disconnecting, .disconnected:
-            return true
+            true
         default:
-            return false
+            false
         }
     }
 

Sora/ConnectionTimer.swift

@@ -7,9 +7,9 @@ enum ConnectionMonitor {
     var state: ConnectionState {
         switch self {
         case let .signalingChannel(chan):
-            return chan.state
+            chan.state
         case let .peerChannel(chan):
-            return ConnectionState(chan.state)
+            ConnectionState(chan.state)
         }
     }
 

Sora/DataChannel.swift

@@ -180,7 +180,6 @@ class BasicDataChannelDelegate: NSObject, RTCDataChannelDelegate {
                         }
                     }
                 }
-
             case "signaling", "push", "notify":
                 switch Signaling.decode(data) {
                 case let .success(signaling):

Sora/ICETransportPolicy.swift

@@ -25,9 +25,9 @@ extension ICETransportPolicy: CustomStringConvertible {
     public var description: String {
         switch self {
         case .relay:
-            return "relay"
+            "relay"
         case .all:
-            return "all"
+            "all"
         }
     }
 }

Sora/Logger.swift

@@ -24,35 +24,35 @@ extension LogType: CustomStringConvertible {
     public var description: String {
         switch self {
         case .sora:
-            return "Sora"
+            "Sora"
         case .webSocketChannel:
-            return "WebSocketChannel"
+            "WebSocketChannel"
         case .signaling:
-            return "Signaling"
+            "Signaling"
         case .signalingChannel:
-            return "SignalingChannel"
+            "SignalingChannel"
         case .peerChannel:
-            return "PeerChannel"
+            "PeerChannel"
         case .nativePeerChannel:
-            return "NativePeerChannel"
+            "NativePeerChannel"
         case .connectionTimer:
-            return "ConnectionTimer"
+            "ConnectionTimer"
         case .mediaChannel:
-            return "MediaChannel"
+            "MediaChannel"
         case .mediaStream:
-            return "MediaStream"
+            "MediaStream"
         case .cameraVideoCapturer:
-            return "CameraVideoCapturer"
+            "CameraVideoCapturer"
         case .videoRenderer:
-            return "VideoRenderer"
+            "VideoRenderer"
         case .videoView:
-            return "VideoView"
+            "VideoView"
         case let .user(name):
-            return name
+            name
         case .configurationViewController:
-            return "ConfigurationViewController"
+            "ConfigurationViewController"
         case .dataChannel:
-            return "DataChannel"
+            "DataChannel"
         }
     }
 }
@@ -101,19 +101,19 @@ extension LogLevel {
     var value: Int {
         switch self {
         case .fatal:
-            return 6
+            6
         case .error:
-            return 5
+            5
         case .warn:
-            return 4
+            4
         case .info:
-            return 3
+            3
         case .debug:
-            return 2
+            2
         case .trace:
-            return 1
+            1
         case .off:
-            return 0
+            0
         }
     }
 }
@@ -123,19 +123,19 @@ extension LogLevel: CustomStringConvertible {
     public var description: String {
         switch self {
         case .fatal:
-            return "FATAL"
+            "FATAL"
         case .error:
-            return "ERROR"
+            "ERROR"
         case .warn:
-            return "WARN"
+            "WARN"
         case .info:
-            return "INFO"
+            "INFO"
         case .debug:
-            return "DEBUG"
+            "DEBUG"
         case .trace:
-            return "TRACE"
+            "TRACE"
         case .off:
-            return "OFF"
+            "OFF"
         }
     }
 }

Sora/MediaChannel.swift

@@ -122,9 +122,9 @@ public final class MediaChannel {
     /// 接続中にのみ取得可能です。
     public var connectionTime: Int? {
         if let start = connectionStartTime {
-            return Int(Date().timeIntervalSince(start))
+            Int(Date().timeIntervalSince(start))
         } else {
-            return nil
+            nil
         }
     }
 

Sora/NativePeerChannelFactory.swift

@@ -60,18 +60,18 @@ class NativePeerChannelFactory {
                                  delegate: RTCPeerConnectionDelegate?) -> RTCPeerConnection?
     {
         if let proxy {
-            return nativeFactory.peerConnection(with: configuration.nativeValue,
-                                                constraints: constraints.nativeValue,
-                                                certificateVerifier: nil,
-                                                delegate: delegate,
-                                                proxyType: RTCProxyType.https,
-                                                proxyAgent: proxy.agent,
-                                                proxyHostname: proxy.host,
-                                                proxyPort: Int32(proxy.port),
-                                                proxyUsername: proxy.username ?? "",
-                                                proxyPassword: proxy.password ?? "")
+            nativeFactory.peerConnection(with: configuration.nativeValue,
+                                         constraints: constraints.nativeValue,
+                                         certificateVerifier: nil,
+                                         delegate: delegate,
+                                         proxyType: RTCProxyType.https,
+                                         proxyAgent: proxy.agent,
+                                         proxyHostname: proxy.host,
+                                         proxyPort: Int32(proxy.port),
+                                         proxyUsername: proxy.username ?? "",
+                                         proxyPassword: proxy.password ?? "")
         } else {
-            return nativeFactory.peerConnection(with: configuration.nativeValue, constraints: constraints.nativeValue, delegate: delegate)
+            nativeFactory.peerConnection(with: configuration.nativeValue, constraints: constraints.nativeValue, delegate: delegate)
         }
     }
 

Sora/PeerChannel.swift

@@ -840,7 +840,6 @@ class PeerChannel: NSObject, RTCPeerConnectionDelegate {
             }
         case let .reOffer(reOffer):
             createAndSendReAnswer(forReOffer: reOffer.sdp)
-
         case let .ping(ping):
             let pong = SignalingPong()
             if ping.statisticsEnabled == true {

Sora/Signaling.swift

@@ -148,33 +148,33 @@ public enum Signaling {
     public func typeName() -> String {
         switch self {
         case .connect:
-            return "connect"
+            "connect"
         case .offer:
-            return "offer"
+            "offer"
         case .answer:
-            return "answer"
+            "answer"
         case .update:
-            return "update"
+            "update"
         case .reOffer:
-            return "re-offer"
+            "re-offer"
         case .reAnswer:
-            return "re-answer"
+            "re-answer"
         case .candidate:
-            return "candidate"
+            "candidate"
         case .notify:
-            return "notify"
+            "notify"
         case .ping:
-            return "ping"
+            "ping"
         case .pong:
-            return "pong"
+            "pong"
         case .disconnect:
-            return "disconnect"
+            "disconnect"
         case .push:
-            return "push"
+            "push"
         case .switched:
-            return "switched"
+            "switched"
         case .redirect:
-            return "redirect"
+            "redirect"
         }
     }
 }

Sora/SoraDispatcher.swift

@@ -10,12 +10,11 @@ public enum SoraDispatcher {
 
     /// 指定されたキューを利用して、 block を非同期で実行します。
     public static func async(on queue: SoraDispatcher, block: @escaping () -> Void) {
-        let native: RTCDispatcherQueueType
-        switch queue {
+        let native: RTCDispatcherQueueType = switch queue {
         case .camera:
-            native = .typeCaptureSession
+            .typeCaptureSession
         case .audio:
-            native = .typeAudioSession
+            .typeAudioSession
         }
         RTCDispatcher.dispatchAsync(on: native, block: block)
     }