haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(ios) drop support for iOS 11

This commit is contained in:
Saúl Ibarra Corretgé 2021-03-05 12:07:25 +01:00 committed by Saúl Ibarra Corretgé
parent b1ecd03924
commit 4bfbc72613
5 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ios/Podfile
View File

@ -1,4 +1,4 @@
platform :ios, '11.0' platform :ios, '12.0'
workspace 'jitsi-meet' workspace 'jitsi-meet'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
install! 'cocoapods', :deterministic_uuids => false install! 'cocoapods', :deterministic_uuids => false
@ -87,7 +87,7 @@ post_install do |installer|
target.build_configurations.each do |config| target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'YES' config.build_settings['ENABLE_BITCODE'] = 'YES'
config.build_settings['SUPPORTS_MACCATALYST'] = 'NO' 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 end
end end

2
ios/Podfile.lock
View File

@ -605,6 +605,6 @@ SPEC CHECKSUMS:
RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3 RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
PODFILE CHECKSUM: e830b1b5a46d340e22689b146b55dcf24664c6f1 PODFILE CHECKSUM: 3cc305fd6ee83fff506c10c4805471fa72b61c9a
COCOAPODS: 1.10.1 COCOAPODS: 1.10.1

4
ios/app/app.xcodeproj/project.pbxproj
View File

@ -996,7 +996,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /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; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1049,7 +1049,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /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; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule; SWIFT_COMPILATION_MODE = wholemodule;

48
ios/app/src/ViewController.m
View File

@ -1,6 +1,5 @@
/* /*
* Copyright @ 2018-present 8x8, Inc. * Copyright @ 2017-present 8x8, Inc.
* Copyright @ 2017-2018 Atlassian Pty Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -15,8 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#import <Availability.h>
@import CoreSpotlight; @import CoreSpotlight;
@import MobileCoreServices; @import MobileCoreServices;
@import Intents; // Needed for NSUserActivity suggestedInvocationPhrase @import Intents; // Needed for NSUserActivity suggestedInvocationPhrase
@ -58,34 +55,29 @@
[self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data]; [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
// Register a NSUserActivity for this conference so it can be invoked as a // Register a NSUserActivity for this conference so it can be invoked as a
// Siri shortcut. This is only supported in iOS >= 12. // Siri shortcut.
#ifdef __IPHONE_12_0 NSUserActivity *userActivity
if (@available(iOS 12.0, *)) { = [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType];
NSUserActivity *userActivity
= [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType];
NSString *urlStr = data[@"url"]; NSString *urlStr = data[@"url"];
NSURL *url = [NSURL URLWithString:urlStr]; NSURL *url = [NSURL URLWithString:urlStr];
NSString *conference = [url.pathComponents lastObject]; NSString *conference = [url.pathComponents lastObject];
userActivity.title = [NSString stringWithFormat:@"Join %@", conference]; userActivity.title = [NSString stringWithFormat:@"Join %@", conference];
userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting"; userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting";
userActivity.userInfo = @{@"url": urlStr}; userActivity.userInfo = @{@"url": urlStr};
[userActivity setEligibleForSearch:YES]; [userActivity setEligibleForSearch:YES];
[userActivity setEligibleForPrediction:YES]; [userActivity setEligibleForPrediction:YES];
[userActivity setPersistentIdentifier:urlStr]; [userActivity setPersistentIdentifier:urlStr];
// Subtitle // Subtitle
CSSearchableItemAttributeSet *attributes CSSearchableItemAttributeSet *attributes
= [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem]; = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem];
attributes.contentDescription = urlStr; attributes.contentDescription = urlStr;
userActivity.contentAttributeSet = attributes; userActivity.contentAttributeSet = attributes;
self.userActivity = userActivity;
[userActivity becomeCurrent];
}
#endif
self.userActivity = userActivity;
[userActivity becomeCurrent];
} }
- (void)conferenceTerminated:(NSDictionary *)data { - (void)conferenceTerminated:(NSDictionary *)data {

4
ios/sdk/sdk.xcodeproj/project.pbxproj
View File

@ -520,7 +520,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -576,7 +576,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule; SWIFT_COMPILATION_MODE = wholemodule;