Skip to content

Commit a7ea57d

Browse files
danielrbrownedanielrbrowne
committed
Migrate Carthage dependencies to use XCFrameworks
- Carthage dependencies for building from source are now integrated using platform-independent XCFrameworks
1 parent c05b2f8 commit a7ea57d

File tree

4 files changed

+62
-76
lines changed

4 files changed

+62
-76
lines changed

‎Carthage.xcconfig

-3
This file was deleted.

‎PusherSwift.xcodeproj/project.pbxproj

+61-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -58,6 +58,8 @@
5858
53AF00C925D2AEC70005621D /* EventQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53AF00C825D2AEC70005621D /* EventQueue.swift */; };
5959
53AF00D125D2B02D0005621D /* EventQueueDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53AF00D025D2B02D0005621D /* EventQueueDelegate.swift */; };
6060
53F08C4825ECEFFD00BDFFB3 /* PusherChannel+EncryptionHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F08C4725ECEFFD00BDFFB3 /* PusherChannel+EncryptionHelpers.swift */; };
61+
57A44493264942B700984790 /* NWWebSocket.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57A44492264942B700984790 /* NWWebSocket.xcframework */; };
62+
57A44495264942BB00984790 /* TweetNacl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57A44494264942BB00984790 /* TweetNacl.xcframework */; };
6163
736E53F5242A378B0052CC1B /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736E53F3242A35D90052CC1B /* String+Extensions.swift */; };
6264
736E53F7242A45AC0052CC1B /* XCTest+Assertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736E53F6242A45AC0052CC1B /* XCTest+Assertions.swift */; };
6365
E2498293231E612700CFBBD6 /* PusherError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2498292231E612700CFBBD6 /* PusherError.swift */; };
@@ -136,6 +138,8 @@
136138
53AF00C825D2AEC70005621D /* EventQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventQueue.swift; sourceTree = "<group>"; };
137139
53AF00D025D2B02D0005621D /* EventQueueDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventQueueDelegate.swift; sourceTree = "<group>"; };
138140
53F08C4725ECEFFD00BDFFB3 /* PusherChannel+EncryptionHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PusherChannel+EncryptionHelpers.swift"; sourceTree = "<group>"; };
141+
57A44492264942B700984790 /* NWWebSocket.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NWWebSocket.xcframework; path = Carthage/Build/NWWebSocket.xcframework; sourceTree = "<group>"; };
142+
57A44494264942BB00984790 /* TweetNacl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TweetNacl.xcframework; path = Carthage/Build/TweetNacl.xcframework; sourceTree = "<group>"; };
139143
736E53F3242A35D90052CC1B /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
140144
736E53F6242A45AC0052CC1B /* XCTest+Assertions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTest+Assertions.swift"; sourceTree = "<group>"; };
141145
73D8A22C2435F381001FDE05 /* ChannelEventFactory+DecryptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChannelEventFactory+DecryptionTests.swift"; sourceTree = "<group>"; };
@@ -166,6 +170,8 @@
166170
isa = PBXFrameworksBuildPhase;
167171
buildActionMask = 2147483647;
168172
files = (
173+
57A44493264942B700984790 /* NWWebSocket.xcframework in Frameworks */,
174+
57A44495264942BB00984790 /* TweetNacl.xcframework in Frameworks */,
169175
);
170176
runOnlyForDeploymentPostprocessing = 0;
171177
};
@@ -178,6 +184,7 @@
178184
33831C8B1A9CF61600B124F1 /* Sources */,
179185
33BB995C1D21225B00B25C2A /* Tests */,
180186
33831C8A1A9CF61600B124F1 /* Products */,
187+
57A44491264942B700984790 /* Frameworks */,
181188
);
182189
sourceTree = "<group>";
183190
};
@@ -390,6 +397,15 @@
390397
path = Models;
391398
sourceTree = "<group>";
392399
};
400+
57A44491264942B700984790 /* Frameworks */ = {
401+
isa = PBXGroup;
402+
children = (
403+
57A44494264942BB00984790 /* TweetNacl.xcframework */,
404+
57A44492264942B700984790 /* NWWebSocket.xcframework */,
405+
);
406+
name = Frameworks;
407+
sourceTree = "<group>";
408+
};
393409
/* End PBXGroup section */
394410

