Skip to content

Commit e0c3139

Browse files
ethanndicksonethanndickson
committed
fmt
1 parent 087e35f commit e0c3139

File tree

5 files changed

+68
-59
lines changed

5 files changed

+68
-59
lines changed

‎Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj

+46-36
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
/* Begin PBXBuildFile section */
1010
961679332CFF117300B2B6DF /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 961679322CFF117300B2B6DF /* NetworkExtension.framework */; };
1111
9616793D2CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension in Embed System Extensions */ = {isa = PBXBuildFile; fileRef = 961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
12+
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679522CFF207900B2B6DF /* SwiftProtobuf */; };
13+
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */; };
14+
AA071D2C2D1041A7008D0B72 /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679E22D03144900B2B6DF /* SwiftProtobuf */; };
15+
AA071D2D2D1041A7008D0B72 /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */; };
1216
AA8BC3392D0060A900E1ABAA /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC3382D0060A900E1ABAA /* ViewInspector */; };
1317
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */; };
1418
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */; };
1519
AAD720D02D0816B200F6304D /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = AAD720CF2D0816B200F6304D /* Alamofire */; };
16-
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679522CFF207900B2B6DF /* SwiftProtobuf */; };
17-
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */; };
1820
/* End PBXBuildFile section */
1921

2022
/* Begin PBXContainerItemProxy section */
@@ -86,6 +88,13 @@
8688
);
8789
target = 9616792F2CFF117300B2B6DF /* VPN */;
8890
};
91+
AA071D842D1041E9008D0B72 /* Exceptions for "Proto" folder in "Coder Desktop" target */ = {
92+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
93+
membershipExceptions = (
94+
vpn.proto,
95+
);
96+
target = 961678FB2CFF100D00B2B6DF /* Coder Desktop */;
97+
};
8998
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
9099

91100
/* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -115,6 +124,7 @@
115124
961679432CFF149000B2B6DF /* Proto */ = {
116125
isa = PBXFileSystemSynchronizedRootGroup;
117126
exceptions = (
127+
AA071D842D1041E9008D0B72 /* Exceptions for "Proto" folder in "Coder Desktop" target */,
118128
961679472CFF14EA00B2B6DF /* Exceptions for "Proto" folder in "VPN" target */,
119129
);
120130
path = Proto;
@@ -159,9 +169,9 @@
159169
isa = PBXFrameworksBuildPhase;
160170
buildActionMask = 2147483647;
161171
files = (
162-
961679E52D03144C00B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */,
172+
AA071D2D2D1041A7008D0B72 /* SwiftProtobufPluginLibrary in Frameworks */,
173+
AA071D2C2D1041A7008D0B72 /* SwiftProtobuf in Frameworks */,
163174
961679332CFF117300B2B6DF /* NetworkExtension.framework in Frameworks */,
164-
961679E32D03144900B2B6DF /* SwiftProtobuf in Frameworks */,
165175
);
166176
runOnlyForDeploymentPostprocessing = 0;
167177
};
@@ -490,15 +500,15 @@
490500
target = 9616792F2CFF117300B2B6DF /* VPN */;
491501
targetProxy = 9616793B2CFF117300B2B6DF /* PBXContainerItemProxy */;
492502
};
493-
AA8BC33C2D0060E700E1ABAA /* PBXTargetDependency */ = {
494-
isa = PBXTargetDependency;
495-
productRef = AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */;
496-
};
497503
961679DE2D030E1D00B2B6DF /* PBXTargetDependency */ = {
498504
isa = PBXTargetDependency;
499505
target = 961678FB2CFF100D00B2B6DF /* Coder Desktop */;
500506
targetProxy = 961679DD2D030E1D00B2B6DF /* PBXContainerItemProxy */;
501507
};
508+
AA8BC33C2D0060E700E1ABAA /* PBXTargetDependency */ = {
509+
isa = PBXTargetDependency;
510+
productRef = AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */;
511+
};
502512
/* End PBXTargetDependency section */
503513

504514
/* Begin XCBuildConfiguration section */
@@ -894,6 +904,14 @@
894904
/* End XCConfigurationList section */
895905

896906
/* Begin XCRemoteSwiftPackageReference section */
907+
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
908+
isa = XCRemoteSwiftPackageReference;
909+
repositoryURL = "https://github.com/apple/swift-protobuf.git";
910+
requirement = {
911+
kind = exactVersion;
912+
version = 1.28.2;
913+
};
914+
};
897915
AA8BC3372D00609700E1ABAA /* XCRemoteSwiftPackageReference "ViewInspector" */ = {
898916
isa = XCRemoteSwiftPackageReference;
899917
repositoryURL = "https://github.com/nalexn/ViewInspector";
@@ -934,17 +952,29 @@
934952
minimumVersion = 5.10.2;
935953
};
936954
};
937-
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
938-
isa = XCRemoteSwiftPackageReference;
939-
repositoryURL = "https://github.com/apple/swift-protobuf.git";
940-
requirement = {
941-
kind = exactVersion;
942-
version = 1.28.2;
943-
};
944-
};
945955
/* End XCRemoteSwiftPackageReference section */
946956

