Skip to content

Commit 0898078

Browse files
authored
Merge pull request socketio#1448 from NachoSoto/xros
Add support for `xrOS`
2 parents 61a7f2e + 69124a7 commit 0898078

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "daltoniam/Starscream" ~> 4.0
1+
github "NachoSoto/Starscream" "xros"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "daltoniam/Starscream" "4.0.4"
1+
github "NachoSoto/Starscream" "4a776fae4200ce2087ad1bbb45c2bc59e1231d8d"

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -511,7 +511,6 @@
511511
572EF2121B51F12F00EEBB58 /* Debug */ = {
512512
isa = XCBuildConfiguration;
513513
buildSettings = {
514-
BITCODE_GENERATION_MODE = bitcode;
515514
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
516515
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
517516
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -531,8 +530,6 @@
531530
CLANG_WARN_UNREACHABLE_CODE = YES;
532531
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
533532
CODE_SIGN_IDENTITY = "Mac Developer";
534-
ENABLE_BITCODE = YES;
535-
"ENABLE_BITCODE[sdk=macosx*]" = NO;
536533
ENABLE_STRICT_OBJC_MSGSEND = YES;
537534
ENABLE_TESTABILITY = YES;
538535
FRAMEWORK_SEARCH_PATHS = (
@@ -551,7 +548,7 @@
551548
MACOSX_DEPLOYMENT_TARGET = 10.14;
552549
ONLY_ACTIVE_ARCH = YES;
553550
PRODUCT_NAME = SocketIO;
554-
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
551+
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator xrsimulator xros";
555552
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
556553
SWIFT_VERSION = 5.0;
557554
TVOS_DEPLOYMENT_TARGET = 10.0;
@@ -563,7 +560,6 @@
563560
572EF2131B51F12F00EEBB58 /* Release */ = {
564561
isa = XCBuildConfiguration;
565562
buildSettings = {
566-
BITCODE_GENERATION_MODE = bitcode;
567563
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
568564
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
569565
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -583,8 +579,6 @@
583579
CLANG_WARN_UNREACHABLE_CODE = YES;
584580
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
585581
CODE_SIGN_IDENTITY = "Mac Developer";
586-
ENABLE_BITCODE = YES;
587-
"ENABLE_BITCODE[sdk=macosx*]" = NO;
588582
ENABLE_STRICT_OBJC_MSGSEND = YES;
589583
FRAMEWORK_SEARCH_PATHS = (
590584
"$(inherited)",
@@ -600,7 +594,7 @@
600594
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
601595
MACOSX_DEPLOYMENT_TARGET = 10.14;
602596
PRODUCT_NAME = SocketIO;
603-
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
597+
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator xrsimulator xros";
604598
SWIFT_COMPILATION_MODE = wholemodule;
605599
SWIFT_OPTIMIZATION_LEVEL = "-O";
606600
SWIFT_VERSION = 5.0;
@@ -613,6 +607,7 @@
613607
572EF24C1B51F18A00EEBB58 /* Debug */ = {
614608
isa = XCBuildConfiguration;
615609
buildSettings = {
610+
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
616611
ALWAYS_SEARCH_USER_PATHS = NO;
617612
APPLICATION_EXTENSION_API_ONLY = YES;
618613
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -637,8 +632,6 @@
637632
DYLIB_COMPATIBILITY_VERSION = 1;
638633
DYLIB_CURRENT_VERSION = 1;
639634
DYLIB_INSTALL_NAME_BASE = "@rpath";
640-
ENABLE_BITCODE = YES;
641-
"ENABLE_BITCODE[sdk=macosx*]" = NO;
642635
ENABLE_STRICT_OBJC_MSGSEND = YES;
643636
ENABLE_TESTABILITY = YES;
644637
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -678,11 +671,13 @@
678671
SKIP_INSTALL = YES;
679672
SUPPORTED_PLATFORMS = "$(inherited)";
680673
SUPPORTS_MACCATALYST = YES;
674+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
675+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
681676
SWIFT_INCLUDE_PATHS = "";
682677
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
683678
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
684679
SWIFT_VERSION = 5.0;
685-
TARGETED_DEVICE_FAMILY = "1,2,3,4";
680+
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
686681
TVOS_DEPLOYMENT_TARGET = 10.0;
687682
VALID_ARCHS = "$(inherited)";
688683
VERSIONING_SYSTEM = "apple-generic";
@@ -693,6 +688,7 @@
693688
572EF24D1B51F18A00EEBB58 /* Release */ = {
694689
isa = XCBuildConfiguration;
695690
buildSettings = {
691+
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
696692
ALWAYS_SEARCH_USER_PATHS = NO;
697693
APPLICATION_EXTENSION_API_ONLY = YES;
698694
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -717,8 +713,6 @@
717713
DYLIB_COMPATIBILITY_VERSION = 1;
718714
DYLIB_CURRENT_VERSION = 1;
719715
DYLIB_INSTALL_NAME_BASE = "@rpath";
720-
ENABLE_BITCODE = YES;
721-
"ENABLE_BITCODE[sdk=macosx*]" = NO;
722716
ENABLE_NS_ASSERTIONS = NO;
723717
ENABLE_STRICT_OBJC_MSGSEND = YES;
724718
ENABLE_TESTABILITY = YES;
@@ -752,10 +746,12 @@
752746
SKIP_INSTALL = YES;
753747
SUPPORTED_PLATFORMS = "$(inherited)";
754748
SUPPORTS_MACCATALYST = YES;
749+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
750+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
755751
SWIFT_INCLUDE_PATHS = "";
756752
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
757753
SWIFT_VERSION = 5.0;
758-
TARGETED_DEVICE_FAMILY = "1,2,3,4";
754+
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
759755
TVOS_DEPLOYMENT_TARGET = 10.0;
760756
VALID_ARCHS = "$(inherited)";
761757
VERSIONING_SYSTEM = "apple-generic";
@@ -784,7 +780,6 @@
784780
COMBINE_HIDPI_IMAGES = YES;
785781
COPY_PHASE_STRIP = NO;
786782
DEBUG_INFORMATION_FORMAT = dwarf;
787-
ENABLE_BITCODE = NO;
788783
ENABLE_STRICT_OBJC_MSGSEND = YES;
789784
FRAMEWORK_SEARCH_PATHS = (
790785
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -873,7 +868,6 @@
873868
COMBINE_HIDPI_IMAGES = YES;
874869
COPY_PHASE_STRIP = NO;
875870
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
876-
ENABLE_BITCODE = NO;
877871
ENABLE_NS_ASSERTIONS = NO;
878872
ENABLE_STRICT_OBJC_MSGSEND = YES;
879873
FRAMEWORK_SEARCH_PATHS = (

0 commit comments

Comments
 (0)