浏览代码

ios: drop support for iOS 10

master
Saúl Ibarra Corretgé 5 年前
父节点
当前提交
792f506425

+ 2
- 2
ios/Podfile 查看文件

1
-platform :ios, '10.0'
1
+platform :ios, '11.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
 
4
 
82
     target.build_configurations.each do |config|
82
     target.build_configurations.each do |config|
83
       config.build_settings['ENABLE_BITCODE'] = 'YES'
83
       config.build_settings['ENABLE_BITCODE'] = 'YES'
84
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
84
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
85
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
85
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
86
     end
86
     end
87
   end
87
   end
88
 end
88
 end

+ 1
- 1
ios/Podfile.lock 查看文件

553
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
553
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
554
   Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
554
   Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
555
 
555
 
556
-PODFILE CHECKSUM: 63c90b1d33cd96709fb72bad6be440ae9c3deecb
556
+PODFILE CHECKSUM: 0fdfa45ae809c9460c80be3e0d4bbb822fccc418
557
 
557
 
558
 COCOAPODS: 1.8.1
558
 COCOAPODS: 1.8.1

+ 4
- 6
ios/app/app.xcodeproj/project.pbxproj 查看文件

747
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
747
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
748
 				);
748
 				);
749
 				INFOPLIST_FILE = src/Info.plist;
749
 				INFOPLIST_FILE = src/Info.plist;
750
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
751
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
750
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
752
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
751
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
753
 				OTHER_LDFLAGS = (
752
 				OTHER_LDFLAGS = (
758
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
757
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
759
 				PRODUCT_NAME = "jitsi-meet";
758
 				PRODUCT_NAME = "jitsi-meet";
760
 				PROVISIONING_PROFILE_SPECIFIER = "";
759
 				PROVISIONING_PROFILE_SPECIFIER = "";
761
-				TARGETED_DEVICE_FAMILY = "1,2";
762
 			};
760
 			};
763
 			name = Debug;
761
 			name = Debug;
764
 		};
762
 		};
783
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
781
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
784
 				);
782
 				);
785
 				INFOPLIST_FILE = src/Info.plist;
783
 				INFOPLIST_FILE = src/Info.plist;
786
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
787
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
784
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
788
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
785
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
789
 				OTHER_LDFLAGS = (
786
 				OTHER_LDFLAGS = (
794
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
791
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
795
 				PRODUCT_NAME = "jitsi-meet";
792
 				PRODUCT_NAME = "jitsi-meet";
796
 				PROVISIONING_PROFILE_SPECIFIER = "";
793
 				PROVISIONING_PROFILE_SPECIFIER = "";
797
-				TARGETED_DEVICE_FAMILY = "1,2";
798
 			};
794
 			};
799
 			name = Release;
795
 			name = Release;
800
 		};
796
 		};
850
 					"$(inherited)",
846
 					"$(inherited)",
851
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
847
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
852
 				);
848
 				);
853
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
849
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
854
 				MTL_ENABLE_DEBUG_INFO = YES;
850
 				MTL_ENABLE_DEBUG_INFO = YES;
855
 				ONLY_ACTIVE_ARCH = YES;
851
 				ONLY_ACTIVE_ARCH = YES;
856
 				SDKROOT = iphoneos;
852
 				SDKROOT = iphoneos;
853
+				TARGETED_DEVICE_FAMILY = "1,2";
857
 			};
854
 			};
858
 			name = Debug;
855
 			name = Debug;
859
 		};
856
 		};
902
 					"$(inherited)",
899
 					"$(inherited)",
903
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
900
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
904
 				);
901
 				);
905
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
902
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
906
 				MTL_ENABLE_DEBUG_INFO = NO;
903
 				MTL_ENABLE_DEBUG_INFO = NO;
907
 				SDKROOT = iphoneos;
904
 				SDKROOT = iphoneos;
908
 				SWIFT_COMPILATION_MODE = wholemodule;
905
 				SWIFT_COMPILATION_MODE = wholemodule;
