Skip to content

Commit 8987c26

Browse files
spikecurtisspikecurtis
committed
WIP VPN protocol
1 parent 2c1e8d3 commit 8987c26

File tree

12 files changed

+3190
-3
lines changed

12 files changed

+3190
-3
lines changed

Diff for: ‎Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj

+170
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
AA8BC3392D0060A900E1ABAA /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC3382D0060A900E1ABAA /* ViewInspector */; };
1313
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */; };
1414
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */; };
15+
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679522CFF207900B2B6DF /* SwiftProtobuf */; };
16+
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */; };
17+
961679E32D03144900B2B6DF /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679E22D03144900B2B6DF /* SwiftProtobuf */; };
18+
961679E52D03144C00B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */; };
1519
/* End PBXBuildFile section */
1620

1721
/* Begin PBXContainerItemProxy section */
@@ -36,6 +40,13 @@
3640
remoteGlobalIDString = 9616792F2CFF117300B2B6DF;
3741
remoteInfo = VPN;
3842
};
43+
961679DD2D030E1D00B2B6DF /* PBXContainerItemProxy */ = {
44+
isa = PBXContainerItemProxy;
45+
containerPortal = 961678F42CFF100D00B2B6DF /* Project object */;
46+
proxyType = 1;
47+
remoteGlobalIDString = 961678FB2CFF100D00B2B6DF;
48+
remoteInfo = "Coder Desktop";
49+
};
3950
/* End PBXContainerItemProxy section */
4051

4152
/* Begin PBXCopyFilesBuildPhase section */
@@ -58,6 +69,7 @@
5869
961679192CFF100E00B2B6DF /* Coder DesktopUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Coder DesktopUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5970
961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.coder.Coder-Desktop.VPN.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
6071
961679322CFF117300B2B6DF /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
72+
961679D92D030E1D00B2B6DF /* ProtoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ProtoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6173
/* End PBXFileReference section */
6274

6375
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -68,6 +80,13 @@
6880
);
6981
target = 9616792F2CFF117300B2B6DF /* VPN */;
7082
};
83+
961679472CFF14EA00B2B6DF /* Exceptions for "Proto" folder in "VPN" target */ = {
84+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
85+
membershipExceptions = (
86+
Sender.swift,
87+
);
88+
target = 9616792F2CFF117300B2B6DF /* VPN */;
89+
};
7190
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
7291

7392
/* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -94,6 +113,19 @@
94113
path = VPN;
95114
sourceTree = "<group>";
96115
};
116+
961679432CFF149000B2B6DF /* Proto */ = {
117+
isa = PBXFileSystemSynchronizedRootGroup;
118+
exceptions = (
119+
961679472CFF14EA00B2B6DF /* Exceptions for "Proto" folder in "VPN" target */,
120+
);
121+
path = Proto;
122+
sourceTree = "<group>";
123+
};
124+
961679DA2D030E1D00B2B6DF /* ProtoTests */ = {
125+
isa = PBXFileSystemSynchronizedRootGroup;
126+
path = ProtoTests;
127+
sourceTree = "<group>";
128+
};
97129
/* End PBXFileSystemSynchronizedRootGroup section */
98130

