organize imports

hiroshihorie · hiroshihorie · commit 5d5167cba7ee · 2022-11-11T11:25:06.000+09:00
diff --git a/Sources/CHeaders/Header.h b/Sources/CHeaders/Header.h
@@ -1,8 +1,17 @@
-//
-//  Header.h
-//  
-//
-//  Created by David Liu on 6/17/22.
-//
+/*
+ * Copyright 2022 LiveKit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include <unistd.h>
diff --git a/Sources/LiveKit/Broadcast/BroadcastScreenCapturer.swift b/Sources/LiveKit/Broadcast/BroadcastScreenCapturer.swift
@@ -5,12 +5,15 @@
 //  Created by Alex-Dan Bumbu on 06/01/2021.
 //
 
-#if os(iOS)
-
 import Foundation
 import WebRTC
 import Promises
+
+#if canImport(UIKit)
 import UIKit
+#endif
+
+#if os(iOS)
 
 class BroadcastScreenCapturer: BufferCapturer {
     static let kRTCScreensharingSocketFD = "rtc_SSFD"
diff --git a/Sources/LiveKit/Broadcast/BroadcastServerSocketConnection.swift b/Sources/LiveKit/Broadcast/BroadcastServerSocketConnection.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import Darwin
+
 #if canImport(CHeaders)
 import CHeaders
 #endif
diff --git a/Sources/LiveKit/Broadcast/Uploader/LKSampleHandler.swift b/Sources/LiveKit/Broadcast/Uploader/LKSampleHandler.swift
@@ -7,11 +7,14 @@
 
 #if os(iOS)
 
-import ReplayKit
 import Promises
 import OSLog
 import Logging
 
+#if canImport(ReplayKit)
+import ReplayKit
+#endif
+
 open class LKSampleHandler: RPBroadcastSampleHandler {
 
     private var clientConnection: BroadcastUploadSocketConnection?
diff --git a/Sources/LiveKit/Broadcast/Uploader/SampleUploader.swift b/Sources/LiveKit/Broadcast/Uploader/SampleUploader.swift
@@ -9,7 +9,10 @@
 #if os(iOS)
 
 import Foundation
+
+#if canImport(ReplayKit)
 import ReplayKit
+#endif
 
 private enum Constants {
     static let bufferMaxLength = 10240
diff --git a/Sources/LiveKit/Core/Engine.swift b/Sources/LiveKit/Core/Engine.swift
@@ -17,7 +17,10 @@
 import Foundation
 import WebRTC
 import Promises
+
+#if canImport(Network)
 import Network
+#endif
 
 internal class Engine: MulticastDelegate<EngineDelegate> {
 
diff --git a/Sources/LiveKit/Core/Room.swift b/Sources/LiveKit/Core/Room.swift
@@ -15,9 +15,12 @@
  */
 
 import Foundation
-import Network
-import Promises
 import WebRTC