906
+				TARGETED_DEVICE_FAMILY = "1,2";
909
 				VALIDATE_PRODUCT = YES;
907
 				VALIDATE_PRODUCT = YES;
910
 			};
908
 			};
911
 			name = Release;
909
 			name = Release;

+ 2
- 6
ios/sdk/sdk.xcodeproj/project.pbxproj 查看文件

555
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
555
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
556
 				GCC_WARN_UNUSED_FUNCTION = YES;
556
 				GCC_WARN_UNUSED_FUNCTION = YES;
557
 				GCC_WARN_UNUSED_VARIABLE = YES;
557
 				GCC_WARN_UNUSED_VARIABLE = YES;
558
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
558
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
559
 				MTL_ENABLE_DEBUG_INFO = YES;
559
 				MTL_ENABLE_DEBUG_INFO = YES;
560
 				ONLY_ACTIVE_ARCH = YES;
560
 				ONLY_ACTIVE_ARCH = YES;
561
 				SDKROOT = iphoneos;
561
 				SDKROOT = iphoneos;
611
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
611
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
612
 				GCC_WARN_UNUSED_FUNCTION = YES;
612
 				GCC_WARN_UNUSED_FUNCTION = YES;
613
 				GCC_WARN_UNUSED_VARIABLE = YES;
613
 				GCC_WARN_UNUSED_VARIABLE = YES;
614
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
614
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
615
 				MTL_ENABLE_DEBUG_INFO = NO;
615
 				MTL_ENABLE_DEBUG_INFO = NO;
616
 				SDKROOT = iphoneos;
616
 				SDKROOT = iphoneos;
617
 				SWIFT_COMPILATION_MODE = wholemodule;
617
 				SWIFT_COMPILATION_MODE = wholemodule;
639
 				ENABLE_BITCODE = NO;
639
 				ENABLE_BITCODE = NO;
640
 				INFOPLIST_FILE = src/Info.plist;
640
 				INFOPLIST_FILE = src/Info.plist;
641
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
641
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
642
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
643
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
642
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
644
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
643
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
645
 				PRODUCT_NAME = "$(TARGET_NAME)";
644
 				PRODUCT_NAME = "$(TARGET_NAME)";
650
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
649
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
651
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
650
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
652
 				SWIFT_VERSION = 5.0;
651
 				SWIFT_VERSION = 5.0;
653
-				TARGETED_DEVICE_FAMILY = "1,2";
654
 			};
652
 			};
655
 			name = Debug;
653
 			name = Debug;
656
 		};
654
 		};
671
 				ENABLE_BITCODE = YES;
669
 				ENABLE_BITCODE = YES;
672
 				INFOPLIST_FILE = src/Info.plist;
670
 				INFOPLIST_FILE = src/Info.plist;
673
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
671
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
674
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
675
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
672
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
676
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
673
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
677
 				PRODUCT_NAME = "$(TARGET_NAME)";
674
 				PRODUCT_NAME = "$(TARGET_NAME)";
681
 				SWIFT_OBJC_BRIDGING_HEADER = "";
678
 				SWIFT_OBJC_BRIDGING_HEADER = "";
682
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
679
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
683
 				SWIFT_VERSION = 5.0;
680
 				SWIFT_VERSION = 5.0;
684
-				TARGETED_DEVICE_FAMILY = "1,2";
685
 			};
681
 			};
686
 			name = Release;
682
 			name = Release;
687
 		};
683
 		};

+ 2
- 14
react/features/base/config/reducer.js 查看文件

2
 
2
 
3
 import _ from 'lodash';
3
 import _ from 'lodash';
4
 
4
 
5
-import Platform from '../react/Platform';
6
 import { equals, ReducerRegistry, set } from '../redux';
5
 import { equals, ReducerRegistry, set } from '../redux';
7
 
6
 