99131
/* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +135,8 @@
103135
files = (
104136
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */,
105137
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */,
138+
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */,
139+
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */,
106140
);
107141
runOnlyForDeploymentPostprocessing = 0;
108142
};
@@ -125,7 +159,16 @@
125159
isa = PBXFrameworksBuildPhase;
126160
buildActionMask = 2147483647;
127161
files = (
162+
961679E52D03144C00B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */,
128163
961679332CFF117300B2B6DF /* NetworkExtension.framework in Frameworks */,
164+
961679E32D03144900B2B6DF /* SwiftProtobuf in Frameworks */,
165+
);
166+
runOnlyForDeploymentPostprocessing = 0;
167+
};
168+
961679D62D030E1D00B2B6DF /* Frameworks */ = {
169+
isa = PBXFrameworksBuildPhase;
170+
buildActionMask = 2147483647;
171+
files = (
129172
);
130173
runOnlyForDeploymentPostprocessing = 0;
131174
};
@@ -135,6 +178,8 @@
135178
961678F32CFF100D00B2B6DF = {
136179
isa = PBXGroup;
137180
children = (
181+
961679432CFF149000B2B6DF /* Proto */,
182+
961679DA2D030E1D00B2B6DF /* ProtoTests */,
138183
961678FE2CFF100D00B2B6DF /* Coder Desktop */,
139184
961679122CFF100E00B2B6DF /* Coder DesktopTests */,
140185
9616791C2CFF100E00B2B6DF /* Coder DesktopUITests */,
@@ -151,6 +196,7 @@
151196
9616790F2CFF100E00B2B6DF /* Coder DesktopTests.xctest */,
152197
961679192CFF100E00B2B6DF /* Coder DesktopUITests.xctest */,
153198
961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */,
199+
961679D92D030E1D00B2B6DF /* ProtoTests.xctest */,
154200
);
155201
name = Products;
156202
sourceTree = "<group>";
@@ -183,11 +229,14 @@
183229
);
184230
fileSystemSynchronizedGroups = (
185231
961678FE2CFF100D00B2B6DF /* Coder Desktop */,
232+
961679432CFF149000B2B6DF /* Proto */,
186233
);
187234
name = "Coder Desktop";
188235
packageProductDependencies = (
189236
AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */,
190237
AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */,
238+
961679522CFF207900B2B6DF /* SwiftProtobuf */,
239+
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */,
191240
);
192241
productName = "Coder Desktop";
193242
productReference = 961678FC2CFF100D00B2B6DF /* Coder Desktop.app */;
@@ -257,11 +306,36 @@
257306
);
258307
name = VPN;
259308
packageProductDependencies = (
309+
961679E22D03144900B2B6DF /* SwiftProtobuf */,
310+
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */,
260311
);
261312
productName = VPN;
262313
productReference = 961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */;
263314
productType = "com.apple.product-type.system-extension";
264315
};
316+
961679D82D030E1D00B2B6DF /* ProtoTests */ = {
317+
isa = PBXNativeTarget;
318+
buildConfigurationList = 961679DF2D030E1D00B2B6DF /* Build configuration list for PBXNativeTarget "ProtoTests" */;
319+
buildPhases = (
320+
961679D52D030E1D00B2B6DF /* Sources */,
321+
961679D62D030E1D00B2B6DF /* Frameworks */,
322+
961679D72D030E1D00B2B6DF /* Resources */,
323+
);
324+
buildRules = (
325+
);
326+
dependencies = (
327+
961679DE2D030E1D00B2B6DF /* PBXTargetDependency */,
328+
);
329+
fileSystemSynchronizedGroups = (
330+
961679DA2D030E1D00B2B6DF /* ProtoTests */,
331+
);
332+
name = ProtoTests;
333+
packageProductDependencies = (
334+
);
335+
productName = ProtoTests;
336+
productReference = 961679D92D030E1D00B2B6DF /* ProtoTests.xctest */;
337+
productType = "com.apple.product-type.bundle.unit-test";
338+
};
265339
/* End PBXNativeTarget section */
266340

