Xcode 26 beta build errors (Swift 6.2) (#717)

Resolves #716 

Fixes new build errors mostly related to:
- `static` properties validated more aggressively for `Sendable`
conformance
- local flags in audio conversion
- awkward access to `BundleInfo` - property wrappers cannot be
`nonisolated(unsafe)` - `actor` workaround shouldn't be necessary after
removing that

Also, unifies concurrency-related `#if`-ology.

Author: pblazej

.changes/xcode-26

@@ -0,0 +1 @@
+patch type="fixed" "Fixed Xcode 26 build errors with Swift 6.2"

Sources/LiveKit/Audio/Manager/AudioManager.swift

@@ -28,7 +28,7 @@ internal import LiveKitWebRTC
 public class AudioManager: Loggable {
     // MARK: - Public
 
-    #if compiler(>=6.0)
+    #if swift(>=6.0)
     public nonisolated(unsafe) static let shared = AudioManager()
     #else
     public static let shared = AudioManager()

Sources/LiveKit/Broadcast/BroadcastBundleInfo.swift

@@ -18,7 +18,7 @@
 
 import Foundation
 
-actor BroadcastBundleInfo {
+enum BroadcastBundleInfo {
     /// Identifier of the app group shared by the primary app and broadcast extension.
     static var groupIdentifier: String? {
         if let override = groupIdentifierOverride { return override }
@@ -45,11 +45,13 @@ actor BroadcastBundleInfo {
         socketPath != nil && screenSharingExtension != nil
     }
 
-    @BundleInfo("RTCAppGroupIdentifier")
-    private static var groupIdentifierOverride: String?
+    private static var groupIdentifierOverride: String? {
+        Bundle.main.infoDictionary?["RTCAppGroupIdentifier"] as? String
+    }
 
-    @BundleInfo("RTCScreenSharingExtension")
-    private static var screenSharingExtensionOverride: String?
+    private static var screenSharingExtensionOverride: String? {
+        Bundle.main.infoDictionary?["RTCScreenSharingExtension"] as? String
+    }
 
     private static let extensionSuffix = "broadcast"
     private static let socketFileDescriptor = "rtc_SSFD"

Sources/LiveKit/Broadcast/Support/BundleInfo.swift

@@ -31,19 +31,19 @@ private extension Array where Element: LKRTCVideoCodecInfo {
     }
 }
 
-private class VideoEncoderFactory: LKRTCDefaultVideoEncoderFactory {
+private class VideoEncoderFactory: LKRTCDefaultVideoEncoderFactory, @unchecked Sendable {
     override func supportedCodecs() -> [LKRTCVideoCodecInfo] {
         super.supportedCodecs().rewriteCodecsIfNeeded()
     }
 }
 
-private class VideoDecoderFactory: LKRTCDefaultVideoDecoderFactory {
+private class VideoDecoderFactory: LKRTCDefaultVideoDecoderFactory, @unchecked Sendable {
     override func supportedCodecs() -> [LKRTCVideoCodecInfo] {
         super.supportedCodecs().rewriteCodecsIfNeeded()
     }
 }
 
-private class VideoEncoderFactorySimulcast: LKRTCVideoEncoderFactorySimulcast {
+private class VideoEncoderFactorySimulcast: LKRTCVideoEncoderFactorySimulcast, @unchecked Sendable {
     override func supportedCodecs() -> [LKRTCVideoCodecInfo] {
         super.supportedCodecs().rewriteCodecsIfNeeded()
     }
@@ -74,14 +74,14 @@ actor RTC {
 
     // global properties are already lazy
 
-    private static let encoderFactory: LKRTCVideoEncoderFactory = {
+    private static let encoderFactory: LKRTCVideoEncoderFactory & Sendable = {
         let encoderFactory = VideoEncoderFactory()
         return VideoEncoderFactorySimulcast(primary: encoderFactory,
                                             fallback: encoderFactory)
 
     }()
 
-    private static let decoderFactory = VideoDecoderFactory()
+    private static let decoderFactory: LKRTCVideoDecoderFactory & Sendable = VideoDecoderFactory()
 
     static let audioProcessingModule: LKRTCDefaultAudioProcessingModule = .init()
 

Sources/LiveKit/Core/RTC.swift

@@ -15,7 +15,7 @@
  */
 
 import Accelerate
-import AVFoundation
+@preconcurrency import AVFoundation
 
 public extension AVAudioPCMBuffer {
     func resample(toSampleRate targetSampleRate: Double) -> AVAudioPCMBuffer? {
@@ -48,7 +48,12 @@ public extension AVAudioPCMBuffer {
             return nil
         }
 
+        #if swift(>=6.0)
+        // Won't be accessed concurrently, marking as nonisolated(unsafe) to avoid Atomics.
+        nonisolated(unsafe) var isDone = false
+        #else
         var isDone = false
+        #endif
         let inputBlock: AVAudioConverterInputBlock = { _, outStatus in
             if isDone {
                 outStatus.pointee = .noDataNow

Sources/LiveKit/Extensions/AVAudioPCMBuffer.swift

@@ -41,13 +41,17 @@ extension LKRTCSessionDescription: @unchecked Swift.Sendable {}
 extension LKRTCStatisticsReport: @unchecked Swift.Sendable {}
 extension LKRTCVideoCodecInfo: @unchecked Swift.Sendable {}
 extension LKRTCVideoFrame: @unchecked Swift.Sendable {}
+extension LKRTCRtpCapabilities: @unchecked Swift.Sendable {}
 
 // MARK: Mutable classes - to be validated
 
 extension LKRTCConfiguration: @unchecked Swift.Sendable {}
 extension LKRTCVideoCapturer: @unchecked Swift.Sendable {}
+extension LKRTCDefaultAudioProcessingModule: @unchecked Swift.Sendable {}
 
 // MARK: Collections
 
 extension NSHashTable: @unchecked Swift.Sendable {} // cannot specify Obj-C generics
+#if swift(<6.2)
 extension Dictionary: Swift.Sendable where Key: Sendable, Value: Sendable {}
+#endif

Sources/LiveKit/Extensions/Sendable.swift

@@ -45,7 +45,12 @@ final class AudioConverter: Sendable {
 
     func convert(from inputBuffer: AVAudioPCMBuffer) {
         var error: NSError?
+        #if swift(>=6.0)
+        // Won't be accessed concurrently, marking as nonisolated(unsafe) to avoid Atomics.
+        nonisolated(unsafe) var bufferFilled = false
+        #else
         var bufferFilled = false
+        #endif
 
         converter.convert(to: outputBuffer, error: &error) { _, outStatus in
             if bufferFilled {

Sources/LiveKit/Support/Audio/AudioConverter.swift

@@ -231,7 +231,7 @@ public class VideoView: NativeView, Loggable {
 
     // MARK: - Private
 
-    #if compiler(>=6.0)
+    #if swift(>=6.0)
     private nonisolated(unsafe) var _primaryRenderer: NativeRendererView?
     private nonisolated(unsafe) var _secondaryRenderer: NativeRendererView?
     #else