Skip to content

Commit 954c947

Browse files
dfeddfed
committed
Merge pull request facebookincubator#290 from mogstad/carthage
Add dynamic framework for iOS
2 parents b47e74e + bd130dc commit 954c947

File tree

5 files changed

+278
-0
lines changed

5 files changed

+278
-0
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ before_script:
44
- bundle install
55
script:
66
- xcodebuild -project SocketRocket.xcodeproj -scheme "SocketRocket" -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build test
7+
- xcodebuild -project SocketRocket.xcodeproj -scheme "SocketRocket-iOS" -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build
78
- xcodebuild -project SocketRocket.xcodeproj -scheme "SocketRocketOSX" -sdk macosx10.10 -configuration Debug -destination "platform=OS X" -PBXBuildsContinueAfterErrors=0 build
89
- pod lib lint --verbose --fail-fast

‎SocketRocket-iOS/SocketRocket-iOS-Info.plist

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎SocketRocket-iOS/SocketRocket.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// Copyright 2012 - 2015 Square Inc.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
#import <Foundation/Foundation.h>
18+
#import <SocketRocket/SRWebSocket.h>

‎SocketRocket.xcodeproj/project.pbxproj

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
2D42277F1BB4365C000C1A6C /* SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A12CCF145119B700C1D980 /* SRWebSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
11+
2D4227801BB43693000C1A6C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208301450F597009315AF /* Foundation.framework */; };
12+
2D4227831BB436B1000C1A6C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
13+
2D4227841BB436CF000C1A6C /* SocketRocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4227641BB4358C000C1A6C /* SocketRocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
14+
2D4227851BB43734000C1A6C /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A12CD0145119B700C1D980 /* SRWebSocket.m */; };
15+
2D8650261BB43B9B00534598 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C41C95145F7C4700641356 /* libicucore.dylib */; };
1016
F6016C8814620EC70037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
1117
F6016C8914620ECC0037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
1218
F6016C8A1462143C0037BB3D /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD51451231B00C1D980 /* CFNetwork.framework */; };
@@ -53,6 +59,9 @@
5359
/* End PBXContainerItemProxy section */
5460

5561
/* Begin PBXFileReference section */
62+
2D4227621BB4358C000C1A6C /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
63+
2D4227641BB4358C000C1A6C /* SocketRocket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketRocket.h; sourceTree = "<group>"; };
64+
2D4227661BB4358C000C1A6C /* SocketRocket-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SocketRocket-iOS-Info.plist"; sourceTree = "<group>"; };
5665
F60CC29F14D4EA0500A005E4 /* SRTWebSocketOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRTWebSocketOperation.h; sourceTree = "<group>"; };
5766
F60CC2A014D4EA0500A005E4 /* SRTWebSocketOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRTWebSocketOperation.m; sourceTree = "<group>"; };
5867
F61A0DC71625F44D00365EBD /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "en.lproj/Default-568h@2x.png"; sourceTree = "<group>"; };
@@ -96,6 +105,16 @@
96105
/* End PBXFileReference section */
97106