8
 import { _UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
7
 import { _UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
21
 const INITIAL_NON_RN_STATE = {
20
 const INITIAL_NON_RN_STATE = {
22
 };
21
 };
23
 
22
 
24
-/**
25
- * When we should enable H.264 on mobile. iOS 10 crashes so we disable it there.
26
- * See: https://bugs.chromium.org/p/webrtc/issues/detail?id=11002
27
- * Note that this is only used for P2P calls.
28
- *
29
- * @type {boolean}
30
- */
31
-const RN_ENABLE_H264 = navigator.product === 'ReactNative' && !(Platform.OS === 'ios' && Platform.Version === 10);
32
-
33
 /**
23
 /**
34
  * The initial state of the feature base/config when executing in a React Native
24
  * The initial state of the feature base/config when executing in a React Native
35
  * environment. The mandatory configuration to be passed to JitsiMeetJS#init().
25
  * environment. The mandatory configuration to be passed to JitsiMeetJS#init().
50
     // fastest to merely disable them.
40
     // fastest to merely disable them.
51
     disableAudioLevels: true,
41
     disableAudioLevels: true,
52
 
42
 
53
-    disableH264: !RN_ENABLE_H264,
54
-
55
     p2p: {
43
     p2p: {
56
-        disableH264: !RN_ENABLE_H264,
57
-        preferH264: RN_ENABLE_H264
44
+        disableH264: false,
45
+        preferH264: true
58
     }
46
     }
59
 };
47
 };
60
 
48
 

+ 8
- 31
react/features/base/dialog/components/native/BottomSheet.js 查看文件

1
 // @flow
1
 // @flow
2
 
2
 
3
 import React, { PureComponent, type Node } from 'react';
3
 import React, { PureComponent, type Node } from 'react';
4
-import { Platform, SafeAreaView, ScrollView, View } from 'react-native';
4
+import { SafeAreaView, ScrollView, View } from 'react-native';
5
 
5
 
6
 import { ColorSchemeRegistry } from '../../../color-scheme';
6
 import { ColorSchemeRegistry } from '../../../color-scheme';
7
 import { SlidingView } from '../../../react';
7
 import { SlidingView } from '../../../react';
61
                             styles.sheetItemContainer,
61
                             styles.sheetItemContainer,
62
                             _styles.sheet
62
                             _styles.sheet
63
                         ] }>
63
                         ] }>
64
-                        { this._getWrappedContent() }
64
+                        <SafeAreaView>
65
+                            <ScrollView
66
+                                bounces = { false }
67
+                                showsVerticalScrollIndicator = { false } >
68
+                                { this.props.children }
69
+                            </ScrollView>
70
+                        </SafeAreaView>
65
                     </View>
71
                     </View>
66
                 </View>
72
                 </View>
67
             </SlidingView>
73
             </SlidingView>
68
         );
74
         );
69
     }
75
     }
70
-
71
-    /**
72
-     * Wraps the content when needed (iOS 11 and above), or just returns the original content.
73
-     *
74
-     * @returns {React$Element}
75
-     */
76
-    _getWrappedContent() {
77
-        const content = (
78
-            <ScrollView
79
-                bounces = { false }
80
-                showsVerticalScrollIndicator = { false } >
81
-                { this.props.children }
82
-            </ScrollView>
83
-        );
84
-
85
-        if (Platform.OS === 'ios') {
86
-            const majorVersionIOS = parseInt(Platform.Version, 10);
87
-
88
-            if (majorVersionIOS > 10) {
89
-                return (
90
-                    <SafeAreaView>
91
-                        { content }
92
-                    </SafeAreaView>
93
-                );
94
-            }
95
-        }
96
-
97
-        return content;
98
-    }
99
 }
76
 }
100
 
77
 
