Procházet zdrojové kódy

feat(ios) drop support for iOS 11

master
Saúl Ibarra Corretgé před 4 roky
rodič
revize
4bfbc72613

+ 2
- 2
ios/Podfile Zobrazit soubor

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

+ 1
- 1
ios/Podfile.lock Zobrazit soubor

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

+ 2
- 2
ios/app/app.xcodeproj/project.pbxproj Zobrazit soubor

@@ -996,7 +996,7 @@
996 996
 					"$(inherited)",
997 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 1000
 				MTL_ENABLE_DEBUG_INFO = YES;
1001 1001
 				ONLY_ACTIVE_ARCH = YES;
1002 1002
 				SDKROOT = iphoneos;
@@ -1049,7 +1049,7 @@
1049 1049
 					"$(inherited)",
1050 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 1053
 				MTL_ENABLE_DEBUG_INFO = NO;
1054 1054
 				SDKROOT = iphoneos;
1055 1055
 				SWIFT_COMPILATION_MODE = wholemodule;

+ 24
- 32
ios/app/src/ViewController.m Zobrazit soubor

@@ -1,6 +1,5 @@
1 1
 /*
2
- * Copyright @ 2018-present 8x8, Inc.
3
- * Copyright @ 2017-2018 Atlassian Pty Ltd
2
+ * Copyright @ 2017-present 8x8, Inc.
4 3
  *
5 4
  * Licensed under the Apache License, Version 2.0 (the "License");
6 5
  * you may not use this file except in compliance with the License.
@@ -15,8 +14,6 @@
15 14
  * limitations under the License.
16 15
  */
17 16
 
18
-#import <Availability.h>
19
-
20 17
 @import CoreSpotlight;
21 18
 @import MobileCoreServices;
22 19
 @import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
@@ -58,34 +55,29 @@
58 55
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
59 56
 
60 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 83
 - (void)conferenceTerminated:(NSDictionary *)data {

+ 2
- 2
ios/sdk/sdk.xcodeproj/project.pbxproj Zobrazit soubor

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

Načítá se…
Zrušit
Uložit