From 762ef6ff7114e895c38ae3d0da486e726b331ca2 Mon Sep 17 00:00:00 2001 From: Adam Jurczyk Date: Wed, 24 Apr 2019 08:43:49 +0200 Subject: [PATCH 1/2] Fixed Swift version to 5.0 for OSX, tvOS build targets. --- SwiftWebSocket.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SwiftWebSocket.xcodeproj/project.pbxproj b/SwiftWebSocket.xcodeproj/project.pbxproj index 1296090..3ff2456 100755 --- a/SwiftWebSocket.xcodeproj/project.pbxproj +++ b/SwiftWebSocket.xcodeproj/project.pbxproj @@ -589,7 +589,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -642,7 +642,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -768,7 +768,7 @@ PRODUCT_NAME = SwiftWebSocket; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; VALID_ARCHS = x86_64; }; name = Debug; @@ -792,7 +792,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; VALID_ARCHS = x86_64; }; name = Release; @@ -808,7 +808,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.Test-ObjectiveC"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -822,7 +822,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.Test-ObjectiveC"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; From 3aea78dbf8b21906f3cce4fef604b284c6f7e8d8 Mon Sep 17 00:00:00 2001 From: Adam Jurczyk Date: Thu, 19 Aug 2021 17:46:58 +0200 Subject: [PATCH 2/2] 'Update': Updated to allow for Apple Silicon build. --- Source/WebSocket.swift | 2 +- SwiftWebSocket.xcodeproj/project.pbxproj | 26 +++++++++---------- .../xcschemes/SwiftWebSocket-OSX.xcscheme | 6 +---- .../xcschemes/SwiftWebSocket-iOS.xcscheme | 24 +++++++---------- .../xcschemes/SwiftWebSocket-tvOS.xcscheme | 6 +---- .../xcshareddata/xcschemes/Test-OSX.xcscheme | 6 +---- .../xcshareddata/xcschemes/Test-iOS.xcscheme | 6 +---- 7 files changed, 28 insertions(+), 48 deletions(-) diff --git a/Source/WebSocket.swift b/Source/WebSocket.swift index 982e773..3295667 100644 --- a/Source/WebSocket.swift +++ b/Source/WebSocket.swift @@ -1466,7 +1466,7 @@ private class InnerWebSocket: Hashable { } } let r = arc4random() - var maskBytes : [UInt8] = [UInt8(r >> 0 & 0xFF), UInt8(r >> 8 & 0xFF), UInt8(r >> 16 & 0xFF), UInt8(r >> 24 & 0xFF)] + let maskBytes : [UInt8] = [UInt8(r >> 0 & 0xFF), UInt8(r >> 8 & 0xFF), UInt8(r >> 16 & 0xFF), UInt8(r >> 24 & 0xFF)] for i in 0 ..< 4 { head[hlen] = maskBytes[i] hlen += 1 diff --git a/SwiftWebSocket.xcodeproj/project.pbxproj b/SwiftWebSocket.xcodeproj/project.pbxproj index 3ff2456..2e1071f 100755 --- a/SwiftWebSocket.xcodeproj/project.pbxproj +++ b/SwiftWebSocket.xcodeproj/project.pbxproj @@ -325,7 +325,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1230; ORGANIZATIONNAME = "ONcast, LLC"; TargetAttributes = { 03957A3B1C5A71DB005CC1DB = { @@ -508,7 +508,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -531,7 +531,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -558,6 +558,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -584,7 +585,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -619,6 +620,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -638,7 +640,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -661,7 +663,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftWebSocket; @@ -681,7 +683,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftWebSocket; @@ -726,7 +728,7 @@ buildSettings = { DEBUG_INFORMATION_FORMAT = dwarf; INFOPLIST_FILE = Test/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.oncast.SwiftWebSocketTest; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -737,7 +739,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = Test/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.oncast.SwiftWebSocketTest; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -769,7 +771,6 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -793,7 +794,6 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; - VALID_ARCHS = x86_64; }; name = Release; }; @@ -803,7 +803,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEBUG_INFORMATION_FORMAT = dwarf; INFOPLIST_FILE = "Test-ObjectiveC/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.Test-ObjectiveC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -817,7 +817,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = "Test-ObjectiveC/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.Test-ObjectiveC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/SwiftWebSocket.xcodeproj/xcshareddata/xcschemes/SwiftWebSocket-OSX.xcscheme b/SwiftWebSocket.xcodeproj/xcshareddata/xcschemes/SwiftWebSocket-OSX.xcscheme index 8cab445..da8a060 100755 --- a/SwiftWebSocket.xcodeproj/xcshareddata/xcschemes/SwiftWebSocket-OSX.xcscheme +++ b/SwiftWebSocket.xcodeproj/xcshareddata/xcschemes/SwiftWebSocket-OSX.xcscheme @@ -1,6 +1,6 @@ - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - - - - - - - - -