Coder Desktop swift 6 conformance

Author: ethanndickson

Coder Desktop/Coder Desktop/About.swift

@@ -30,6 +30,7 @@ enum About {
         return coder
     }
 
+    @MainActor
     static func open() {
         #if compiler(>=5.9) && canImport(AppKit)
             if #available(macOS 14, *) {

Coder Desktop/Coder Desktop/Coder_DesktopApp.swift

@@ -17,6 +17,7 @@ struct DesktopApp: App {
     }
 }
 
+@MainActor
 class AppDelegate: NSObject, NSApplicationDelegate {
     private var menuBarExtra: FluidMenuBarExtra?
     let vpn: PreviewVPN

Coder Desktop/Coder Desktop/Preview Content/PreviewVPN.swift

@@ -1,6 +1,7 @@
 import SwiftUI
 
-class PreviewVPN: Coder_Desktop.VPNService {
+@MainActor
+final class PreviewVPN: Coder_Desktop.VPNService {
     @Published var state: Coder_Desktop.VPNServiceState = .disabled
     @Published var agents: [Coder_Desktop.Agent] = [
         Agent(id: UUID(), name: "dogfood2", status: .error, copyableDNS: "asdf.coder", workspaceName: "dogfood2"),
@@ -22,36 +23,26 @@ class PreviewVPN: Coder_Desktop.VPNService {
         self.shouldFail = shouldFail
     }
 
-    private func setState(_ newState: Coder_Desktop.VPNServiceState) async {
-        await MainActor.run {
-            self.state = newState
-        }
-    }
-
     func start() async {
-        await setState(.connecting)
+        state = .connecting
         do {
-            try await Task.sleep(for: .seconds(1))
+            try await Task.sleep(for: .seconds(10))
         } catch {
-            await setState(.failed(.exampleError))
+            state = .failed(.exampleError)
             return
         }
-        if shouldFail {
-            await setState(.failed(.exampleError))
-        } else {
-            await setState(.connected)
-        }
+        state = shouldFail ? .failed(.exampleError) : .connected
     }
 
     func stop() async {
         guard state == .connected else { return }
-        await setState(.disconnecting)
+        state = .disconnecting
         do {
-            try await Task.sleep(for: .seconds(1))
+            try await Task.sleep(for: .seconds(10))
         } catch {
-            await setState(.failed(.exampleError))
+            state = .failed(.exampleError)
             return
         }
-        await setState(.disabled)
+        state = .disabled
     }
 }

Coder Desktop/Coder Desktop/SDK/Client.swift

@@ -22,7 +22,7 @@ struct CoderClient: Client {
         return enc
     }()
 
-    func request<T: Encodable>(
+    func request<T: Encodable & Sendable>(
         _ path: String,
         method: HTTPMethod,
         body: T? = nil

Coder Desktop/Coder Desktop/VPNService.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 protocol VPNService: ObservableObject {
     var state: VPNServiceState { get }
     var agents: [Agent] { get }

Coder Desktop/Coder DesktopTests/AgentsTests.swift

@@ -3,6 +3,7 @@ import SwiftUI
 import Testing
 import ViewInspector
 
+@MainActor
 @Suite(.timeLimit(.minutes(1)))
 struct AgentsTests {
     let vpn: MockVPNService
@@ -30,7 +31,6 @@ struct AgentsTests {
     }
 
     @Test
-    @MainActor
     func agentsWhenVPNOff() throws {
         vpn.state = .disabled
 
@@ -40,7 +40,6 @@ struct AgentsTests {
     }
 
     @Test
-    @MainActor
     func agentsWhenVPNOn() throws {
         vpn.state = .connected
         vpn.agents = createMockAgents(count: Theme.defaultVisibleAgents + 2)
@@ -51,7 +50,6 @@ struct AgentsTests {
     }
 
     @Test
-    @MainActor
     func showAllToggle() async throws {
         vpn.state = .connected
         vpn.agents = createMockAgents(count: 7)
@@ -78,7 +76,6 @@ struct AgentsTests {
     }
 
     @Test
-    @MainActor
     func noToggleFewAgents() throws {
         vpn.state = .connected
         vpn.agents = createMockAgents(count: 3)

Coder Desktop/Coder DesktopTests/LoginFormTests.swift

@@ -3,6 +3,7 @@ import SwiftUI
 import Testing
 import ViewInspector
 
+@MainActor
 @Suite(.timeLimit(.minutes(1)))
 struct LoginTests {
     let session: MockSession
@@ -16,7 +17,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testInitialView() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
@@ -28,7 +28,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testInvalidServerURL() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
@@ -40,7 +39,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testValidServerURL() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
@@ -55,7 +53,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testBackButton() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
@@ -70,7 +67,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testFailedAuthentication() async throws {
         let login = LoginForm<MockErrorClient, MockSession>()
 
@@ -87,7 +83,6 @@ struct LoginTests {
     }
 
     @Test
-    @MainActor
     func testSuccessfulLogin() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in

Coder Desktop/Coder DesktopTests/Util.swift

@@ -3,20 +3,19 @@ import Combine
 import SwiftUI
 import ViewInspector
 
+@MainActor
 class MockVPNService: VPNService, ObservableObject {
     @Published var state: Coder_Desktop.VPNServiceState = .disabled
     @Published var baseAccessURL: URL = .init(string: "https://dev.coder.com")!
     @Published var agents: [Coder_Desktop.Agent] = []
     var onStart: (() async -> Void)?
     var onStop: (() async -> Void)?
 
-    @MainActor
     func start() async {
         state = .connecting
         await onStart?()
     }
 
-    @MainActor
     func stop() async {
         state = .disconnecting
         await onStop?()

Coder Desktop/Coder DesktopTests/VPNMenuTests.swift

@@ -3,6 +3,7 @@ import SwiftUI
 import Testing
 import ViewInspector
 
+@MainActor
 @Suite(.timeLimit(.minutes(1)))
 struct VPNMenuTests {
     let vpn: MockVPNService
@@ -18,7 +19,6 @@ struct VPNMenuTests {
     }
 
     @Test
-    @MainActor
     func testVPNLoggedOut() async throws {
         session.hasSession = false
 
@@ -33,7 +33,6 @@ struct VPNMenuTests {
     }
 
     @Test
-    @MainActor
     func testStartStopCalled() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
@@ -58,7 +57,6 @@ struct VPNMenuTests {
     }
 
     @Test
-    @MainActor
     func testVPNDisabledWhileConnecting() async throws {
         vpn.state = .disabled
 
@@ -79,7 +77,6 @@ struct VPNMenuTests {
     }
 
     @Test
-    @MainActor
     func testVPNDisabledWhileDisconnecting() async throws {
         vpn.state = .disabled
 
@@ -106,7 +103,6 @@ struct VPNMenuTests {
     }
 
     @Test
-    @MainActor
     func testOffWhenFailed() async throws {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in

Coder Desktop/Coder DesktopTests/VPNStateTests.swift

@@ -3,6 +3,7 @@ import SwiftUI
 import Testing
 import ViewInspector
 
+@MainActor
 @Suite(.timeLimit(.minutes(1)))
 struct VPNStateTests {
     let vpn: MockVPNService
@@ -16,7 +17,6 @@ struct VPNStateTests {
     }
 
     @Test
-    @MainActor
     func testDisabledState() async throws {
         vpn.state = .disabled
 
@@ -30,7 +30,6 @@ struct VPNStateTests {
     }
 
     @Test
-    @MainActor
     func testConnectingState() async throws {
         vpn.state = .connecting
 
@@ -43,7 +42,6 @@ struct VPNStateTests {
     }
 
     @Test
-    @MainActor
     func testDisconnectingState() async throws {
         vpn.state = .disconnecting
 
@@ -56,7 +54,6 @@ struct VPNStateTests {
     }
 
     @Test
-    @MainActor
     func testFailedState() async throws {
         vpn.state = .failed(.exampleError)
 
@@ -69,7 +66,6 @@ struct VPNStateTests {
     }
 
     @Test
-    @MainActor
     func testDefaultState() async throws {
         vpn.state = .connected