98107
/* Begin PBXFrameworksBuildPhase section */
108+
2D42275E1BB4358C000C1A6C /* Frameworks */ = {
109+
isa = PBXFrameworksBuildPhase;
110+
buildActionMask = 2147483647;
111+
files = (
112+
2D8650261BB43B9B00534598 /* libicucore.dylib in Frameworks */,
113+
2D4227831BB436B1000C1A6C /* Security.framework in Frameworks */,
114+
2D4227801BB43693000C1A6C /* Foundation.framework in Frameworks */,
115+
);
116+
runOnlyForDeploymentPostprocessing = 0;
117+
};
99118
F62417E014D52F3C003CE997 /* Frameworks */ = {
100119
isa = PBXFrameworksBuildPhase;
101120
buildActionMask = 2147483647;
@@ -145,6 +164,15 @@
145164
/* End PBXFrameworksBuildPhase section */
146165

147166
/* Begin PBXGroup section */
167+
2D4227631BB4358C000C1A6C /* SocketRocket-iOS */ = {
168+
isa = PBXGroup;
169+
children = (
170+
2D4227641BB4358C000C1A6C /* SocketRocket.h */,
171+
2D4227661BB4358C000C1A6C /* SocketRocket-iOS-Info.plist */,
172+
);
173+
path = "SocketRocket-iOS";
174+
sourceTree = "<group>";
175+
};
148176
F62417EA14D52F3C003CE997 /* TestChat */ = {
149177
isa = PBXGroup;
150178
children = (
@@ -207,6 +235,7 @@
207235
F6BDA807145900D200FE3253 /* SRWebSocketTests */,
208236
F62417EA14D52F3C003CE997 /* TestChat */,
209237
F668C887153E91210044DBAC /* SocketRocketOSX */,
238+
2D4227631BB4358C000C1A6C /* SocketRocket-iOS */,
210239
F6B2082F1450F597009315AF /* Frameworks */,
211240
F6B2082E1450F597009315AF /* Products */,
212241
);
@@ -221,6 +250,7 @@
221250
F6BDA802145900D200FE3253 /* SRWebSocketTests.xctest */,
222251
F62417E314D52F3C003CE997 /* TestChat.app */,
223252
F668C880153E91210044DBAC /* SocketRocket.framework */,
253+
2D4227621BB4358C000C1A6C /* SocketRocket.framework */,
224254
);
225255
name = Products;
226256
sourceTree = "<group>";
@@ -284,6 +314,15 @@
284314
/* End PBXGroup section */
285315

286316
/* Begin PBXHeadersBuildPhase section */
317+
2D42275F1BB4358C000C1A6C /* Headers */ = {
318+
isa = PBXHeadersBuildPhase;
319+
buildActionMask = 2147483647;
320+
files = (
321+
2D42277F1BB4365C000C1A6C /* SRWebSocket.h in Headers */,
322+
2D4227841BB436CF000C1A6C /* SocketRocket.h in Headers */,
323+
);
324+
runOnlyForDeploymentPostprocessing = 0;
325+
};
287326
F668C87D153E91210044DBAC /* Headers */ = {
288327
isa = PBXHeadersBuildPhase;
289328
buildActionMask = 2147483647;
@@ -303,6 +342,24 @@
303342
/* End PBXHeadersBuildPhase section */
304343

305344
/* Begin PBXNativeTarget section */
345+
2D4227611BB4358C000C1A6C /* SocketRocket-iOS */ = {
346+
isa = PBXNativeTarget;
347+
buildConfigurationList = 2D4227671BB4358C000C1A6C /* Build configuration list for PBXNativeTarget "SocketRocket-iOS" */;
348+
buildPhases = (
349+
2D42275D1BB4358C000C1A6C /* Sources */,
350+
2D42275E1BB4358C000C1A6C /* Frameworks */,
351+
2D42275F1BB4358C000C1A6C /* Headers */,
352+
2D4227601BB4358C000C1A6C /* Resources */,
353+
);
354+
buildRules = (
355+
);
356+
dependencies = (
357+
);
358+
name = "SocketRocket-iOS";
359+
productName = "SocketRocket-iOS";
360+
productReference = 2D4227621BB4358C000C1A6C /* SocketRocket.framework */;
361+
productType = "com.apple.product-type.framework";
362+
};
306363
F62417E214D52F3C003CE997 /* TestChat */ = {
307364
isa = PBXNativeTarget;
308365
buildConfigurationList = F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */;
@@ -396,13 +453,21 @@
396453
targets = (
397454
F6B2082C1450F597009315AF /* SocketRocket */,
398455
F668C87F153E91210044DBAC /* SocketRocketOSX */,
456+
2D4227611BB4358C000C1A6C /* SocketRocket-iOS */,
399457
F6BDA801145900D200FE3253 /* SRWebSocketTests */,
400458
F62417E214D52F3C003CE997 /* TestChat */,
401459
);
402460
};
403461
/* End PBXProject section */
404462

405463
/* Begin PBXResourcesBuildPhase section */
464+
2D4227601BB4358C000C1A6C /* Resources */ = {
465+
isa = PBXResourcesBuildPhase;
466+
buildActionMask = 2147483647;
467+
files = (
468+
);
469+
runOnlyForDeploymentPostprocessing = 0;
470+
};
406471
F62417E114D52F3C003CE997 /* Resources */ = {
407472
isa = PBXResourcesBuildPhase;
408473
buildActionMask = 2147483647;
@@ -431,6 +496,14 @@
431496
/* End PBXResourcesBuildPhase section */
432497

433498
/* Begin PBXSourcesBuildPhase section */
499+
2D42275D1BB4358C000C1A6C /* Sources */ = {
500+
isa = PBXSourcesBuildPhase;
501+
buildActionMask = 2147483647;
502+
files = (
503+
2D4227851BB43734000C1A6C /* SRWebSocket.m in Sources */,
504+
);
505+
runOnlyForDeploymentPostprocessing = 0;
506+
};
434507
F62417DF14D52F3C003CE997 /* Sources */ = {
435508
isa = PBXSourcesBuildPhase;
436509
buildActionMask = 2147483647;
@@ -506,6 +579,77 @@
506579
/* End PBXVariantGroup section */
507580

508581
/* Begin XCBuildConfiguration section */
582+
2D4227681BB4358C000C1A6C /* Debug */ = {
583+
isa = XCBuildConfiguration;
584+
buildSettings = {
585+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
586+
CLANG_CXX_LIBRARY = "libc++";
587+
CLANG_ENABLE_MODULES = YES;
588+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
589+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
590+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
591+
CURRENT_PROJECT_VERSION = 1;
592+
DEBUG_INFORMATION_FORMAT = dwarf;
593+
DEFINES_MODULE = YES;
594+
DYLIB_COMPATIBILITY_VERSION = 1;
595+
DYLIB_CURRENT_VERSION = 1;
596+
DYLIB_INSTALL_NAME_BASE = "@rpath";
597+
ENABLE_TESTABILITY = YES;
598+
GCC_C_LANGUAGE_STANDARD = gnu99;
599+
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
600+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
601+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
602+
INFOPLIST_FILE = "SocketRocket-iOS/SocketRocket-iOS-Info.plist";
603+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
604+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
605+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
606+
MTL_ENABLE_DEBUG_INFO = YES;
607+
OTHER_LDFLAGS = "-ObjC";
608+
PRODUCT_BUNDLE_IDENTIFIER = com.squareup.SocketRocket;
609+
PRODUCT_NAME = SocketRocket;
610+
SKIP_INSTALL = YES;
611+
TARGETED_DEVICE_FAMILY = "1,2";
612+
VERSIONING_SYSTEM = "apple-generic";
613+
VERSION_INFO_PREFIX = "";
614+
};
615+
name = Debug;
616+
};
617+
2D4227691BB4358C000C1A6C /* Release */ = {
618+
isa = XCBuildConfiguration;
619+
buildSettings = {
620+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
621+
CLANG_CXX_LIBRARY = "libc++";
622+
CLANG_ENABLE_MODULES = YES;
623+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
624+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
625+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
626+
COPY_PHASE_STRIP = NO;
627+
CURRENT_PROJECT_VERSION = 1;
628+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
629+
DEFINES_MODULE = YES;
630+
DYLIB_COMPATIBILITY_VERSION = 1;
631+
DYLIB_CURRENT_VERSION = 1;
632+
DYLIB_INSTALL_NAME_BASE = "@rpath";
633+
ENABLE_NS_ASSERTIONS = NO;
634+
GCC_C_LANGUAGE_STANDARD = gnu99;
635+
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
636+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
637+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
638+
INFOPLIST_FILE = "SocketRocket-iOS/SocketRocket-iOS-Info.plist";
639+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
640+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
641+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
642+
MTL_ENABLE_DEBUG_INFO = NO;
643+
OTHER_LDFLAGS = "-ObjC";
644+
PRODUCT_BUNDLE_IDENTIFIER = com.squareup.SocketRocket;
645+
PRODUCT_NAME = SocketRocket;
646+
SKIP_INSTALL = YES;
647+
TARGETED_DEVICE_FAMILY = "1,2";
648+
VERSIONING_SYSTEM = "apple-generic";
649+
VERSION_INFO_PREFIX = "";
650+
};
651+
name = Release;
652+
};
509653
F62417FD14D52F3C003CE997 /* Debug */ = {
510654
isa = XCBuildConfiguration;
511655
buildSettings = {
@@ -757,6 +901,15 @@
757901
/* End XCBuildConfiguration section */
758902

759903
/* Begin XCConfigurationList section */
904+
2D4227671BB4358C000C1A6C /* Build configuration list for PBXNativeTarget "SocketRocket-iOS" */ = {
905+
isa = XCConfigurationList;
906+
buildConfigurations = (
907+
2D4227681BB4358C000C1A6C /* Debug */,
908+
2D4227691BB4358C000C1A6C /* Release */,
909+
);
910+
defaultConfigurationIsVisible = 0;
911+
defaultConfigurationName = Release;
912+
};
760913
F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */ = {
761914
isa = XCConfigurationList;
762915
buildConfigurations = (

‎SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocket-iOS.xcscheme

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0700"
4+
version = "1.8">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "2D4227611BB4358C000C1A6C"
18+
BuildableName = "SocketRocket.framework"
19+
BlueprintName = "SocketRocket-iOS"
20+
ReferencedContainer = "container:SocketRocket.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
37+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
38+
launchStyle = "0"
39+
useCustomWorkingDirectory = "NO"
40+
buildConfiguration = "Debug"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "2D4227611BB4358C000C1A6C"
49+
BuildableName = "SocketRocket.framework"
50+
BlueprintName = "SocketRocket-iOS"
51+
ReferencedContainer = "container:SocketRocket.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
shouldUseLaunchSchemeArgsEnv = "YES"
59+
savedToolIdentifier = ""
60+
useCustomWorkingDirectory = "NO"
61+
buildConfiguration = "Release"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "2D4227611BB4358C000C1A6C"
67+
BuildableName = "SocketRocket.framework"
68+
BlueprintName = "SocketRocket-iOS"
69+
ReferencedContainer = "container:SocketRocket.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

0 commit comments

Comments
 (0)