Skip to content

Commit 60d4782

Browse files
smellmansmellman
committedApr 16, 2020
WIP delete GCDWebServer code and use cocoapods dependency, bump base react native version to 0.62
1 parent 903ffc1 commit 60d4782

33 files changed

+6895
-7347
lines changed
 

‎StaticServerExample/ios/Podfile.lock

+8-2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ PODS:
6666
- boost-for-react-native
6767
- DoubleConversion
6868
- glog
69+
- GCDWebServer (3.5.4):
70+
- GCDWebServer/Core (= 3.5.4)
71+
- GCDWebServer/Core (3.5.4)
6972
- glog (0.3.5)
7073
- OpenSSL-Universal (1.0.2.19):
7174
- OpenSSL-Universal/Static (= 1.0.2.19)
@@ -233,7 +236,8 @@ PODS:
233236
- React-cxxreact (= 0.62.2)
234237
- React-jsi (= 0.62.2)
235238
- React-jsinspector (0.62.2)
236-
- react-native-static-server (0.4.3):
239+
- react-native-static-server (0.4.2):
240+
- GCDWebServer
237241
- React
238242
- react-native-webview (9.2.1):
239243
- React
@@ -366,6 +370,7 @@ SPEC REPOS:
366370
- Flipper-PeerTalk
367371
- Flipper-RSocket
368372
- FlipperKit
373+
- GCDWebServer
369374
- OpenSSL-Universal
370375
- YogaKit
371376

@@ -442,6 +447,7 @@ SPEC CHECKSUMS:
442447
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
443448
FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e
444449
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
450+
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
445451
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
446452
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
447453
RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035
@@ -453,7 +459,7 @@ SPEC CHECKSUMS:
453459
React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161
454460
React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da
455461
React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493
456-
react-native-static-server: 585733f8ce6dfa2b9af23f571597479e91353c98
462+
react-native-static-server: cb7cf53a76cc6edf7319a4dc0b3ac0f43080eb3a
457463
react-native-webview: 9fb615251c147d1b94157b31fa0ea9c68b234c04
458464
React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
459465
React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0

‎ios/FPStaticServer.xcodeproj/project.pbxproj

+1-114
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
3308A2ED1F8320B900A72E25 /* GCDWebServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2D01F8320B900A72E25 /* GCDWebServer.m */; };
11-
3308A2EE1F8320B900A72E25 /* GCDWebServerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2D21F8320B900A72E25 /* GCDWebServerConnection.m */; };
12-
3308A2EF1F8320B900A72E25 /* GCDWebServerFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2D41F8320B900A72E25 /* GCDWebServerFunctions.m */; };
13-
3308A2F01F8320B900A72E25 /* GCDWebServerRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2D81F8320B900A72E25 /* GCDWebServerRequest.m */; };
14-
3308A2F11F8320B900A72E25 /* GCDWebServerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2DA1F8320B900A72E25 /* GCDWebServerResponse.m */; };
15-
3308A2F21F8320B900A72E25 /* GCDWebServerDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2DD1F8320B900A72E25 /* GCDWebServerDataRequest.m */; };
16-
3308A2F31F8320B900A72E25 /* GCDWebServerFileRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2DF1F8320B900A72E25 /* GCDWebServerFileRequest.m */; };
17-
3308A2F41F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2E11F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.m */; };
18-
3308A2F51F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2E31F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.m */; };
19-
3308A2F61F8320B900A72E25 /* GCDWebServerDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2E61F8320B900A72E25 /* GCDWebServerDataResponse.m */; };
20-
3308A2F71F8320B900A72E25 /* GCDWebServerErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2E81F8320B900A72E25 /* GCDWebServerErrorResponse.m */; };
21-
3308A2F81F8320B900A72E25 /* GCDWebServerFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2EA1F8320B900A72E25 /* GCDWebServerFileResponse.m */; };
22-
3308A2F91F8320B900A72E25 /* GCDWebServerStreamedResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 3308A2EC1F8320B900A72E25 /* GCDWebServerStreamedResponse.m */; };
2310
B3E7B58A1CC2AC0600A0062D /* FPStaticServer.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* FPStaticServer.m */; };
2411
/* End PBXBuildFile section */
2512

@@ -37,34 +24,6 @@
3724