+import Promises
+
+#if canImport(Network)
+import Network
+#endif
 
 @objc
 public class Room: NSObject, Loggable {
diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -15,8 +15,8 @@
  */
 
 import Foundation
-import Promises
 import WebRTC
+import Promises
 
 internal class SignalClient: MulticastDelegate<SignalClientDelegate> {
 
diff --git a/Sources/LiveKit/Core/Transport.swift b/Sources/LiveKit/Core/Transport.swift
@@ -15,8 +15,8 @@
  */
 
 import Foundation
-import Promises
 import WebRTC
+import Promises
 import SwiftProtobuf
 
 internal typealias TransportOnOffer = (RTCSessionDescription) -> Promise<Void>
diff --git a/Sources/LiveKit/Extensions/LiveKit+AudioSession.swift b/Sources/LiveKit/Extensions/LiveKit+AudioSession.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 
 /// Function type for `LiveKit.onShouldConfigureAudioSession`.
diff --git a/Sources/LiveKit/Extensions/RTCConfiguration.swift b/Sources/LiveKit/Extensions/RTCConfiguration.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 
 extension RTCConfiguration {
diff --git a/Sources/LiveKit/Extensions/RTCDataChannel+Util.swift b/Sources/LiveKit/Extensions/RTCDataChannel+Util.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 
 extension RTCDataChannel {
diff --git a/Sources/LiveKit/Extensions/RTCPeerConnectionState.swift b/Sources/LiveKit/Extensions/RTCPeerConnectionState.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 
 extension RTCPeerConnectionState: CustomStringConvertible {
diff --git a/Sources/LiveKit/Extensions/RTCVideoCapturerDelegate+Buffer.swift b/Sources/LiveKit/Extensions/RTCVideoCapturerDelegate+Buffer.swift
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
+
+#if canImport(ReplayKit)
 import ReplayKit
+#endif
 
 extension FixedWidthInteger {
 
diff --git a/Sources/LiveKit/LiveKit.swift b/Sources/LiveKit/LiveKit.swift
@@ -15,9 +15,9 @@
  */
 
 import Foundation
-import Logging
-import Promises
 import WebRTC
+import Promises
+import Logging
 
 internal let logger = Logger(label: "LiveKitSDK")
 
diff --git a/Sources/LiveKit/ObjCSupport.swift b/Sources/LiveKit/ObjCSupport.swift
@@ -15,8 +15,8 @@
  */
 
 import Foundation
-import Promises
 import WebRTC
+import Promises
 
 // MARK: - Objective-C Support
 
diff --git a/Sources/LiveKit/Participant/LocalParticipant.swift b/Sources/LiveKit/Participant/LocalParticipant.swift
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 import Promises
+
+#if canImport(ReplayKit)
 import ReplayKit
+#endif
 
 @objc
 public class LocalParticipant: Participant {
diff --git a/Sources/LiveKit/Publications/RemoteTrackPublication.swift b/Sources/LiveKit/Publications/RemoteTrackPublication.swift
@@ -16,8 +16,8 @@
 
 import Foundation
 import CoreGraphics
-import Promises
 import WebRTC
+import Promises
 
 @objc
 public enum SubscriptionState: Int, Codable {
diff --git a/Sources/LiveKit/Support/AppStateListener.swift b/Sources/LiveKit/Support/AppStateListener.swift
@@ -15,7 +15,8 @@
  */
 
 import Foundation
-#if os(iOS)
+
+#if canImport(UIKit)
 import UIKit
 #endif
 
diff --git a/Sources/LiveKit/Support/NativeView.swift b/Sources/LiveKit/Support/NativeView.swift
@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-#if os(iOS)
+import Foundation
+
+#if canImport(UIKit)
 import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif
+
+#if os(iOS)
 public typealias NativeViewType = UIView
 #elseif os(macOS)
-// macOS
-import AppKit
 public typealias NativeViewType = NSView
 #endif
 
diff --git a/Sources/LiveKit/Support/NativeViewRepresentable.swift b/Sources/LiveKit/Support/NativeViewRepresentable.swift
@@ -14,14 +14,18 @@
  * limitations under the License.
  */
 
+import Foundation
 import SwiftUI
 
-#if os(iOS)
+#if canImport(UIKit)
 import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif
+
+#if os(iOS)
 public typealias NativeViewRepresentableType = UIViewRepresentable
 #elseif os(macOS)
-// macOS
-import AppKit
 public typealias NativeViewRepresentableType = NSViewRepresentable
 #endif
 
diff --git a/Sources/LiveKit/Support/TextView.swift b/Sources/LiveKit/Support/TextView.swift
@@ -16,9 +16,9 @@
 
 import Foundation
 
-#if os(iOS)
+#if canImport(UIKit)
 import UIKit
-#elseif os(macOS)
+#elseif canImport(AppKit)
 import AppKit
 #endif
 
diff --git a/Sources/LiveKit/SwiftUI/ObservableParticipant.swift b/Sources/LiveKit/SwiftUI/ObservableParticipant.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import SwiftUI
 import WebRTC
 
diff --git a/Sources/LiveKit/SwiftUI/ObservableRoom.swift b/Sources/LiveKit/SwiftUI/ObservableRoom.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import SwiftUI
 import WebRTC
 import Promises
diff --git a/Sources/LiveKit/SwiftUI/SwiftUIVideoView.swift b/Sources/LiveKit/SwiftUI/SwiftUIVideoView.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import SwiftUI
 
 /// This class receives ``TrackDelegate`` events since a struct can't be used for a delegate
diff --git a/Sources/LiveKit/Track/AudioTrack.swift b/Sources/LiveKit/Track/AudioTrack.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 
 @objc
diff --git a/Sources/LiveKit/Track/Capturers/CameraCapturer.swift b/Sources/LiveKit/Track/Capturers/CameraCapturer.swift
@@ -17,7 +17,10 @@
 import Foundation
 import WebRTC
 import Promises
+
+#if canImport(ReplayKit)
 import ReplayKit
+#endif
 
 public class CameraCapturer: VideoCapturer {
 
diff --git a/Sources/LiveKit/Track/Capturers/InAppCapturer.swift b/Sources/LiveKit/Track/Capturers/InAppCapturer.swift
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
-import ReplayKit
 import Promises
 
+#if canImport(ReplayKit)
+import ReplayKit
+#endif
+
 @available(macOS 11.0, iOS 11.0, *)
 public class InAppScreenCapturer: VideoCapturer {
 
diff --git a/Sources/LiveKit/Track/Capturers/MacOSScreenCapturer.swift b/Sources/LiveKit/Track/Capturers/MacOSScreenCapturer.swift
@@ -16,7 +16,6 @@
 
 import Foundation
 import WebRTC
-import ReplayKit
 import Promises
 
 #if canImport(ScreenCaptureKit)
diff --git a/Sources/LiveKit/Track/Capturers/VideoCapturer.swift b/Sources/LiveKit/Track/Capturers/VideoCapturer.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 import Promises
 
diff --git a/Sources/LiveKit/Track/Local/LocalVideoTrack.swift b/Sources/LiveKit/Track/Local/LocalVideoTrack.swift
@@ -17,7 +17,6 @@
 import Foundation
 import WebRTC
 import Promises
-import ReplayKit
 
 @objc
 public class LocalVideoTrack: Track, LocalTrack, VideoTrack {
diff --git a/Sources/LiveKit/Track/Remote/RemoteAudioTrack.swift b/Sources/LiveKit/Track/Remote/RemoteAudioTrack.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 import Promises
 
diff --git a/Sources/LiveKit/Track/Remote/RemoteVideoTrack.swift b/Sources/LiveKit/Track/Remote/RemoteVideoTrack.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 import Promises
 
diff --git a/Sources/LiveKit/Track/Support/Extensions.swift b/Sources/LiveKit/Track/Support/Extensions.swift
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-import WebRTC
+import Foundation
+import CoreImage
+
+#if canImport(ReplayKit)
 import ReplayKit
+#endif
 
 extension CIImage {
 
diff --git a/Sources/LiveKit/Track/Track.swift b/Sources/LiveKit/Track/Track.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Foundation
 import WebRTC
 import Promises
 
diff --git a/Sources/LiveKit/Track/VideoCaptureInterceptor.swift b/Sources/LiveKit/Track/VideoCaptureInterceptor.swift
diff --git a/Sources/LiveKit/Track/VideoTrack.swift b/Sources/LiveKit/Track/VideoTrack.swift
diff --git a/Sources/LiveKit/Types/ConnectionQuality.swift b/Sources/LiveKit/Types/ConnectionQuality.swift
diff --git a/Sources/LiveKit/Types/SessionDescription.swift b/Sources/LiveKit/Types/SessionDescription.swift
diff --git a/Sources/LiveKit/Types/TrackPublishState.swift b/Sources/LiveKit/Types/TrackPublishState.swift
diff --git a/Sources/LiveKit/Types/TrackSettings.swift b/Sources/LiveKit/Types/TrackSettings.swift
diff --git a/Sources/LiveKit/Types/TrackSource.swift b/Sources/LiveKit/Types/TrackSource.swift
diff --git a/Sources/LiveKit/Types/TrackStreamState.swift b/Sources/LiveKit/Types/TrackStreamState.swift
diff --git a/Sources/LiveKit/Types/TrackType.swift b/Sources/LiveKit/Types/TrackType.swift
diff --git a/Sources/LiveKit/Types/VideoQuality.swift b/Sources/LiveKit/Types/VideoQuality.swift
diff --git a/Sources/LiveKit/Types/VideoRotation.swift b/Sources/LiveKit/Types/VideoRotation.swift