395411
/* Begin PBXHeadersBuildPhase section */
@@ -440,7 +456,6 @@
440456
33831C901A9CF61600B124F1 /* Sources */,
441457
33C40CB81C1DFC91008A54E3 /* Headers */,
442458
33831C921A9CF61600B124F1 /* Resources */,
443-
33A108CA2051B57800D624C9 /* Copy Carthage Frameworks */,
444459
);
445460
buildRules = (
446461
);
@@ -508,22 +523,6 @@
508523
/* End PBXResourcesBuildPhase section */
509524

510525
/* Begin PBXShellScriptBuildPhase section */
511-
33A108CA2051B57800D624C9 /* Copy Carthage Frameworks */ = {
512-
isa = PBXShellScriptBuildPhase;
513-
buildActionMask = 2147483647;
514-
files = (
515-
);
516-
inputPaths = (
517-
NWWebSocket,
518-
TweetNacl,
519-
);
520-
name = "Copy Carthage Frameworks";
521-
outputPaths = (
522-
);
523-
runOnlyForDeploymentPostprocessing = 0;
524-
shellPath = /bin/sh;
525-
shellScript = "case \"$PLATFORM_NAME\" in\nmacosx) plat=Mac;;\niphone*) plat=iOS;;\nwatch*) plat=watchOS;;\ntv*) plat=tvOS;;\nappletv*) plat=tvOS;;\n*) echo \"error: Unknown PLATFORM_NAME: $PLATFORM_NAME\"; exit 1;;\nesac\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nframework=$(basename \"${!VAR}\")\nexport SCRIPT_INPUT_FILE_$n=\"$SRCROOT\"/Carthage/Build/$plat/\"$framework\".framework\ndone\n\n/usr/local/bin/carthage copy-frameworks || exit\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nsource=${!VAR}.dSYM\ndest=${BUILT_PRODUCTS_DIR}/$(basename \"$source\")\nditto \"$source\" \"$dest\" || exit\ndone\n";
526-
};
527526
5333AD0824F928F1006E8DF0 /* Run SwiftLint */ = {
528527
isa = PBXShellScriptBuildPhase;
529528
buildActionMask = 2147483647;
@@ -652,7 +651,6 @@
652651
/* Begin XCBuildConfiguration section */
653652
33831C4E1A9CEDF800B124F1 /* Debug */ = {
654653
isa = XCBuildConfiguration;
655-
baseConfigurationReference = 3301FED22051AB6400AE591A /* Carthage.xcconfig */;
656654
buildSettings = {
657655
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
658656
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -675,6 +673,9 @@
675673
DEFINES_MODULE = YES;
676674
ENABLE_STRICT_OBJC_MSGSEND = YES;
677675
ENABLE_TESTABILITY = YES;
676+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = "$(inherited)";
677+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = "$(inherited)";
678+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "$(inherited)";
678679
GCC_NO_COMMON_BLOCKS = YES;
679680
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
680681
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -695,7 +696,6 @@
695696
};
696697
33831C4F1A9CEDF800B124F1 /* Release */ = {
697698
isa = XCBuildConfiguration;
698-
baseConfigurationReference = 3301FED22051AB6400AE591A /* Carthage.xcconfig */;
699699
buildSettings = {
700700
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
701701
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -717,6 +717,9 @@
717717
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
718718
DEFINES_MODULE = YES;
719719
ENABLE_STRICT_OBJC_MSGSEND = YES;
720+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = "$(inherited)";
721+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = "$(inherited)";
722+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "$(inherited)";
720723
GCC_NO_COMMON_BLOCKS = YES;
721724
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
722725
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -728,7 +731,8 @@
728731
MACOSX_DEPLOYMENT_TARGET = 10.15;
729732
SDKROOT = "";
730733
SUPPORTED_PLATFORMS = "macosx appletvos iphoneos watchos appletvsimulator iphonesimulator watchsimulator";
731-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
734+
SWIFT_COMPILATION_MODE = wholemodule;
735+
SWIFT_OPTIMIZATION_LEVEL = "-O";
732736
SWIFT_VERSION = 5.0;
733737
TVOS_DEPLOYMENT_TARGET = 13.0;
734738
WATCHOS_DEPLOYMENT_TARGET = 6.0;
@@ -779,7 +783,11 @@
779783
GCC_WARN_UNUSED_VARIABLE = YES;
780784
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
781785
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
782-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
786+
LD_RUNPATH_SEARCH_PATHS = (
787+
"$(inherited)",
788+
"@executable_path/Frameworks",
789+
"@loader_path/Frameworks",
790+
);
783791
MTL_ENABLE_DEBUG_INFO = YES;
784792
ONLY_ACTIVE_ARCH = YES;
785793
PRODUCT_BUNDLE_IDENTIFIER = "com.pusher.$(PRODUCT_NAME:rfc1034identifier)";
@@ -835,7 +843,11 @@
835843
GCC_WARN_UNUSED_VARIABLE = YES;
836844
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
837845
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
838-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
846+
LD_RUNPATH_SEARCH_PATHS = (
847+
"$(inherited)",
848+
"@executable_path/Frameworks",
849+
"@loader_path/Frameworks",
850+
);
839851
MTL_ENABLE_DEBUG_INFO = NO;
840852
PRODUCT_BUNDLE_IDENTIFIER = "com.pusher.$(PRODUCT_NAME:rfc1034identifier)";
841853
PRODUCT_NAME = PusherSwift;
@@ -874,6 +886,9 @@
874886
DEBUG_INFORMATION_FORMAT = dwarf;
875887
ENABLE_STRICT_OBJC_MSGSEND = YES;
876888
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
889+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = "$(inherited)";
890+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = "$(inherited)";
891+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "$(inherited)";
877892
GCC_C_LANGUAGE_STANDARD = gnu99;
878893
GCC_DYNAMIC_NO_PIC = NO;
879894
GCC_OPTIMIZATION_LEVEL = 0;
@@ -889,8 +904,16 @@
889904
GCC_WARN_UNUSED_FUNCTION = YES;
890905
GCC_WARN_UNUSED_VARIABLE = YES;
891906
INFOPLIST_FILE = Tests/Info.plist;
892-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
893-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
907+
LD_RUNPATH_SEARCH_PATHS = (
908+
"$(inherited)",
909+
"@executable_path/Frameworks",
910+
"@loader_path/Frameworks",
911+
);
912+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
913+
"$(inherited)",
914+
"@executable_path/../Frameworks",
915+
"@loader_path/../Frameworks",
916+
);
894917
MTL_ENABLE_DEBUG_INFO = YES;
895918
ONLY_ACTIVE_ARCH = YES;
896919
PRODUCT_BUNDLE_IDENTIFIER = "com.pusher.$(PRODUCT_NAME:rfc1034identifier)";
@@ -928,6 +951,9 @@
928951
ENABLE_NS_ASSERTIONS = NO;
929952
ENABLE_STRICT_OBJC_MSGSEND = YES;
930953
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
954+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = "$(inherited)";
955+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = "$(inherited)";
956+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "$(inherited)";
931957
GCC_C_LANGUAGE_STANDARD = gnu99;
932958
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
933959
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -936,8 +962,16 @@
936962
GCC_WARN_UNUSED_FUNCTION = YES;
937963
GCC_WARN_UNUSED_VARIABLE = YES;
938964
INFOPLIST_FILE = Tests/Info.plist;
939-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
940-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
965+
LD_RUNPATH_SEARCH_PATHS = (
966+
"$(inherited)",
967+
"@executable_path/Frameworks",
968+
"@loader_path/Frameworks",
969+
);
970+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
971+
"$(inherited)",
972+
"@executable_path/../Frameworks",
973+
"@loader_path/../Frameworks",
974+
);
941975
MTL_ENABLE_DEBUG_INFO = NO;
942976
PRODUCT_BUNDLE_IDENTIFIER = "com.pusher.$(PRODUCT_NAME:rfc1034identifier)";
943977
PRODUCT_NAME = PusherSwiftTests;

‎iOS Example Obj-C/iOS Example Obj-C.xcodeproj/project.pbxproj

-24
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
buildConfigurationList = 331F373F1D82CAB900AE2852 /* Build configuration list for PBXNativeTarget "iOS Example Obj-C" */;
117117
buildPhases = (
118118
331F37241D82CAB900AE2852 /* Sources */,
119-
E22966B12260A7E00050D509 /* Copy Carthage Frameworks */,
120119
331F37251D82CAB900AE2852 /* Frameworks */,
121120
331F37261D82CAB900AE2852 /* Resources */,
122121
339CC9B71DAB8D6D00E7F97B /* Embed Frameworks */,
@@ -182,29 +181,6 @@
182181
};
183182
/* End PBXResourcesBuildPhase section */
184183

185-
/* Begin PBXShellScriptBuildPhase section */
186-
E22966B12260A7E00050D509 /* Copy Carthage Frameworks */ = {
187-
isa = PBXShellScriptBuildPhase;
188-
buildActionMask = 2147483647;
189-
files = (
190-
);
191-
inputFileListPaths = (
192-
);
193-
inputPaths = (
194-
"$(SRCROOT)/../Carthage/Build/iOS/TweetNacl.framework",
195-
"$(SRCROOT)/../Carthage/Build/iOS/NWWebSocket.framework",
196-
);
197-
name = "Copy Carthage Frameworks";
198-
outputFileListPaths = (
199-
);
200-
outputPaths = (
201-
);
202-
runOnlyForDeploymentPostprocessing = 0;
203-
shellPath = /bin/sh;
204-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
205-
};
206-
/* End PBXShellScriptBuildPhase section */
207-
208184
/* Begin PBXSourcesBuildPhase section */
209185
331F37241D82CAB900AE2852 /* Sources */ = {
210186
isa = PBXSourcesBuildPhase;

‎iOS Example Swift/iOS Example Swift.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
10-
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A820569C3B000D4D08 /* Reachability.framework */; };
1110
335AD5B220569F14000D4D08 /* PusherSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 33CC82EA1D7F16A8003B699F /* PusherSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1211
33831CC21A9CFCDB00B124F1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CBE1A9CFCDB00B124F1 /* AppDelegate.swift */; };
1312
33831CC41A9CFCDB00B124F1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33831CC01A9CFCDB00B124F1 /* Main.storyboard */; };
@@ -57,7 +56,6 @@
5756
isa = PBXFrameworksBuildPhase;
5857
buildActionMask = 2147483647;
5958
files = (
60-
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */,
6159
33CC82EB1D7F16A8003B699F /* PusherSwift.framework in Frameworks */,
6260
);
6361
runOnlyForDeploymentPostprocessing = 0;
@@ -121,7 +119,6 @@
121119
buildConfigurationList = 33831C7D1A9CEEEA00B124F1 /* Build configuration list for PBXNativeTarget "iOS Example" */;
122120
buildPhases = (
123121
33831C5A1A9CEEE900B124F1 /* Sources */,
124-
335AD5AE20569C58000D4D08 /* Copy Carthage Frameworks */,
125122
33831C5B1A9CEEE900B124F1 /* Frameworks */,
126123
33831C5C1A9CEEE900B124F1 /* Resources */,
127124
3330F8921D86EF1900D8DC88 /* Embed App Extensions */,
@@ -190,25 +187,6 @@
190187
};
191188
/* End PBXResourcesBuildPhase section */
192189

