Skip to content

Commit 682be00

Browse files
nlutsenkonlutsenko
committed
Unbreak compilation of TestChat app.
1 parent 85dd530 commit 682be00

File tree

3 files changed

+74
-26
lines changed

3 files changed

+74
-26
lines changed

‎Configurations/TestChat-iOS.xcconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Copyright (c) 2016-present, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/iOS.xcconfig"
11+
#include "Shared/Product/Application.xcconfig"
12+
13+
PRODUCT_NAME = TestChat
14+
PRODUCT_MODULE_NAME = TestChat
15+
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.socketrocket.testchat
16+
17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
18+
19+
INFOPLIST_FILE = $(SRCROOT)/TestChat/TestChat-Info.plist

‎SocketRocket.xcodeproj/project.pbxproj

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
81900A511D18C9CC0015A290 /* SRLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 81900A4B1D18C9CC0015A290 /* SRLog.m */; };
7676
81900A521D18C9CC0015A290 /* SRLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 81900A4B1D18C9CC0015A290 /* SRLog.m */; };
7777
81900A531D18C9CC0015A290 /* SRLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 81900A4B1D18C9CC0015A290 /* SRLog.m */; };
78+
81AFCD661D4C431C00B3AFC9 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AFCD651D4C431C00B3AFC9 /* libicucore.tbd */; };
7879
81B22EC61CE42D7E0073C636 /* SRError.h in Headers */ = {isa = PBXBuildFile; fileRef = 81B22EC31CE42D7E0073C636 /* SRError.h */; };
7980
81B22EC71CE42D7E0073C636 /* SRError.h in Headers */ = {isa = PBXBuildFile; fileRef = 81B22EC31CE42D7E0073C636 /* SRError.h */; };
8081
81B22EC81CE42D7E0073C636 /* SRError.h in Headers */ = {isa = PBXBuildFile; fileRef = 81B22EC31CE42D7E0073C636 /* SRError.h */; };
@@ -181,6 +182,8 @@
181182
81D647881D2CA78800690609 /* SRRunLoopThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 81B31C5D1CDC444900D86D43 /* SRRunLoopThread.h */; };
182183
81D647B51D2CA8E200690609 /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81D6478D1D2CA78800690609 /* SocketRocket.framework */; };
183184
81DCD1241D2D9235002501A2 /* libicucore.A.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C68D0D1D2CBFA800A1D005 /* libicucore.A.tbd */; };
185+
81E8A6A21D4C41E000916C7E /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81D6478D1D2CA78800690609 /* SocketRocket.framework */; };
186+
81E8A6A31D4C41E000916C7E /* SocketRocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81D6478D1D2CA78800690609 /* SocketRocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
184187
F5391CBE1D2F4B4700606A81 /* SRSIMDHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = F5391CBC1D2F4B4700606A81 /* SRSIMDHelpers.h */; };
185188
F5391CBF1D2F4B4700606A81 /* SRSIMDHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = F5391CBC1D2F4B4700606A81 /* SRSIMDHelpers.h */; };
186189
F5391CC01D2F4B4700606A81 /* SRSIMDHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = F5391CBC1D2F4B4700606A81 /* SRSIMDHelpers.h */; };
@@ -215,8 +218,36 @@
215218
remoteGlobalIDString = 81D6475F1D2CA78800690609;
216219
remoteInfo = "SocketRocket-iOS";
217220
};
221+
81E8A6A01D4C41DA00916C7E /* PBXContainerItemProxy */ = {
222+
isa = PBXContainerItemProxy;
223+
containerPortal = F6B208241450F597009315AF /* Project object */;
224+
proxyType = 1;
225+
remoteGlobalIDString = 2D4227611BB4358C000C1A6C;
226+
remoteInfo = "SocketRocket-iOS-Dynamic";
227+
};
228+
81E8A6A41D4C41E000916C7E /* PBXContainerItemProxy */ = {
229+
isa = PBXContainerItemProxy;
230+
containerPortal = F6B208241450F597009315AF /* Project object */;
231+
proxyType = 1;
232+
remoteGlobalIDString = 81D6475F1D2CA78800690609;
233+
remoteInfo = "SocketRocket-iOS";
234+
};
218235
/* End PBXContainerItemProxy section */
219236