267341
/* Begin PBXProject section */
@@ -286,6 +360,10 @@
286360
9616792F2CFF117300B2B6DF = {
287361
CreatedOnToolsVersion = 16.1;
288362
};
363+
961679D82D030E1D00B2B6DF = {
364+
CreatedOnToolsVersion = 16.1;
365+
TestTargetID = 961678FB2CFF100D00B2B6DF;
366+
};
289367
};
290368
};
291369
buildConfigurationList = 961678F72CFF100D00B2B6DF /* Build configuration list for PBXProject "Coder Desktop" */;
@@ -302,6 +380,7 @@
302380
AA8BC33A2D0060C500E1ABAA /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
303381
AA8BC33D2D0061F200E1ABAA /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */,
304382
AA8BC4CD2D00A4B700E1ABAA /* XCRemoteSwiftPackageReference "KeychainAccess" */,
383+
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */,
305384
);
306385
preferredProjectObjectVersion = 77;
307386
productRefGroup = 961678FD2CFF100D00B2B6DF /* Products */;
@@ -312,6 +391,7 @@
312391
9616790E2CFF100E00B2B6DF /* Coder DesktopTests */,
313392
961679182CFF100E00B2B6DF /* Coder DesktopUITests */,
314393
9616792F2CFF117300B2B6DF /* VPN */,
394+
961679D82D030E1D00B2B6DF /* ProtoTests */,
315395
);
316396
};
317397
/* End PBXProject section */
@@ -345,6 +425,13 @@
345425
);
346426
runOnlyForDeploymentPostprocessing = 0;
347427
};
428+
961679D72D030E1D00B2B6DF /* Resources */ = {
429+
isa = PBXResourcesBuildPhase;
430+
buildActionMask = 2147483647;
431+
files = (
432+
);
433+
runOnlyForDeploymentPostprocessing = 0;
434+
};
348435
/* End PBXResourcesBuildPhase section */
349436

350437
/* Begin PBXSourcesBuildPhase section */
@@ -376,6 +463,13 @@
376463
);
377464
runOnlyForDeploymentPostprocessing = 0;
378465
};
466+
961679D52D030E1D00B2B6DF /* Sources */ = {
467+
isa = PBXSourcesBuildPhase;
468+
buildActionMask = 2147483647;
469+
files = (
470+
);
471+
runOnlyForDeploymentPostprocessing = 0;
472+
};
379473
/* End PBXSourcesBuildPhase section */
380474

381475
/* Begin PBXTargetDependency section */
@@ -398,6 +492,11 @@
398492
isa = PBXTargetDependency;
399493
productRef = AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */;
400494
};
495+
961679DE2D030E1D00B2B6DF /* PBXTargetDependency */ = {
496+
isa = PBXTargetDependency;
497+
target = 961678FB2CFF100D00B2B6DF /* Coder Desktop */;
498+
targetProxy = 961679DD2D030E1D00B2B6DF /* PBXContainerItemProxy */;
499+
};
401500
/* End PBXTargetDependency section */
402501

403502
/* Begin XCBuildConfiguration section */
@@ -695,6 +794,40 @@
695794
};
696795
name = Release;
697796
};
797+
961679E02D030E1D00B2B6DF /* Debug */ = {
798+
isa = XCBuildConfiguration;
799+
buildSettings = {
800+
BUNDLE_LOADER = "$(TEST_HOST)";
801+
CODE_SIGN_STYLE = Automatic;
802+
CURRENT_PROJECT_VERSION = 1;
803+
DEVELOPMENT_TEAM = 4399GN35BJ;
804+
GENERATE_INFOPLIST_FILE = YES;
805+
MARKETING_VERSION = 1.0;
806+
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
807+
PRODUCT_NAME = "$(TARGET_NAME)";
808+
SWIFT_EMIT_LOC_STRINGS = NO;
809+
SWIFT_VERSION = 5.0;
810+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
811+
};
812+
name = Debug;
813+
};
814+
961679E12D030E1D00B2B6DF /* Release */ = {
815+
isa = XCBuildConfiguration;
816+
buildSettings = {
817+
BUNDLE_LOADER = "$(TEST_HOST)";
818+
CODE_SIGN_STYLE = Automatic;
819+
CURRENT_PROJECT_VERSION = 1;
820+
DEVELOPMENT_TEAM = 4399GN35BJ;
821+
GENERATE_INFOPLIST_FILE = YES;
822+
MARKETING_VERSION = 1.0;
823+
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
824+
PRODUCT_NAME = "$(TARGET_NAME)";
825+
SWIFT_EMIT_LOC_STRINGS = NO;
826+
SWIFT_VERSION = 5.0;
827+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
828+
};
829+
name = Release;
830+
};
698831
/* End XCBuildConfiguration section */
699832