193-
/* Begin PBXShellScriptBuildPhase section */
194-
335AD5AE20569C58000D4D08 /* Copy Carthage Frameworks */ = {
195-
isa = PBXShellScriptBuildPhase;
196-
buildActionMask = 2147483647;
197-
files = (
198-
);
199-
inputPaths = (
200-
"$(SRCROOT)/../Carthage/Build/iOS/TweetNacl.framework",
201-
"$(SRCROOT)/../Carthage/Build/iOS/NWWebSocket.framework",
202-
);
203-
name = "Copy Carthage Frameworks";
204-
outputPaths = (
205-
);
206-
runOnlyForDeploymentPostprocessing = 0;
207-
shellPath = /bin/sh;
208-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
209-
};
210-
/* End PBXShellScriptBuildPhase section */
211-
212190
/* Begin PBXSourcesBuildPhase section */
213191
33831C5A1A9CEEE900B124F1 /* Sources */ = {
214192
isa = PBXSourcesBuildPhase;
@@ -363,6 +341,7 @@
363341
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
364342
DEVELOPMENT_TEAM = H7FL434D9W;
365343
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
344+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = "$(inherited)";
366345
GCC_OPTIMIZATION_LEVEL = s;
367346
INFOPLIST_FILE = "iOS Example Swift/Info.plist";
368347
IPHONEOS_DEPLOYMENT_TARGET = 13.0;

0 commit comments

Comments
 (0)