237+
/* Begin PBXCopyFilesBuildPhase section */
238+
81E8A6A61D4C41E000916C7E /* Embed Frameworks */ = {
239+
isa = PBXCopyFilesBuildPhase;
240+
buildActionMask = 2147483647;
241+
dstPath = "";
242+
dstSubfolderSpec = 10;
243+
files = (
244+
81E8A6A31D4C41E000916C7E /* SocketRocket.framework in Embed Frameworks */,
245+
);
246+
name = "Embed Frameworks";
247+
runOnlyForDeploymentPostprocessing = 0;
248+
};
249+
/* End PBXCopyFilesBuildPhase section */
250+
220251
/* Begin PBXFileReference section */
221252
2D4227621BB4358C000C1A6C /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
222253
3345DC901C52ACD70083CCB8 /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -247,6 +278,7 @@
247278
8179967F1CE184F40084DA37 /* SRAutobahnUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRAutobahnUtilities.m; sourceTree = "<group>"; };
248279
81900A4A1D18C9CC0015A290 /* SRLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRLog.h; sourceTree = "<group>"; };
249280
81900A4B1D18C9CC0015A290 /* SRLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRLog.m; sourceTree = "<group>"; };
281+
81AFCD651D4C431C00B3AFC9 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/usr/lib/libicucore.tbd; sourceTree = DEVELOPER_DIR; };
250282
81B22EC31CE42D7E0073C636 /* SRError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRError.h; sourceTree = "<group>"; };
251283
81B22EC41CE42D7E0073C636 /* SRError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRError.m; sourceTree = "<group>"; };
252284
81B22EE21CE43ECC0073C636 /* SRURLUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRURLUtilities.h; sourceTree = "<group>"; };
@@ -290,6 +322,7 @@
290322
81D6475C1D2CA6A100690609 /* SocketRocket-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "SocketRocket-tvOS.xcconfig"; sourceTree = "<group>"; };
291323
81D6475D1D2CA6A100690609 /* SocketRocketTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "SocketRocketTests-iOS.xcconfig"; sourceTree = "<group>"; };
292324
81D6478D1D2CA78800690609 /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
325+
81E8A69A1D4C417A00916C7E /* TestChat-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "TestChat-iOS.xcconfig"; sourceTree = "<group>"; };
293326
F5391CBC1D2F4B4700606A81 /* SRSIMDHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRSIMDHelpers.h; sourceTree = "<group>"; };
294327
F5391CBD1D2F4B4700606A81 /* SRSIMDHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRSIMDHelpers.m; sourceTree = "<group>"; };
295328
F61A0DC71625F44D00365EBD /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "en.lproj/[email protected]"; sourceTree = "<group>"; };
@@ -350,10 +383,12 @@
350383
isa = PBXFrameworksBuildPhase;
351384
buildActionMask = 2147483647;
352385
files = (
386+
81AFCD661D4C431C00B3AFC9 /* libicucore.tbd in Frameworks */,
353387
F62417E614D52F3C003CE997 /* UIKit.framework in Frameworks */,
354388
F62417E714D52F3C003CE997 /* Foundation.framework in Frameworks */,
355389
F624180314D53449003CE997 /* CFNetwork.framework in Frameworks */,
356390
F624180414D53449003CE997 /* Security.framework in Frameworks */,
391+
81E8A6A21D4C41E000916C7E /* SocketRocket.framework in Frameworks */,
357392
);
358393
runOnlyForDeploymentPostprocessing = 0;
359394
};
@@ -554,6 +589,7 @@
554589
81D6475B1D2CA6A100690609 /* SocketRocket-macOS.xcconfig */,
555590
81D6475C1D2CA6A100690609 /* SocketRocket-tvOS.xcconfig */,
556591
81D6475D1D2CA6A100690609 /* SocketRocketTests-iOS.xcconfig */,
592+
81E8A69A1D4C417A00916C7E /* TestChat-iOS.xcconfig */,
557593
81D647491D2CA6A100690609 /* Shared */,
558594
);
559595
path = Configurations;
@@ -658,6 +694,7 @@
658694
F6B2082F1450F597009315AF /* Frameworks */ = {
659695
isa = PBXGroup;
660696
children = (
697+
81AFCD651D4C431C00B3AFC9 /* libicucore.tbd */,
661698
81C68CF41D2CBEBD00A1D005 /* macOS */,
662699
81C68CFD1D2CBF1800A1D005 /* tvOS */,
663700
81C68CFE1D2CBF2100A1D005 /* iOS */,
@@ -868,10 +905,13 @@
868905
F62417DF14D52F3C003CE997 /* Sources */,
869906
F62417E014D52F3C003CE997 /* Frameworks */,
870907
F62417E114D52F3C003CE997 /* Resources */,
908+
81E8A6A61D4C41E000916C7E /* Embed Frameworks */,
871909
);
872910
buildRules = (
873911
);
874912
dependencies = (
913+
81E8A6A11D4C41DA00916C7E /* PBXTargetDependency */,
914+
81E8A6A51D4C41E000916C7E /* PBXTargetDependency */,
875915
);
876916
name = TestChat;
877917
productName = TestChat;
@@ -1129,6 +1169,16 @@
11291169
target = 81D6475F1D2CA78800690609 /* SocketRocket-iOS */;
11301170
targetProxy = 81D647B31D2CA8DD00690609 /* PBXContainerItemProxy */;
11311171
};
1172+
81E8A6A11D4C41DA00916C7E /* PBXTargetDependency */ = {
1173+
isa = PBXTargetDependency;
1174+
target = 2D4227611BB4358C000C1A6C /* SocketRocket-iOS-Dynamic */;
1175+
targetProxy = 81E8A6A01D4C41DA00916C7E /* PBXContainerItemProxy */;
1176+
};
1177+
81E8A6A51D4C41E000916C7E /* PBXTargetDependency */ = {
1178+
isa = PBXTargetDependency;
1179+
target = 81D6475F1D2CA78800690609 /* SocketRocket-iOS */;
1180+
targetProxy = 81E8A6A41D4C41E000916C7E /* PBXContainerItemProxy */;
1181+
};
11321182
/* End PBXTargetDependency section */
11331183