947957
/* Begin XCSwiftPackageProductDependency section */
958+
961679522CFF207900B2B6DF /* SwiftProtobuf */ = {
959+
isa = XCSwiftPackageProductDependency;
960+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
961+
productName = SwiftProtobuf;
962+
};
963+
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */ = {
964+
isa = XCSwiftPackageProductDependency;
965+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
966+
productName = SwiftProtobufPluginLibrary;
967+
};
968+
961679E22D03144900B2B6DF /* SwiftProtobuf */ = {
969+
isa = XCSwiftPackageProductDependency;
970+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
971+
productName = SwiftProtobuf;
972+
};
973+
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */ = {
974+
isa = XCSwiftPackageProductDependency;
975+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
976+
productName = SwiftProtobufPluginLibrary;
977+
};
948978
AA8BC3382D0060A900E1ABAA /* ViewInspector */ = {
949979
isa = XCSwiftPackageProductDependency;
950980
package = AA8BC3372D00609700E1ABAA /* XCRemoteSwiftPackageReference "ViewInspector" */;
@@ -970,26 +1000,6 @@
9701000
package = AAD720CE2D0816B200F6304D /* XCRemoteSwiftPackageReference "Alamofire" */;
9711001
productName = Alamofire;
9721002
};
973-
961679522CFF207900B2B6DF /* SwiftProtobuf */ = {
974-
isa = XCSwiftPackageProductDependency;
975-
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
976-
productName = SwiftProtobuf;
977-
};
978-
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */ = {
979-
isa = XCSwiftPackageProductDependency;
980-
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
981-
productName = SwiftProtobufPluginLibrary;
982-
};
983-
961679E22D03144900B2B6DF /* SwiftProtobuf */ = {
984-
isa = XCSwiftPackageProductDependency;
985-
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
986-
productName = SwiftProtobuf;
987-
};
988-
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */ = {
989-
isa = XCSwiftPackageProductDependency;
990-
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
991-
productName = SwiftProtobufPluginLibrary;
992-
};
9931003
/* End XCSwiftPackageProductDependency section */
9941004
};
9951005
rootObject = 961678F42CFF100D00B2B6DF /* Project object */;

‎Coder Desktop/Coder Desktop/Preview Content/PreviewClient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import SwiftUI
21
import Alamofire
2+
import SwiftUI
33

44
struct PreviewClient: Client {
55
init(url _: URL, token _: String? = nil) {}

‎Coder Desktop/Coder Desktop/SDK/Client.swift

+7-8
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ struct CoderClient: Client {
3636
headers: headers
3737
).serializingData().response
3838
switch out.result {
39-
case .success(let data):
39+
case let .success(data):
4040
return HTTPResponse(resp: out.response!, data: data, req: out.request)
41-
case .failure(let error):
41+
case let .failure(error):
4242
throw ClientError.reqError(error)
4343
}
4444
}
@@ -55,9 +55,9 @@ struct CoderClient: Client {
5555
headers: headers
5656
).serializingData().response
5757
switch out.result {
58-
case .success(let data):
58+
case let .success(data):
5959
return HTTPResponse(resp: out.response!, data: data, req: out.request)
60-
case .failure(let error):
60+
case let .failure(error):
6161
throw ClientError.reqError(error)
6262
}
6363
}
@@ -80,7 +80,6 @@ struct CoderClient: Client {
8080
enum Headers {
8181
static let sessionToken = "Coder-Session-Token"
8282
}
83-
8483
}
8584

8685
struct HTTPResponse {
@@ -130,11 +129,11 @@ enum ClientError: Error {
130129

131130
var description: String {
132131
switch self {
133-
case .apiError(let error):
132+
case let .apiError(error):
134133
return error.description
135-
case .reqError(let error):
134+
case let .reqError(error):
136135
return error.localizedDescription
137-
case .unexpectedResponse(let data):
136+
case let .unexpectedResponse(data):
138137
return "Unexpected response: \(data)"
139138
}
140139
}

‎Coder Desktop/Coder Desktop/Views/LoginForm.swift

+11-11
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ struct LoginForm<C: Client, S: Session>: View {
4040
baseAccessURL = session.baseAccessURL?.absoluteString ?? baseAccessURL
4141
sessionToken = ""
4242
}.padding(.vertical, 35)
43-
.alert("Error", isPresented: Binding(
44-
get: { loginError != nil },
45-
set: { isPresented in
46-
if !isPresented {
47-
loginError = nil
48-
}
43+
.alert("Error", isPresented: Binding(
44+
get: { loginError != nil },
45+
set: { isPresented in
46+
if !isPresented {
47+
loginError = nil
4948
}
50-
)) {
51-
Button("OK", role: .cancel) {}.keyboardShortcut(.defaultAction)
52-
} message: {
53-
Text(loginError?.description ?? "")
5449
}
50+
)) {
51+
Button("OK", role: .cancel) {}.keyboardShortcut(.defaultAction)
52+
} message: {
53+
Text(loginError?.description ?? "")
54+
}
5555
}.padding()
5656
.frame(width: 450, height: 220)
5757
.disabled(loading)
@@ -171,7 +171,7 @@ enum LoginError {
171171
switch self {
172172
case .invalidURL:
173173
return "Invalid URL"
174-
case .failedAuth(let err):
174+
case let .failedAuth(err):
175175
return "Could not authenticate with Coder deployment:\n\(err.description)"
176176
}
177177
}

‎Coder Desktop/Coder DesktopTests/Util.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ struct MockClient: Client {
6767
}
6868

6969
struct MockErrorClient: Client {
70-
init(url: URL, token: String?) {}
71-
func user(_ ident: String) async throws(ClientError) -> Coder_Desktop.User {
70+
init(url _: URL, token _: String?) {}
71+
func user(_: String) async throws(ClientError) -> Coder_Desktop.User {
7272
throw ClientError.reqError(.explicitlyCancelled)
7373
}
7474
}
7575

76-
extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary { }
76+
extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}

0 commit comments

Comments
 (0)