From 4bfbc72613d17c56be56ec7018f3a6a1377a02b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 5 Mar 2021 12:07:25 +0100 Subject: [PATCH] feat(ios) drop support for iOS 11 --- ios/Podfile | 4 +-- ios/Podfile.lock | 2 +- ios/app/app.xcodeproj/project.pbxproj | 4 +-- ios/app/src/ViewController.m | 48 +++++++++++---------------- ios/sdk/sdk.xcodeproj/project.pbxproj | 4 +-- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index b05867f7b..3216244d1 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,4 +1,4 @@ -platform :ios, '11.0' +platform :ios, '12.0' workspace 'jitsi-meet' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' install! 'cocoapods', :deterministic_uuids => false @@ -87,7 +87,7 @@ post_install do |installer| target.build_configurations.each do |config| config.build_settings['ENABLE_BITCODE'] = 'YES' config.build_settings['SUPPORTS_MACCATALYST'] = 'NO' - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fcc15f826..599bba8c0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -605,6 +605,6 @@ SPEC CHECKSUMS: RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3 Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c -PODFILE CHECKSUM: e830b1b5a46d340e22689b146b55dcf24664c6f1 +PODFILE CHECKSUM: 3cc305fd6ee83fff506c10c4805471fa72b61c9a COCOAPODS: 1.10.1 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 6c474557d..1e1f4952b 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -996,7 +996,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1049,7 +1049,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/ios/app/src/ViewController.m b/ios/app/src/ViewController.m index 8e5358f8d..0950150c3 100644 --- a/ios/app/src/ViewController.m +++ b/ios/app/src/ViewController.m @@ -1,6 +1,5 @@ /* - * Copyright @ 2018-present 8x8, Inc. - * Copyright @ 2017-2018 Atlassian Pty Ltd + * Copyright @ 2017-present 8x8, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +14,6 @@ * limitations under the License. */ -#import - @import CoreSpotlight; @import MobileCoreServices; @import Intents; // Needed for NSUserActivity suggestedInvocationPhrase @@ -58,34 +55,29 @@ [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data]; // Register a NSUserActivity for this conference so it can be invoked as a - // Siri shortcut. This is only supported in iOS >= 12. -#ifdef __IPHONE_12_0 - if (@available(iOS 12.0, *)) { - NSUserActivity *userActivity - = [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType]; + // Siri shortcut. + NSUserActivity *userActivity + = [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType]; - NSString *urlStr = data[@"url"]; - NSURL *url = [NSURL URLWithString:urlStr]; - NSString *conference = [url.pathComponents lastObject]; + NSString *urlStr = data[@"url"]; + NSURL *url = [NSURL URLWithString:urlStr]; + NSString *conference = [url.pathComponents lastObject]; - userActivity.title = [NSString stringWithFormat:@"Join %@", conference]; - userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting"; - userActivity.userInfo = @{@"url": urlStr}; - [userActivity setEligibleForSearch:YES]; - [userActivity setEligibleForPrediction:YES]; - [userActivity setPersistentIdentifier:urlStr]; + userActivity.title = [NSString stringWithFormat:@"Join %@", conference]; + userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting"; + userActivity.userInfo = @{@"url": urlStr}; + [userActivity setEligibleForSearch:YES]; + [userActivity setEligibleForPrediction:YES]; + [userActivity setPersistentIdentifier:urlStr]; - // Subtitle - CSSearchableItemAttributeSet *attributes - = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem]; - attributes.contentDescription = urlStr; - userActivity.contentAttributeSet = attributes; - - self.userActivity = userActivity; - [userActivity becomeCurrent]; - } -#endif + // Subtitle + CSSearchableItemAttributeSet *attributes + = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem]; + attributes.contentDescription = urlStr; + userActivity.contentAttributeSet = attributes; + self.userActivity = userActivity; + [userActivity becomeCurrent]; } - (void)conferenceTerminated:(NSDictionary *)data { diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index 31d5d1aaa..0537141c7 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -520,7 +520,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -576,7 +576,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule;