Skip to content

Commit 4b77803

Browse files
ethanndicksonethanndickson
committed
feat: support user-supplied literal headers
1 parent 5d97953 commit 4b77803

16 files changed

+456
-47
lines changed

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

+123-19
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
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+
AA2C690F2D34F6920059AFAF /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = AA2C690E2D34F6920059AFAF /* LaunchAtLogin */; };
1213
AA3B3DA92D2D23860099996A /* VPNLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3B3DA12D2D23860099996A /* VPNLib.framework */; };
1314
AA3B3DBF2D2D23AB0099996A /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = AA3B3DBE2D2D23AB0099996A /* SwiftProtobuf */; };
1415
AA3B3DC12D2D23AB0099996A /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = AA3B3DC02D2D23AB0099996A /* SwiftProtobufPluginLibrary */; };
@@ -24,6 +25,7 @@
2425
AA8BC3392D0060A900E1ABAA /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC3382D0060A900E1ABAA /* ViewInspector */; };
2526
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */; };
2627
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */; };
28+
AA8EECF72D3A22320049DD09 /* SettingsAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AA8EECF62D3A22320049DD09 /* SettingsAccess */; };
2729
/* End PBXBuildFile section */
2830

2931
/* Begin PBXContainerItemProxy section */
@@ -229,7 +231,9 @@
229231
files = (
230232
AA3B40A42D2FC8560099996A /* CoderSDK.framework in Frameworks */,
231233
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */,
234+
AA2C690F2D34F6920059AFAF /* LaunchAtLogin in Frameworks */,
232235
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */,
236+
AA8EECF72D3A22320049DD09 /* SettingsAccess in Frameworks */,
233237
);
234238
runOnlyForDeploymentPostprocessing = 0;
235239
};
@@ -368,7 +372,7 @@
368372
buildRules = (
369373
);
370374
dependencies = (
371-
AA8BC33C2D0060E700E1ABAA /* PBXTargetDependency */,
375+
AA2C698C2D354A800059AFAF /* PBXTargetDependency */,
372376
9616793C2CFF117300B2B6DF /* PBXTargetDependency */,
373377
AA3B40A32D2FC8560099996A /* PBXTargetDependency */,
374378
);
@@ -379,6 +383,8 @@
379383
packageProductDependencies = (
380384
AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */,
381385
AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */,
386+
AA2C690E2D34F6920059AFAF /* LaunchAtLogin */,
387+
AA8EECF62D3A22320049DD09 /* SettingsAccess */,
382388
);
383389
productName = "Coder Desktop";
384390
productReference = 961678FC2CFF100D00B2B6DF /* Coder Desktop.app */;
@@ -395,6 +401,7 @@
395401
buildRules = (
396402
);
397403
dependencies = (
404+
AA2C698E2D354A840059AFAF /* PBXTargetDependency */,
398405
961679112CFF100E00B2B6DF /* PBXTargetDependency */,
399406
AA3B40BA2D2FDA5C0099996A /* PBXTargetDependency */,
400407
);
@@ -421,6 +428,7 @@
421428
buildRules = (
422429
);
423430
dependencies = (
431+
AA2C69902D354A880059AFAF /* PBXTargetDependency */,
424432
9616791B2CFF100E00B2B6DF /* PBXTargetDependency */,
425433
);
426434
fileSystemSynchronizedGroups = (
@@ -445,6 +453,7 @@
445453
buildRules = (
446454
);
447455
dependencies = (
456+
AA2C69922D354A8B0059AFAF /* PBXTargetDependency */,
448457
AA3B3DD02D2D249F0099996A /* PBXTargetDependency */,
449458
);
450459
fileSystemSynchronizedGroups = (
@@ -469,6 +478,7 @@
469478
buildRules = (
470479
);
471480
dependencies = (
481+
AA2C69942D354A8E0059AFAF /* PBXTargetDependency */,
472482
AA3B40C32D2FE7760099996A /* PBXTargetDependency */,
473483
);
474484
fileSystemSynchronizedGroups = (
@@ -494,6 +504,7 @@
494504
buildRules = (
495505
);
496506
dependencies = (
507+
AA2C69962D354A910059AFAF /* PBXTargetDependency */,
497508
AA3B3DAB2D2D23860099996A /* PBXTargetDependency */,
498509
AA3B3DAD2D2D23860099996A /* PBXTargetDependency */,
499510
);
@@ -520,6 +531,7 @@
520531
buildRules = (
521532
);
522533
dependencies = (
534+
AA2C69982D354A940059AFAF /* PBXTargetDependency */,
523535
);
524536
fileSystemSynchronizedGroups = (
525537
AA3B40922D2FC8560099996A /* CoderSDK */,
@@ -542,6 +554,7 @@
542554
buildRules = (
543555
);
544556
dependencies = (
557+
AA2C699A2D354A970059AFAF /* PBXTargetDependency */,
545558
AA3B409B2D2FC8560099996A /* PBXTargetDependency */,
546559
AA3B409D2D2FC8560099996A /* PBXTargetDependency */,
547560
);
@@ -607,11 +620,13 @@
607620
minimizedProjectReferenceProxies = 1;
608621
packageReferences = (
609622
AA8BC3372D00609700E1ABAA /* XCRemoteSwiftPackageReference "ViewInspector" */,
610-
AA8BC33A2D0060C500E1ABAA /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
611623
AA8BC33D2D0061F200E1ABAA /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */,
612624
AA8BC4CD2D00A4B700E1ABAA /* XCRemoteSwiftPackageReference "KeychainAccess" */,
613625
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */,
614626
AA3B3E8A2D2E0FE10099996A /* XCRemoteSwiftPackageReference "Mocker" */,
627+
AA2C690D2D34F6920059AFAF /* XCRemoteSwiftPackageReference "LaunchAtLogin-modern" */,
628+
AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
629+
AA8EECF52D3A22320049DD09 /* XCRemoteSwiftPackageReference "SettingsAccess" */,
615630
);
616631
preferredProjectObjectVersion = 77;
617632
productRefGroup = 961678FD2CFF100D00B2B6DF /* Products */;
@@ -764,6 +779,38 @@
764779
target = 9616792F2CFF117300B2B6DF /* VPN */;
765780
targetProxy = 9616793B2CFF117300B2B6DF /* PBXContainerItemProxy */;
766781
};
782+
AA2C698C2D354A800059AFAF /* PBXTargetDependency */ = {
783+
isa = PBXTargetDependency;
784+
productRef = AA2C698B2D354A800059AFAF /* SwiftLintBuildToolPlugin */;
785+
};
786+
AA2C698E2D354A840059AFAF /* PBXTargetDependency */ = {
787+
isa = PBXTargetDependency;
788+
productRef = AA2C698D2D354A840059AFAF /* SwiftLintBuildToolPlugin */;
789+
};
790+
AA2C69902D354A880059AFAF /* PBXTargetDependency */ = {
791+
isa = PBXTargetDependency;
792+
productRef = AA2C698F2D354A880059AFAF /* SwiftLintBuildToolPlugin */;
793+
};
794+
AA2C69922D354A8B0059AFAF /* PBXTargetDependency */ = {
795+
isa = PBXTargetDependency;
796+
productRef = AA2C69912D354A8B0059AFAF /* SwiftLintBuildToolPlugin */;
797+
};
798+
AA2C69942D354A8E0059AFAF /* PBXTargetDependency */ = {
799+
isa = PBXTargetDependency;
800+
productRef = AA2C69932D354A8E0059AFAF /* SwiftLintBuildToolPlugin */;
801+
};
802+
AA2C69962D354A910059AFAF /* PBXTargetDependency */ = {
803+
isa = PBXTargetDependency;
804+
productRef = AA2C69952D354A910059AFAF /* SwiftLintBuildToolPlugin */;
805+
};
806+
AA2C69982D354A940059AFAF /* PBXTargetDependency */ = {
807+
isa = PBXTargetDependency;
808+
productRef = AA2C69972D354A940059AFAF /* SwiftLintBuildToolPlugin */;
809+
};
810+
AA2C699A2D354A970059AFAF /* PBXTargetDependency */ = {
811+
isa = PBXTargetDependency;
812+
productRef = AA2C69992D354A970059AFAF /* SwiftLintBuildToolPlugin */;
813+
};
767814
AA3B3DAB2D2D23860099996A /* PBXTargetDependency */ = {
768815
isa = PBXTargetDependency;
769816
target = AA3B3DA02D2D23860099996A /* VPNLib */;
@@ -804,10 +851,6 @@
804851
target = AA3B40902D2FC8560099996A /* CoderSDK */;
805852
targetProxy = AA3B40C22D2FE7760099996A /* PBXContainerItemProxy */;
806853
};
807-
AA8BC33C2D0060E700E1ABAA /* PBXTargetDependency */ = {
808-
isa = PBXTargetDependency;
809-
productRef = AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */;
810-
};
811854
/* End PBXTargetDependency section */
812855

813856
/* Begin XCBuildConfiguration section */
@@ -1446,6 +1489,22 @@
14461489
version = 1.28.2;
14471490
};
14481491
};
1492+
AA2C690D2D34F6920059AFAF /* XCRemoteSwiftPackageReference "LaunchAtLogin-modern" */ = {
1493+
isa = XCRemoteSwiftPackageReference;
1494+
repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin-modern";
1495+
requirement = {
1496+
kind = exactVersion;
1497+
version = 1.1.0;
1498+
};
1499+
};
1500+
AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
1501+
isa = XCRemoteSwiftPackageReference;
1502+
repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
1503+
requirement = {
1504+
kind = upToNextMajorVersion;
1505+
minimumVersion = 0.58.0;
1506+
};
1507+
};
14491508
AA3B3E8A2D2E0FE10099996A /* XCRemoteSwiftPackageReference "Mocker" */ = {
14501509
isa = XCRemoteSwiftPackageReference;
14511510
repositoryURL = "https://github.com/WeTransfer/Mocker";
@@ -1462,14 +1521,6 @@
14621521
minimumVersion = 0.10.0;
14631522
};
14641523
};
1465-
AA8BC33A2D0060C500E1ABAA /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
1466-
isa = XCRemoteSwiftPackageReference;
1467-
repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
1468-
requirement = {
1469-
kind = upToNextMajorVersion;
1470-
minimumVersion = 0.57.1;
1471-
};
1472-
};
14731524
AA8BC33D2D0061F200E1ABAA /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */ = {
14741525
isa = XCRemoteSwiftPackageReference;
14751526
repositoryURL = "https://github.com/lfroms/fluid-menu-bar-extra";
@@ -1486,9 +1537,62 @@
14861537
kind = branch;
14871538
};
14881539
};
1540+
AA8EECF52D3A22320049DD09 /* XCRemoteSwiftPackageReference "SettingsAccess" */ = {
1541+
isa = XCRemoteSwiftPackageReference;
1542+
repositoryURL = "https://github.com/orchetect/SettingsAccess";
1543+
requirement = {
1544+
kind = upToNextMajorVersion;
1545+
minimumVersion = 2.1.0;
1546+
};
1547+
};
14891548
/* End XCRemoteSwiftPackageReference section */
14901549

