Skip to content

Commit c6d2824

Browse files
NachoSotoNachoSoto
committed
Updated project to use XCFramework
This enables support for macCatalyst
1 parent f4f0715 commit c6d2824

File tree

1 file changed

+49
-72
lines changed

1 file changed

+49
-72
lines changed

‎Socket.IO-Client-Swift.xcodeproj/project.pbxproj‎

Lines changed: 49 additions & 72 deletions
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 */
@@ -19,9 +19,9 @@
1919
1C686BE71F869AFD007D8627 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD71F869AF1007D8627 /* SocketParserTest.swift */; };
2020
1C686BE81F869AFD007D8627 /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD81F869AF1007D8627 /* SocketNamespacePacketTest.swift */; };
2121
572EF2431B51F18A00EEBB58 /* SocketIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 572EF2381B51F18A00EEBB58 /* SocketIO.framework */; };
22+
579C7D4C2731B487009F8A2F /* Starscream.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 579C7D4B2731B487009F8A2F /* Starscream.xcframework */; };
2223
6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA08A971D615C0B0061FD2A /* Security.framework */; };
2324
74BF53581F894326004972D8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 572EF23C1B51F18A00EEBB58 /* SocketIO.h */; settings = {ATTRIBUTES = (Public, ); }; };
24-
74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; };
2525
74DA21741F09440F009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
2626
74DA217C1F09457B009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
2727
DD52B048C71D724ABBD18C71 /* SocketTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BDC9E66AADA2CC5E8246 /* SocketTypes.swift */; };
@@ -75,18 +75,15 @@
7575
572EF23B1B51F18A00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7676
572EF23C1B51F18A00EEBB58 /* SocketIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketIO.h; sourceTree = "<group>"; };
7777
572EF2421B51F18A00EEBB58 /* SocketIO-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SocketIO-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
78+
579C7D4B2731B487009F8A2F /* Starscream.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Starscream.xcframework; path = Carthage/Build/Starscream.xcframework; sourceTree = "<group>"; };
7879
6CA08A951D615C040061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
7980
6CA08A971D615C0B0061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
8081
6CA08A991D615C140061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
81-
749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Starscream.framework.dSYM; path = Carthage/Build/Mac/Starscream.framework.dSYM; sourceTree = "<group>"; };
8282
749FA1A11F811408002FBB30 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8383
74D0F58D1F804FED0037C4DC /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
8484
74DA21731F09440F009C19EE /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
8585
74DA217D1F0945E9009C19EE /* libcommonCrypto.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcommonCrypto.tbd; path = usr/lib/system/libcommonCrypto.tbd; sourceTree = SDKROOT; };
8686
9432E0061F77F7CA006AF628 /* SSLSecurity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSLSecurity.swift; sourceTree = "<group>"; };
87-
9432E0091F77F87D006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
88-
9432E00B1F77F883006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/Mac/Starscream.framework; sourceTree = "<group>"; };
89-
9432E00D1F77F889006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/tvOS/Starscream.framework; sourceTree = "<group>"; };
9087
DD52B078DB0A3C3D1BB507CD /* SocketIOClientOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketIOClientOption.swift; sourceTree = "<group>"; };
9188
DD52B09F7984E730513AB7E5 /* SocketAckManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketAckManager.swift; sourceTree = "<group>"; };
9289
DD52B1D9BC4AE46D38D827DE /* SocketIOStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketIOStatus.swift; sourceTree = "<group>"; };
@@ -120,8 +117,8 @@
120117
buildActionMask = 2147483647;
121118
files = (
122119
74DA21741F09440F009C19EE /* libz.tbd in Frameworks */,
120+
579C7D4C2731B487009F8A2F /* Starscream.xcframework in Frameworks */,
123121
6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */,
124-
74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */,
125122
);
126123
runOnlyForDeploymentPostprocessing = 0;
127124
};
@@ -231,11 +228,8 @@
231228
isa = PBXGroup;
232229
children = (
233230
749FA1A11F811408002FBB30 /* Foundation.framework */,
234-
749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */,
231+
579C7D4B2731B487009F8A2F /* Starscream.xcframework */,
235232
74D0F58D1F804FED0037C4DC /* libz.tbd */,
236-
9432E0091F77F87D006AF628 /* Starscream.framework */,
237-
9432E00B1F77F883006AF628 /* Starscream.framework */,
238-
9432E00D1F77F889006AF628 /* Starscream.framework */,
239233
74DA217D1F0945E9009C19EE /* libcommonCrypto.tbd */,
240234
74DA21731F09440F009C19EE /* libz.tbd */,
241235
6CA08A9E1D615C340061FD2A /* tvOS */,
@@ -541,33 +535,9 @@
541535
"ENABLE_BITCODE[sdk=macosx*]" = NO;
542536
ENABLE_STRICT_OBJC_MSGSEND = YES;
543537
ENABLE_TESTABILITY = YES;
544-
"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
545-
"$(inherited)",
546-
"$(PROJECT_DIR)/Carthage/Build/tvOS",
547-
);
548-
"FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = (
549-
"$(inherited)",
550-
"$(PROJECT_DIR)/Carthage/Build/tvOS",
551-
);
552-
"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = (
553-
"$(inherited)",
554-
"$(PROJECT_DIR)/Carthage/Build/iOS",
555-
);
556-
"FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = (
557-
"$(inherited)",
558-
"$(PROJECT_DIR)/Carthage/Build/iOS",
559-
);
560-
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
561-
"$(inherited)",
562-
"$(PROJECT_DIR)/Carthage/Build/Mac",
563-
);
564-
"FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = (
565-
"$(PROJECT_DIR)/Carthage/Build/watchOS",
566-
"$(inherited)",
567-
);
568-
"FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = (
569-
"$(PROJECT_DIR)/Carthage/Build/watchOS",
538+
FRAMEWORK_SEARCH_PATHS = (
570539
"$(inherited)",
540+
"$(PROJECT_DIR)/Carthage/Build/",
571541
);
572542
GCC_NO_COMMON_BLOCKS = YES;
573543
GCC_OPTIMIZATION_LEVEL = 0;
@@ -616,33 +586,9 @@
616586
ENABLE_BITCODE = YES;
617587
"ENABLE_BITCODE[sdk=macosx*]" = NO;
618588
ENABLE_STRICT_OBJC_MSGSEND = YES;
619-
"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
620-
"$(inherited)",
621-
"$(PROJECT_DIR)/Carthage/Build/tvOS",
622-
);
623-
"FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = (
624-
"$(inherited)",
625-
"$(PROJECT_DIR)/Carthage/Build/tvOS",
626-
);
627-
"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = (
628-
"$(inherited)",
629-
"$(PROJECT_DIR)/Carthage/Build/iOS",
630-
);
631-
"FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = (
632-
"$(inherited)",
633-
"$(PROJECT_DIR)/Carthage/Build/iOS",
634-
);
635-
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
636-
"$(inherited)",
637-
"$(PROJECT_DIR)/Carthage/Build/Mac",
638-
);
639-
"FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = (
640-
"$(PROJECT_DIR)/Carthage/Build/watchOS",
641-
"$(inherited)",
642-
);
643-
"FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = (
644-
"$(PROJECT_DIR)/Carthage/Build/watchOS",
589+
FRAMEWORK_SEARCH_PATHS = (
645590
"$(inherited)",
591+
"$(PROJECT_DIR)/Carthage/Build/",
646592
);
647593
GCC_NO_COMMON_BLOCKS = YES;
648594
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -655,7 +601,8 @@
655601
MACOSX_DEPLOYMENT_TARGET = 10.14;
656602
PRODUCT_NAME = SocketIO;
657603
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
658-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
604+
SWIFT_COMPILATION_MODE = wholemodule;
605+
SWIFT_OPTIMIZATION_LEVEL = "-O";
659606
SWIFT_VERSION = 5.0;
660607
TVOS_DEPLOYMENT_TARGET = 10.0;
661608
VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64 armv7k";
@@ -712,8 +659,16 @@
712659
GCC_WARN_UNUSED_VARIABLE = YES;
713660
INFOPLIST_FILE = SocketIO/Info.plist;
714661
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
715-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
716-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
662+
LD_RUNPATH_SEARCH_PATHS = (
663+
"$(inherited)",
664+
"@executable_path/Frameworks",
665+
"@loader_path/Frameworks",
666+
);
667+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
668+
"$(inherited)",
669+
"@executable_path/../Frameworks",
670+
"@loader_path/../Frameworks",
671+
);
717672
LIBRARY_SEARCH_PATHS = "$(inherited)";
718673
MACOSX_DEPLOYMENT_TARGET = 10.10;
719674
MTL_ENABLE_DEBUG_INFO = YES;
@@ -779,8 +734,16 @@
779734
GCC_WARN_UNUSED_VARIABLE = YES;
780735
INFOPLIST_FILE = SocketIO/Info.plist;
781736
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
782-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
783-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
737+
LD_RUNPATH_SEARCH_PATHS = (
738+
"$(inherited)",
739+
"@executable_path/Frameworks",
740+
"@loader_path/Frameworks",
741+
);
742+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
743+
"$(inherited)",
744+
"@executable_path/../Frameworks",
745+
"@loader_path/../Frameworks",
746+
);
784747
LIBRARY_SEARCH_PATHS = "$(inherited)";
785748
MACOSX_DEPLOYMENT_TARGET = 10.10;
786749
MTL_ENABLE_DEBUG_INFO = NO;
@@ -864,8 +827,15 @@
864827
GCC_WARN_UNUSED_FUNCTION = YES;
865828
GCC_WARN_UNUSED_VARIABLE = YES;
866829
INFOPLIST_FILE = SocketIO/Info.plist;
867-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
868-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
830+
LD_RUNPATH_SEARCH_PATHS = (
831+
"$(inherited)",
832+
"@executable_path/Frameworks",
833+
"@loader_path/Frameworks",
834+
);
835+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
836+
"@executable_path/../Frameworks",
837+
"@loader_path/../Frameworks",
838+
);
869839
LIBRARY_SEARCH_PATHS = "$(inherited)";
870840
MACOSX_DEPLOYMENT_TARGET = 10.10;
871841
MTL_ENABLE_DEBUG_INFO = YES;
@@ -940,8 +910,15 @@
940910
GCC_WARN_UNUSED_FUNCTION = YES;
941911
GCC_WARN_UNUSED_VARIABLE = YES;
942912
INFOPLIST_FILE = SocketIO/Info.plist;
943-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
944-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
913+
LD_RUNPATH_SEARCH_PATHS = (
914+
"$(inherited)",
915+
"@executable_path/Frameworks",
916+
"@loader_path/Frameworks",
917+
);
918+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
919+
"@executable_path/../Frameworks",
920+
"@loader_path/../Frameworks",
921+
);
945922
LIBRARY_SEARCH_PATHS = "$(inherited)";
946923
MACOSX_DEPLOYMENT_TARGET = 10.10;
947924
MTL_ENABLE_DEBUG_INFO = NO;

0 commit comments

Comments
 (0)