Fix swift 6 related warnings

mullvad · Aug 19, 2024 · 2b37ca7 · 2b37ca7
1 parent a4ad185
commit 2b37ca7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift b/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift
@@ -9,7 +9,7 @@
 import Foundation
 import MullvadTypes
 
-extension DecodingError: CustomErrorDescriptionProtocol {
+extension DecodingError: MullvadTypes.CustomErrorDescriptionProtocol {
     public var customErrorDescription: String? {
         switch self {
         case let .typeMismatch(type, context):
@@ -30,7 +30,7 @@ extension DecodingError: CustomErrorDescriptionProtocol {
     }
 }
 
-extension EncodingError: CustomErrorDescriptionProtocol {
+extension EncodingError: MullvadTypes.CustomErrorDescriptionProtocol {
     public var customErrorDescription: String? {
         switch self {
         case let .invalidValue(_, context):

diff --git a/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift b/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift
@@ -8,7 +8,7 @@
 
 import NetworkExtension
 
-extension NEVPNStatus: CustomStringConvertible {
+extension NEVPNStatus: Swift.CustomStringConvertible {
     public var description: String {
         switch self {
         case .connected:

diff --git a/ios/MullvadVPN/Extensions/RESTError+Display.swift b/ios/MullvadVPN/Extensions/RESTError+Display.swift
@@ -10,7 +10,7 @@ import Foundation
 import MullvadREST
 import MullvadTypes
 
-extension REST.Error: DisplayError {
+extension REST.Error: MullvadTypes.DisplayError {
     public var displayErrorDescription: String? {
         switch self {
         case let .network(urlError):

diff --git a/ios/MullvadVPN/Extensions/SKError+Localized.swift b/ios/MullvadVPN/Extensions/SKError+Localized.swift
@@ -8,7 +8,7 @@
 
 import StoreKit
 
-extension SKError: LocalizedError {
+extension SKError: Foundation.LocalizedError {
     public var errorDescription: String? {
         switch code {
         case .unknown:

diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift
@@ -15,7 +15,9 @@ extension PacketTunnelActor {
      `NEPacketTunnelProvider` provides the corresponding lifecycle method.
      */
     public nonisolated func onWake() {
-        tunnelMonitor.onWake()
+        Task {
+            await tunnelMonitor.onWake()
+        }
     }
 
     /**
@@ -24,6 +26,8 @@ extension PacketTunnelActor {
      `NEPacketTunnelProvider` provides the corresponding lifecycle method.
      */
     public nonisolated func onSleep() {
-        tunnelMonitor.onSleep()
+        Task {
+            await tunnelMonitor.onSleep()
+        }
     }
 }
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift
@@ -87,7 +87,7 @@ public actor PacketTunnelActor {
             for await event in channel {
                 guard let self else { return }
 
-                self.logger.debug("Received event: \(event.logFormat())")
+                await self.logger.debug("Received event: \(event.logFormat())")
 
                 let effects = await self.runReducer(event)