14911550
/* Begin XCSwiftPackageProductDependency section */
1551+
AA2C690E2D34F6920059AFAF /* LaunchAtLogin */ = {
1552+
isa = XCSwiftPackageProductDependency;
1553+
package = AA2C690D2D34F6920059AFAF /* XCRemoteSwiftPackageReference "LaunchAtLogin-modern" */;
1554+
productName = LaunchAtLogin;
1555+
};
1556+
AA2C698B2D354A800059AFAF /* SwiftLintBuildToolPlugin */ = {
1557+
isa = XCSwiftPackageProductDependency;
1558+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1559+
productName = "plugin:SwiftLintBuildToolPlugin";
1560+
};
1561+
AA2C698D2D354A840059AFAF /* SwiftLintBuildToolPlugin */ = {
1562+
isa = XCSwiftPackageProductDependency;
1563+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1564+
productName = "plugin:SwiftLintBuildToolPlugin";
1565+
};
1566+
AA2C698F2D354A880059AFAF /* SwiftLintBuildToolPlugin */ = {
1567+
isa = XCSwiftPackageProductDependency;
1568+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1569+
productName = "plugin:SwiftLintBuildToolPlugin";
1570+
};
1571+
AA2C69912D354A8B0059AFAF /* SwiftLintBuildToolPlugin */ = {
1572+
isa = XCSwiftPackageProductDependency;
1573+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1574+
productName = "plugin:SwiftLintBuildToolPlugin";
1575+
};
1576+
AA2C69932D354A8E0059AFAF /* SwiftLintBuildToolPlugin */ = {
1577+
isa = XCSwiftPackageProductDependency;
1578+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1579+
productName = "plugin:SwiftLintBuildToolPlugin";
1580+
};
1581+
AA2C69952D354A910059AFAF /* SwiftLintBuildToolPlugin */ = {
1582+
isa = XCSwiftPackageProductDependency;
1583+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1584+
productName = "plugin:SwiftLintBuildToolPlugin";
1585+
};
1586+
AA2C69972D354A940059AFAF /* SwiftLintBuildToolPlugin */ = {
1587+
isa = XCSwiftPackageProductDependency;
1588+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1589+
productName = "plugin:SwiftLintBuildToolPlugin";
1590+
};
1591+
AA2C69992D354A970059AFAF /* SwiftLintBuildToolPlugin */ = {
1592+
isa = XCSwiftPackageProductDependency;
1593+
package = AA2C698A2D354A600059AFAF /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1594+
productName = "plugin:SwiftLintBuildToolPlugin";
1595+
};
14921596
AA3B3DBE2D2D23AB0099996A /* SwiftProtobuf */ = {
14931597
isa = XCSwiftPackageProductDependency;
14941598
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
@@ -1519,11 +1623,6 @@
15191623
package = AA8BC3372D00609700E1ABAA /* XCRemoteSwiftPackageReference "ViewInspector" */;
15201624
productName = ViewInspector;
15211625
};
1522-
AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */ = {
1523-
isa = XCSwiftPackageProductDependency;
1524-
package = AA8BC33A2D0060C500E1ABAA /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1525-
productName = "plugin:SwiftLintBuildToolPlugin";
1526-
};
15271626
AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */ = {
15281627
isa = XCSwiftPackageProductDependency;
15291628
package = AA8BC33D2D0061F200E1ABAA /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */;
@@ -1534,6 +1633,11 @@
15341633
package = AA8BC4CD2D00A4B700E1ABAA /* XCRemoteSwiftPackageReference "KeychainAccess" */;
15351634
productName = KeychainAccess;
15361635
};
1636+
AA8EECF62D3A22320049DD09 /* SettingsAccess */ = {
1637+
isa = XCSwiftPackageProductDependency;
1638+
package = AA8EECF52D3A22320049DD09 /* XCRemoteSwiftPackageReference "SettingsAccess" */;
1639+
productName = SettingsAccess;
1640+
};
15371641
/* End XCSwiftPackageProductDependency section */
15381642
};
15391643
rootObject = 961678F42CFF100D00B2B6DF /* Project object */;