11341184
/* Begin PBXVariantGroup section */
@@ -1201,38 +1251,15 @@
12011251
};
12021252
F62417FD14D52F3C003CE997 /* Debug */ = {
12031253
isa = XCBuildConfiguration;
1254+
baseConfigurationReference = 81E8A69A1D4C417A00916C7E /* TestChat-iOS.xcconfig */;
12041255
buildSettings = {
1205-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1206-
FRAMEWORK_SEARCH_PATHS = (
1207-
"$(inherited)",
1208-
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
1209-
);
1210-
INFOPLIST_FILE = "TestChat/TestChat-Info.plist";
1211-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
1212-
OTHER_LDFLAGS = "-ObjC";
1213-
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.socketrocket.testchat;
1214-
PRODUCT_NAME = "$(TARGET_NAME)";
1215-
TARGETED_DEVICE_FAMILY = "1,2";
1216-
WRAPPER_EXTENSION = app;
12171256
};
12181257
name = Debug;
12191258
};
12201259
F62417FE14D52F3C003CE997 /* Release */ = {
12211260
isa = XCBuildConfiguration;
1261+
baseConfigurationReference = 81E8A69A1D4C417A00916C7E /* TestChat-iOS.xcconfig */;
12221262
buildSettings = {
1223-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1224-
FRAMEWORK_SEARCH_PATHS = (
1225-
"$(inherited)",
1226-
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
1227-
);
1228-
INFOPLIST_FILE = "TestChat/TestChat-Info.plist";
1229-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
1230-
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
1231-
OTHER_LDFLAGS = "-ObjC";
1232-
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.socketrocket.testchat;
1233-
PRODUCT_NAME = "$(TARGET_NAME)";
1234-
TARGETED_DEVICE_FAMILY = "1,2";
1235-
WRAPPER_EXTENSION = app;
12361263
};
12371264
name = Release;
12381265
};

‎SocketRocket/Internal/Proxy/SRProxyConnect.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,9 @@ - (void)_readProxySettingWithType:(NSString *)proxyType settings:(NSDictionary *
187187
[proxyType isEqualToString:(NSString *)kCFProxyTypeHTTPS]) {
188188
_httpProxyHost = settings[(NSString *)kCFProxyHostNameKey];
189189
NSNumber *portValue = settings[(NSString *)kCFProxyPortNumberKey];
190-
if (portValue)
190+
if (portValue) {
191191
_httpProxyPort = [portValue intValue];
192+
}
192193
}
193194
if ([proxyType isEqualToString:(NSString *)kCFProxyTypeSOCKS]) {
194195
_socksProxyHost = settings[(NSString *)kCFProxyHostNameKey];
@@ -470,4 +471,5 @@ - (void)_writeData:(NSData *)data
470471
[outStream write:bytes maxLength:data.length];
471472
});
472473
}
474+
473475
@end

0 commit comments

Comments
 (0)