700833
/* Begin XCConfigurationList section */
@@ -743,6 +876,15 @@
743876
defaultConfigurationIsVisible = 0;
744877
defaultConfigurationName = Release;
745878
};
879+
961679DF2D030E1D00B2B6DF /* Build configuration list for PBXNativeTarget "ProtoTests" */ = {
880+
isa = XCConfigurationList;
881+
buildConfigurations = (
882+
961679E02D030E1D00B2B6DF /* Debug */,
883+
961679E12D030E1D00B2B6DF /* Release */,
884+
);
885+
defaultConfigurationIsVisible = 0;
886+
defaultConfigurationName = Release;
887+
};
746888
/* End XCConfigurationList section */
747889

748890
/* Begin XCRemoteSwiftPackageReference section */
@@ -778,6 +920,14 @@
778920
kind = branch;
779921
};
780922
};
923+
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
924+
isa = XCRemoteSwiftPackageReference;
925+
repositoryURL = "https://github.com/apple/swift-protobuf.git";
926+
requirement = {
927+
kind = exactVersion;
928+
version = 1.28.2;
929+
};
930+
};
781931
/* End XCRemoteSwiftPackageReference section */
782932

783933
/* Begin XCSwiftPackageProductDependency section */
@@ -801,6 +951,26 @@
801951
package = AA8BC4CD2D00A4B700E1ABAA /* XCRemoteSwiftPackageReference "KeychainAccess" */;
802952
productName = KeychainAccess;
803953
};
954+
961679522CFF207900B2B6DF /* SwiftProtobuf */ = {
955+
isa = XCSwiftPackageProductDependency;
956+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
957+
productName = SwiftProtobuf;
958+
};
959+
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */ = {
960+
isa = XCSwiftPackageProductDependency;
961+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
962+
productName = SwiftProtobufPluginLibrary;
963+
};
964+
961679E22D03144900B2B6DF /* SwiftProtobuf */ = {
965+
isa = XCSwiftPackageProductDependency;
966+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
967+
productName = SwiftProtobuf;
968+
};
969+
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */ = {
970+
isa = XCSwiftPackageProductDependency;
971+
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
972+
productName = SwiftProtobufPluginLibrary;
973+
};
804974
/* End XCSwiftPackageProductDependency section */
805975
};
806976
rootObject = 961678F42CFF100D00B2B6DF /* Project object */;

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

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "726475d6c2c0355de7a4de72708853eaf53eb295e791efe2cc4b8eb5ce4e9ae8",
2+
"originHash" : "9a3c90fee686df7639a97897335ddf241e9c3942c7eadb5162e70a5fcf2087a7",
33
"pins" : [
44
{
55
"identity" : "fluid-menu-bar-extra",
@@ -18,6 +18,15 @@
1818
"revision" : "e0c7eebc5a4465a3c4680764f26b7a61f567cdaf"
1919
}
2020
},
21+
{
22+
"identity" : "swift-protobuf",
23+
"kind" : "remoteSourceControl",
24+
"location" : "https://github.com/apple/swift-protobuf.git",
25+
"state" : {
26+
"revision" : "ebc7251dd5b37f627c93698e4374084d98409633",
27+
"version" : "1.28.2"
28+
}
29+
},
2130
{
2231
"identity" : "swiftlintplugins",
2332
"kind" : "remoteSourceControl",
@@ -32,8 +41,8 @@
3241
"kind" : "remoteSourceControl",
3342
"location" : "https://github.com/nalexn/ViewInspector",
3443
"state" : {
35-
"revision" : "5acfa0a3c095ac9ad050abe51c60d1831e8321da",
36-
"version" : "0.10.0"
44+
"revision" : "788e7879d38a839c4e348ab0762dcc0364e646a2",
45+
"version" : "0.10.1"
3746
}
3847
}
3948
],

0 commit comments

Comments
 (0)