‎Coder Desktop/Coder Desktop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "ec40e522ec1a2416e8e8f5cbe97424ab3e4a614e6ef453c10ea28e84e88b6771",
2+
"originHash" : "b52ef58779afac669f0b78fbf402855ebb45d016ab69ee39b5470c9442c12823",
33
"pins" : [
44
{
55
"identity" : "fluid-menu-bar-extra",
@@ -18,6 +18,15 @@
1818
"revision" : "e0c7eebc5a4465a3c4680764f26b7a61f567cdaf"
1919
}
2020
},
21+
{
22+
"identity" : "launchatlogin-modern",
23+
"kind" : "remoteSourceControl",
24+
"location" : "https://github.com/sindresorhus/LaunchAtLogin-modern",
25+
"state" : {
26+
"revision" : "a04ec1c363be3627734f6dad757d82f5d4fa8fcc",
27+
"version" : "1.1.0"
28+
}
29+
},
2130
{
2231
"identity" : "mocker",
2332
"kind" : "remoteSourceControl",
@@ -27,6 +36,15 @@
2736
"version" : "3.0.2"
2837
}
2938
},
39+
{
40+
"identity" : "settingsaccess",
41+
"kind" : "remoteSourceControl",
42+
"location" : "https://github.com/orchetect/SettingsAccess",
43+
"state" : {
44+
"revision" : "08e80c35501f273afa2f5d6f737429bbe395ff81",
45+
"version" : "2.1.0"
46+
}
47+
},
3048
{
3149
"identity" : "swift-protobuf",
3250
"kind" : "remoteSourceControl",
@@ -41,8 +59,8 @@
4159
"kind" : "remoteSourceControl",
4260
"location" : "https://github.com/SimplyDanny/SwiftLintPlugins",
4361
"state" : {
44-
"revision" : "f9731bef175c3eea3a0ca960f1be78fcc2bc7853",
45-
"version" : "0.57.1"
62+
"revision" : "fac0c3d3ac69b15ea5382275dbbd5e583a2e05fa",
63+
"version" : "0.58.0"
4664
}
4765
},
4866
{

‎Coder Desktop/Coder Desktop/About.swift

+1-9
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,7 @@ enum About {
3232

3333
@MainActor
3434
static func open() {
35-
#if compiler(>=5.9) && canImport(AppKit)
36-
if #available(macOS 14, *) {
37-
NSApp.activate()
38-
} else {
39-
NSApp.activate(ignoringOtherApps: true)
40-
}
41-
#else
42-
NSApp.activate(ignoringOtherApps: true)
43-
#endif
35+
appActivate()
4436
NSApp.orderFrontStandardAboutPanel(options: [
4537
.credits: credits,
4638
])

0 commit comments

Comments
 (0)