Selaa lähdekoodia

feat(ios) drop support for iOS 11

master
Saúl Ibarra Corretgé 4 vuotta sitten
vanhempi
commit
4bfbc72613

+ 2
- 2
ios/Podfile Näytä tiedosto

1
-platform :ios, '11.0'
1
+platform :ios, '12.0'
2
 workspace 'jitsi-meet'
2
 workspace 'jitsi-meet'
3
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
3
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
4
 install! 'cocoapods', :deterministic_uuids => false
4
 install! 'cocoapods', :deterministic_uuids => false
87
     target.build_configurations.each do |config|
87
     target.build_configurations.each do |config|
88
       config.build_settings['ENABLE_BITCODE'] = 'YES'
88
       config.build_settings['ENABLE_BITCODE'] = 'YES'
89
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
89
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
90
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
90
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
91
     end
91
     end
92
   end
92
   end
93
 end
93
 end

+ 1
- 1
ios/Podfile.lock Näytä tiedosto

605
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
605
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
606
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
606
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
607
 
607
 
608
-PODFILE CHECKSUM: e830b1b5a46d340e22689b146b55dcf24664c6f1
608
+PODFILE CHECKSUM: 3cc305fd6ee83fff506c10c4805471fa72b61c9a
609
 
609
 
610
 COCOAPODS: 1.10.1
610
 COCOAPODS: 1.10.1

+ 2
- 2
ios/app/app.xcodeproj/project.pbxproj Näytä tiedosto

996
 					"$(inherited)",
996
 					"$(inherited)",
997
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
997
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
998
 				);
998
 				);
999
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
999
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1000
 				MTL_ENABLE_DEBUG_INFO = YES;
1000
 				MTL_ENABLE_DEBUG_INFO = YES;
1001
 				ONLY_ACTIVE_ARCH = YES;
1001
 				ONLY_ACTIVE_ARCH = YES;
1002
 				SDKROOT = iphoneos;
1002
 				SDKROOT = iphoneos;
1049
 					"$(inherited)",
1049
 					"$(inherited)",
1050
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1050
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1051
 				);
1051
 				);
1052
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1052
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1053
 				MTL_ENABLE_DEBUG_INFO = NO;
1053
 				MTL_ENABLE_DEBUG_INFO = NO;
1054
 				SDKROOT = iphoneos;
1054
 				SDKROOT = iphoneos;
1055
 				SWIFT_COMPILATION_MODE = wholemodule;
1055
 				SWIFT_COMPILATION_MODE = wholemodule;

+ 24
- 32
ios/app/src/ViewController.m Näytä tiedosto

1
 /*
1
 /*
2
- * Copyright @ 2018-present 8x8, Inc.
3
- * Copyright @ 2017-2018 Atlassian Pty Ltd
2
+ * Copyright @ 2017-present 8x8, Inc.
4
  *
3
  *
5
  * Licensed under the Apache License, Version 2.0 (the "License");
4
  * Licensed under the Apache License, Version 2.0 (the "License");
6
  * you may not use this file except in compliance with the License.
5
  * you may not use this file except in compliance with the License.
15
  * limitations under the License.
14
  * limitations under the License.
16
  */
15
  */
17
 
16
 
18
-#import <Availability.h>
19
-
20
 @import CoreSpotlight;
17
 @import CoreSpotlight;
21
 @import MobileCoreServices;
18
 @import MobileCoreServices;
22
 @import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
19
 @import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
58
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
55
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
59
 
56
 
60
     // Register a NSUserActivity for this conference so it can be invoked as a
57
     // Register a NSUserActivity for this conference so it can be invoked as a
61
-    // Siri shortcut. This is only supported in iOS >= 12.
62
-#ifdef __IPHONE_12_0
63
-    if (@available(iOS 12.0, *)) {
64
-      NSUserActivity *userActivity
65
-        = [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType];
66
-
67
-      NSString *urlStr = data[@"url"];
68
-      NSURL *url = [NSURL URLWithString:urlStr];
69
-      NSString *conference = [url.pathComponents lastObject];
70
-
71
-      userActivity.title = [NSString stringWithFormat:@"Join %@", conference];
72
-      userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting";
73
-      userActivity.userInfo = @{@"url": urlStr};
74
-      [userActivity setEligibleForSearch:YES];
75
-      [userActivity setEligibleForPrediction:YES];
76
-      [userActivity setPersistentIdentifier:urlStr];
77
-
78
-      // Subtitle
79
-      CSSearchableItemAttributeSet *attributes
80
-        = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem];
81
-      attributes.contentDescription = urlStr;
82
-      userActivity.contentAttributeSet = attributes;
83
-
84
-      self.userActivity = userActivity;
85
-      [userActivity becomeCurrent];
86
-    }
87
-#endif
88
-
58
+    // Siri shortcut.
59
+    NSUserActivity *userActivity
60
+      = [[NSUserActivity alloc] initWithActivityType:JitsiMeetConferenceActivityType];
61
+
62
+    NSString *urlStr = data[@"url"];
63
+    NSURL *url = [NSURL URLWithString:urlStr];
64
+    NSString *conference = [url.pathComponents lastObject];
65
+
66
+    userActivity.title = [NSString stringWithFormat:@"Join %@", conference];
67
+    userActivity.suggestedInvocationPhrase = @"Join my Jitsi meeting";
68
+    userActivity.userInfo = @{@"url": urlStr};
69
+    [userActivity setEligibleForSearch:YES];
70
+    [userActivity setEligibleForPrediction:YES];
71
+    [userActivity setPersistentIdentifier:urlStr];
72
+
73
+    // Subtitle
74
+    CSSearchableItemAttributeSet *attributes
75
+      = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:(NSString *)kUTTypeItem];
76
+    attributes.contentDescription = urlStr;
77
+    userActivity.contentAttributeSet = attributes;
78
+
79
+    self.userActivity = userActivity;
80
+    [userActivity becomeCurrent];
89
 }
81
 }
90
 
82
 
91
 - (void)conferenceTerminated:(NSDictionary *)data {
83
 - (void)conferenceTerminated:(NSDictionary *)data {

+ 2
- 2
ios/sdk/sdk.xcodeproj/project.pbxproj Näytä tiedosto

520
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
520
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
521
 				GCC_WARN_UNUSED_FUNCTION = YES;
521
 				GCC_WARN_UNUSED_FUNCTION = YES;
522
 				GCC_WARN_UNUSED_VARIABLE = YES;
522
 				GCC_WARN_UNUSED_VARIABLE = YES;
523
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
523
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
524
 				MTL_ENABLE_DEBUG_INFO = YES;
524
 				MTL_ENABLE_DEBUG_INFO = YES;
525
 				ONLY_ACTIVE_ARCH = YES;
525
 				ONLY_ACTIVE_ARCH = YES;
526
 				SDKROOT = iphoneos;
526
 				SDKROOT = iphoneos;
576
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
576
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
577
 				GCC_WARN_UNUSED_FUNCTION = YES;
577
 				GCC_WARN_UNUSED_FUNCTION = YES;
578
 				GCC_WARN_UNUSED_VARIABLE = YES;
578
 				GCC_WARN_UNUSED_VARIABLE = YES;
579
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
579
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
580
 				MTL_ENABLE_DEBUG_INFO = NO;
580
 				MTL_ENABLE_DEBUG_INFO = NO;
581
 				SDKROOT = iphoneos;
581
 				SDKROOT = iphoneos;
582
 				SWIFT_COMPILATION_MODE = wholemodule;
582
 				SWIFT_COMPILATION_MODE = wholemodule;

Loading…
Peruuta
Tallenna