101
 /**
78
 /**

+ 6
- 52
react/features/base/react/components/native/Header.js 查看文件

1
 // @flow
1
 // @flow
2
 
2
 
3
-import React, { Component, type Node } from 'react';
4
-import { Platform, SafeAreaView, StatusBar, View } from 'react-native';
3
+import React, { PureComponent, type Node } from 'react';
4
+import { SafeAreaView, StatusBar, View } from 'react-native';
5
 
5
 
6
 import { ColorSchemeRegistry } from '../../../color-scheme';
6
 import { ColorSchemeRegistry } from '../../../color-scheme';
7
 import { connect } from '../../../redux';
7
 import { connect } from '../../../redux';
8
 import { isDarkColor } from '../../../styles';
8
 import { isDarkColor } from '../../../styles';
9
 
9
 
10
-import { HEADER_PADDING } from './headerstyles';
11
-
12
-/**
13
- * Compatibility header padding size for iOS 10 (and older) devices.
14
- */
15
-const IOS10_PADDING = 20;
10
+// Register style
11
+import './headerstyles';
16
 
12
 
17
 /**
13
 /**
18
  * Constanst for the (currently) supported statusbar colors.
14
  * Constanst for the (currently) supported statusbar colors.
44
 /**
40
 /**
45
  * A generic screen header component.
41
  * A generic screen header component.
46
  */
42
  */
47
-class Header extends Component<Props> {
48
-    /**
49
-     * Initializes a new {@code Header} instance.
50
-     *
51
-     * @inheritdoc
52
-     */
53
-    constructor(props: Props) {
54
-        super(props);
55
-
56
-        this._getIOS10CompatiblePadding
57
-            = this._getIOS10CompatiblePadding.bind(this);
58
-    }
59
-
43
+class Header extends PureComponent<Props> {
60
     /**
44
     /**
61
      * Implements React's {@link Component#render()}.
45
      * Implements React's {@link Component#render()}.
62
      *
46
      *
66
         const { _styles } = this.props;
50
         const { _styles } = this.props;
67
 
51
 
68
         return (
52
         return (
69
-            <View
70
-                style = { [
71
-                    _styles.headerOverlay,
72
-                    this._getIOS10CompatiblePadding()
73
-                ] } >
53
+            <View style = { _styles.headerOverlay }>
74
                 <StatusBar
54
                 <StatusBar
75
                     backgroundColor = { _styles.statusBar }
55
                     backgroundColor = { _styles.statusBar }
76
                     barStyle = { this._getStatusBarContentColor() }
56
                     barStyle = { this._getStatusBarContentColor() }
90
         );
70
         );
91
     }
71
     }
92
 
72
 
93
-    _getIOS10CompatiblePadding: () => Object;
94
-
95
-    /**
96
-     * Adds a padding for iOS 10 (and older) devices to avoid clipping with the
97
-     * status bar.
98
-     * Note: This is a workaround for iOS 10 (and older) devices only to fix
99
-     * usability, but it doesn't take orientation into account, so unnecessary
100
-     * padding is rendered in some cases.
101
-     *
102
-     * @private
103
-     * @returns {Object}
104
-     */
105
-    _getIOS10CompatiblePadding() {
106
-        if (Platform.OS === 'ios') {
107
-            const majorVersionIOS = parseInt(Platform.Version, 10);
108
-
109
-            if (majorVersionIOS <= 10) {
110
-                return {
111
-                    paddingTop: HEADER_PADDING + IOS10_PADDING
112
-                };
113
-            }
114
-        }
115
-
116
-        return null;
117
-    }
118
-
119
     /**
73
     /**
120
      * Calculates the color of the statusbar content (light or dark) based on
74
      * Calculates the color of the statusbar content (light or dark) based on
121
      * certain criterias.
75
      * certain criterias.

+ 1
- 2
react/features/base/react/components/native/headerstyles.js 查看文件

7
 
7
 
8
 const HEADER_FONT_SIZE = 18;
8
 const HEADER_FONT_SIZE = 18;
9
 const HEADER_HEIGHT = 48;
9
 const HEADER_HEIGHT = 48;
10
-
11
-export const HEADER_PADDING = BoxModel.padding / 2;
10
+const HEADER_PADDING = BoxModel.padding / 2;
12
 
11
 
13
 ColorSchemeRegistry.register('Header', {
12
 ColorSchemeRegistry.register('Header', {
14
 
13
 

正在加载...
取消
保存