3825
/* Begin PBXFileReference section */
3926
134814201AA4EA6300B7C361 /* libFPStaticServer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFPStaticServer.a; sourceTree = BUILT_PRODUCTS_DIR; };
40-
3308A2CF1F8320B900A72E25 /* GCDWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServer.h; sourceTree = "<group>"; };
41-
3308A2D01F8320B900A72E25 /* GCDWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServer.m; sourceTree = "<group>"; };
42-
3308A2D11F8320B900A72E25 /* GCDWebServerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerConnection.h; sourceTree = "<group>"; };
43-
3308A2D21F8320B900A72E25 /* GCDWebServerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerConnection.m; sourceTree = "<group>"; };
44-
3308A2D31F8320B900A72E25 /* GCDWebServerFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerFunctions.h; sourceTree = "<group>"; };
45-
3308A2D41F8320B900A72E25 /* GCDWebServerFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerFunctions.m; sourceTree = "<group>"; };
46-
3308A2D51F8320B900A72E25 /* GCDWebServerHTTPStatusCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerHTTPStatusCodes.h; sourceTree = "<group>"; };
47-
3308A2D61F8320B900A72E25 /* GCDWebServerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerPrivate.h; sourceTree = "<group>"; };
48-
3308A2D71F8320B900A72E25 /* GCDWebServerRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerRequest.h; sourceTree = "<group>"; };
49-
3308A2D81F8320B900A72E25 /* GCDWebServerRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerRequest.m; sourceTree = "<group>"; };
50-
3308A2D91F8320B900A72E25 /* GCDWebServerResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerResponse.h; sourceTree = "<group>"; };
51-
3308A2DA1F8320B900A72E25 /* GCDWebServerResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerResponse.m; sourceTree = "<group>"; };
52-
3308A2DC1F8320B900A72E25 /* GCDWebServerDataRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerDataRequest.h; sourceTree = "<group>"; };
53-
3308A2DD1F8320B900A72E25 /* GCDWebServerDataRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerDataRequest.m; sourceTree = "<group>"; };
54-
3308A2DE1F8320B900A72E25 /* GCDWebServerFileRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerFileRequest.h; sourceTree = "<group>"; };
55-
3308A2DF1F8320B900A72E25 /* GCDWebServerFileRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerFileRequest.m; sourceTree = "<group>"; };
56-
3308A2E01F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerMultiPartFormRequest.h; sourceTree = "<group>"; };
57-
3308A2E11F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerMultiPartFormRequest.m; sourceTree = "<group>"; };
58-
3308A2E21F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerURLEncodedFormRequest.h; sourceTree = "<group>"; };
59-
3308A2E31F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerURLEncodedFormRequest.m; sourceTree = "<group>"; };
60-
3308A2E51F8320B900A72E25 /* GCDWebServerDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerDataResponse.h; sourceTree = "<group>"; };
61-
3308A2E61F8320B900A72E25 /* GCDWebServerDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerDataResponse.m; sourceTree = "<group>"; };
62-
3308A2E71F8320B900A72E25 /* GCDWebServerErrorResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerErrorResponse.h; sourceTree = "<group>"; };
63-
3308A2E81F8320B900A72E25 /* GCDWebServerErrorResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerErrorResponse.m; sourceTree = "<group>"; };
64-
3308A2E91F8320B900A72E25 /* GCDWebServerFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerFileResponse.h; sourceTree = "<group>"; };
65-
3308A2EA1F8320B900A72E25 /* GCDWebServerFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerFileResponse.m; sourceTree = "<group>"; };
66-
3308A2EB1F8320B900A72E25 /* GCDWebServerStreamedResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerStreamedResponse.h; sourceTree = "<group>"; };
67-
3308A2EC1F8320B900A72E25 /* GCDWebServerStreamedResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerStreamedResponse.m; sourceTree = "<group>"; };
6827
B3E7B5881CC2AC0600A0062D /* FPStaticServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPStaticServer.h; sourceTree = "<group>"; };
6928
B3E7B5891CC2AC0600A0062D /* FPStaticServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FPStaticServer.m; sourceTree = "<group>"; };
7029
/* End PBXFileReference section */
@@ -88,69 +47,9 @@
8847
name = Products;
8948
sourceTree = "<group>";
9049
};
91-
3308A2CD1F8320B900A72E25 /* GCDWebServer */ = {
92-
isa = PBXGroup;
93-
children = (
94-
3308A2CE1F8320B900A72E25 /* Core */,
95-
3308A2DB1F8320B900A72E25 /* Requests */,
96-
3308A2E41F8320B900A72E25 /* Responses */,
97-
);
98-
path = GCDWebServer;
99-
sourceTree = "<group>";
100-
};
101-
3308A2CE1F8320B900A72E25 /* Core */ = {
102-
isa = PBXGroup;
103-
children = (
104-
3308A2CF1F8320B900A72E25 /* GCDWebServer.h */,
105-
3308A2D01F8320B900A72E25 /* GCDWebServer.m */,
106-
3308A2D11F8320B900A72E25 /* GCDWebServerConnection.h */,
107-
3308A2D21F8320B900A72E25 /* GCDWebServerConnection.m */,
108-
3308A2D31F8320B900A72E25 /* GCDWebServerFunctions.h */,
109-
3308A2D41F8320B900A72E25 /* GCDWebServerFunctions.m */,
110-
3308A2D51F8320B900A72E25 /* GCDWebServerHTTPStatusCodes.h */,
111-
3308A2D61F8320B900A72E25 /* GCDWebServerPrivate.h */,
112-
3308A2D71F8320B900A72E25 /* GCDWebServerRequest.h */,
113-
3308A2D81F8320B900A72E25 /* GCDWebServerRequest.m */,
114-
3308A2D91F8320B900A72E25 /* GCDWebServerResponse.h */,
115-
3308A2DA1F8320B900A72E25 /* GCDWebServerResponse.m */,
116-
);
117-
path = Core;
118-
sourceTree = "<group>";
119-
};
120-
3308A2DB1F8320B900A72E25 /* Requests */ = {
121-
isa = PBXGroup;
122-
children = (
123-
3308A2DC1F8320B900A72E25 /* GCDWebServerDataRequest.h */,
124-
3308A2DD1F8320B900A72E25 /* GCDWebServerDataRequest.m */,
125-
3308A2DE1F8320B900A72E25 /* GCDWebServerFileRequest.h */,
126-
3308A2DF1F8320B900A72E25 /* GCDWebServerFileRequest.m */,
127-
3308A2E01F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.h */,
128-
3308A2E11F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.m */,
129-
3308A2E21F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.h */,
130-
3308A2E31F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.m */,
131-
);
132-
path = Requests;
133-
sourceTree = "<group>";
134-
};
135-
3308A2E41F8320B900A72E25 /* Responses */ = {
136-
isa = PBXGroup;
137-
children = (
138-
3308A2E51F8320B900A72E25 /* GCDWebServerDataResponse.h */,
139-
3308A2E61F8320B900A72E25 /* GCDWebServerDataResponse.m */,
140-
3308A2E71F8320B900A72E25 /* GCDWebServerErrorResponse.h */,
141-
3308A2E81F8320B900A72E25 /* GCDWebServerErrorResponse.m */,
142-
3308A2E91F8320B900A72E25 /* GCDWebServerFileResponse.h */,
143-
3308A2EA1F8320B900A72E25 /* GCDWebServerFileResponse.m */,
144-
3308A2EB1F8320B900A72E25 /* GCDWebServerStreamedResponse.h */,
145-
3308A2EC1F8320B900A72E25 /* GCDWebServerStreamedResponse.m */,
146-
);
147-
path = Responses;
148-
sourceTree = "<group>";
149-
};
15050
58B511D21A9E6C8500147676 = {
15151
isa = PBXGroup;
15252
children = (
153-
3308A2CD1F8320B900A72E25 /* GCDWebServer */,
15453
B3E7B5881CC2AC0600A0062D /* FPStaticServer.h */,
15554
B3E7B5891CC2AC0600A0062D /* FPStaticServer.m */,
15655
134814211AA4EA7D00B7C361 /* Products */,
@@ -196,6 +95,7 @@
19695
developmentRegion = English;
19796
hasScannedForEncodings = 0;
19897
knownRegions = (
98+
English,
19999
en,
200100
);
201101
mainGroup = 58B511D21A9E6C8500147676;
@@ -214,19 +114,6 @@
214114
buildActionMask = 2147483647;
215115
files = (
216116
B3E7B58A1CC2AC0600A0062D /* FPStaticServer.m in Sources */,
217-
3308A2F01F8320B900A72E25 /* GCDWebServerRequest.m in Sources */,
218-
3308A2ED1F8320B900A72E25 /* GCDWebServer.m in Sources */,
219-
3308A2F51F8320B900A72E25 /* GCDWebServerURLEncodedFormRequest.m in Sources */,
220-
3308A2F41F8320B900A72E25 /* GCDWebServerMultiPartFormRequest.m in Sources */,
221-
3308A2F61F8320B900A72E25 /* GCDWebServerDataResponse.m in Sources */,
222-
3308A2F11F8320B900A72E25 /* GCDWebServerResponse.m in Sources */,
223-
3308A2F91F8320B900A72E25 /* GCDWebServerStreamedResponse.m in Sources */,
224-
3308A2F71F8320B900A72E25 /* GCDWebServerErrorResponse.m in Sources */,
225-
3308A2F31F8320B900A72E25 /* GCDWebServerFileRequest.m in Sources */,
226-
3308A2EF1F8320B900A72E25 /* GCDWebServerFunctions.m in Sources */,
227-
3308A2EE1F8320B900A72E25 /* GCDWebServerConnection.m in Sources */,
228-
3308A2F21F8320B900A72E25 /* GCDWebServerDataRequest.m in Sources */,
229-
3308A2F81F8320B900A72E25 /* GCDWebServerFileResponse.m in Sources */,
230117
);
231118
runOnlyForDeploymentPostprocessing = 0;
232119
};

‎ios/GCDWebServer/Core/GCDWebServer.h

-622
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServer.m

-1,292
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerConnection.h

-183
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerConnection.m

-843
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerFunctions.h

-114
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerFunctions.m

-331
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h

-116
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerPrivate.h

-224
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerRequest.h

-210
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerRequest.m

-303
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerResponse.h

-212
This file was deleted.

‎ios/GCDWebServer/Core/GCDWebServerResponse.m

-284
This file was deleted.

‎ios/GCDWebServer/Requests/GCDWebServerDataRequest.h

-64
This file was deleted.

‎ios/GCDWebServer/Requests/GCDWebServerDataRequest.m

-104
This file was deleted.

‎ios/GCDWebServer/Requests/GCDWebServerFileRequest.h

-49
This file was deleted.

‎ios/GCDWebServer/Requests/GCDWebServerFileRequest.m

-102
This file was deleted.

‎ios/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.h

-136
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.