From 5ff8c49698bc61c93e1dda054092a7a62dd8f9d1 Mon Sep 17 00:00:00 2001 From: Umair Date: Mon, 5 Aug 2024 15:23:47 +0100 Subject: [PATCH] fix tvOS --- Ably.xcodeproj/project.pbxproj | 4 ++-- Source/SocketRocket/Internal/Proxy/ARTSRProxyConnect.m | 7 ------- Source/SocketRocket/Internal/Utilities/ARTSRURLUtilities.m | 6 ------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Ably.xcodeproj/project.pbxproj b/Ably.xcodeproj/project.pbxproj index 127b297ba..8bf2019fc 100644 --- a/Ably.xcodeproj/project.pbxproj +++ b/Ably.xcodeproj/project.pbxproj @@ -4163,7 +4163,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 14.0; }; name = Debug; }; @@ -4200,7 +4200,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 14.0; }; name = Release; }; diff --git a/Source/SocketRocket/Internal/Proxy/ARTSRProxyConnect.m b/Source/SocketRocket/Internal/Proxy/ARTSRProxyConnect.m index 030f39cc2..6bb5555ee 100644 --- a/Source/SocketRocket/Internal/Proxy/ARTSRProxyConnect.m +++ b/Source/SocketRocket/Internal/Proxy/ARTSRProxyConnect.m @@ -239,14 +239,7 @@ - (void)_fetchPAC:(NSURL *)PACurl withProxySettings:(NSDictionary *)proxySetting __weak typeof(self) wself = self; NSURLRequest *request = [NSURLRequest requestWithURL:PACurl]; NSURLSessionConfiguration *config = [NSURLSessionConfiguration ephemeralSessionConfiguration]; -#if TARGET_OS_MACCATALYST // if (@available(iOS 13.0, macCatalyst 13.0, ... doesn't help config.TLSMinimumSupportedProtocolVersion = tls_protocol_version_TLSv12; -#else - if (@available(iOS 13.0, macOS 10.15, tvOS 13.0, *)) { - config.TLSMinimumSupportedProtocolVersion = tls_protocol_version_TLSv12; - } else { - } -#endif NSURLSession *session = [NSURLSession sessionWithConfiguration:config delegate:nil delegateQueue:nil]; [[session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { __strong typeof(wself) sself = wself; diff --git a/Source/SocketRocket/Internal/Utilities/ARTSRURLUtilities.m b/Source/SocketRocket/Internal/Utilities/ARTSRURLUtilities.m index 7c51b23e5..0aebb29e2 100644 --- a/Source/SocketRocket/Internal/Utilities/ARTSRURLUtilities.m +++ b/Source/SocketRocket/Internal/Utilities/ARTSRURLUtilities.m @@ -80,12 +80,6 @@ extern BOOL ARTSRURLRequiresSSL(NSURL *url) networkServiceType = NSStreamNetworkServiceTypeVoice; break; -//#if !TARGET_OS_MACCATALYST -// case NSURLNetworkServiceTypeVoIP: -// networkServiceType = NSStreamNetworkServiceTypeVoIP; -// break; -//#endif - #if _ARTSR_XCODE_VERSION_11_OR_LATER case NSURLNetworkServiceTypeAVStreaming: networkServiceType = NSStreamNetworkServiceTypeVideo;