Browse Source

ios: drop iOS 9 support

WebRTC no longer actively fixes iOS 9 issues.
j8
Saúl Ibarra Corretgé 6 years ago
parent
commit
e5c9c69ec9

+ 1
- 1
ios/Podfile View File

1
-platform :ios, '9.0'
1
+platform :ios, '10.0'
2
 
2
 
3
 workspace 'jitsi-meet'
3
 workspace 'jitsi-meet'
4
 
4
 

+ 3
- 12
ios/Podfile.lock View File

7
     - DoubleConversion
7
     - DoubleConversion
8
     - glog
8
     - glog
9
   - glog (0.3.5)
9
   - glog (0.3.5)
10
-  - GoogleSignIn (4.3.0):
10
+  - GoogleSignIn (4.4.0):
11
     - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
11
     - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
12
     - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
12
     - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
13
-    - GTMOAuth2 (~> 1.0)
14
     - GTMSessionFetcher/Core (~> 1.1)
13
     - GTMSessionFetcher/Core (~> 1.1)
15
   - GoogleToolboxForMac/DebugUtils (2.1.4):
14
   - GoogleToolboxForMac/DebugUtils (2.1.4):
16
     - GoogleToolboxForMac/Defines (= 2.1.4)
15
     - GoogleToolboxForMac/Defines (= 2.1.4)
20
     - GoogleToolboxForMac/Defines (= 2.1.4)
19
     - GoogleToolboxForMac/Defines (= 2.1.4)
21
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.1.4)"
20
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.1.4)"
22
   - "GoogleToolboxForMac/NSString+URLArguments (2.1.4)"
21
   - "GoogleToolboxForMac/NSString+URLArguments (2.1.4)"
23
-  - GTMOAuth2 (1.1.6):
24
-    - GTMSessionFetcher (~> 1.1)
25
-  - GTMSessionFetcher (1.2.1):
26
-    - GTMSessionFetcher/Full (= 1.2.1)
27
   - GTMSessionFetcher/Core (1.2.1)
22
   - GTMSessionFetcher/Core (1.2.1)
28
-  - GTMSessionFetcher/Full (1.2.1):
29
-    - GTMSessionFetcher/Core (= 1.2.1)
30
   - ObjectiveDropboxOfficial (3.9.2)
23
   - ObjectiveDropboxOfficial (3.9.2)
31
   - React (0.57.6):
24
   - React (0.57.6):
32
     - React/Core (= 0.57.6)
25
     - React/Core (= 0.57.6)
129
     - FLAnimatedImage
122
     - FLAnimatedImage
130
     - GoogleSignIn
123
     - GoogleSignIn
131
     - GoogleToolboxForMac
124
     - GoogleToolboxForMac
132
-    - GTMOAuth2
133
     - GTMSessionFetcher
125
     - GTMSessionFetcher
134
     - ObjectiveDropboxOfficial
126
     - ObjectiveDropboxOfficial
135
     - SDWebImage
127
     - SDWebImage
168
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
160
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
169
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
161
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
170
   glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
162
   glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
171
-  GoogleSignIn: 11183592dc63e105475c7305a325045ff95e02b7
163
+  GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
172
   GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
164
   GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
173
-  GTMOAuth2: c77fe325e4acd453837e72d91e3b5f13116857b2
174
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
165
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
175
   ObjectiveDropboxOfficial: aa792e0556ceb7b72955fa29a2709072f6e35fd9
166
   ObjectiveDropboxOfficial: aa792e0556ceb7b72955fa29a2709072f6e35fd9
176
   React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
167
   React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
185
   SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
176
   SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
186
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
177
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
187
 
178
 
188
-PODFILE CHECKSUM: 9b67ed66d62ca004caa7952c3bbfe2693c115333
179
+PODFILE CHECKSUM: 2fa79bc1fe2fe42efb63895fdb0cb84d5f578884
189
 
180
 
190
 COCOAPODS: 1.5.3
181
 COCOAPODS: 1.5.3

+ 2
- 2
ios/app/app.xcodeproj/project.pbxproj View File

270
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
270
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
271
 				);
271
 				);
272
 				INFOPLIST_FILE = src/Info.plist;
272
 				INFOPLIST_FILE = src/Info.plist;
273
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
273
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
274
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
274
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
275
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
275
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
276
 				OTHER_LDFLAGS = (
276
 				OTHER_LDFLAGS = (
301
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
301
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
302
 				);
302
 				);
303
 				INFOPLIST_FILE = src/Info.plist;
303
 				INFOPLIST_FILE = src/Info.plist;
304
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
304
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
305
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
305
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
306
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
306
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
307
 				OTHER_LDFLAGS = (
307
 				OTHER_LDFLAGS = (

+ 2
- 2
ios/app/src/Info.plist View File

79
 		<string>fetch</string>
79
 		<string>fetch</string>
80
 		<string>voip</string>
80
 		<string>voip</string>
81
 	</array>
81
 	</array>
82
-	<key>UIMainStoryboardFile</key>
83
-	<string>Main</string>
84
 	<key>UILaunchStoryboardName</key>
82
 	<key>UILaunchStoryboardName</key>
85
 	<string>LaunchScreen</string>
83
 	<string>LaunchScreen</string>
84
+	<key>UIMainStoryboardFile</key>
85
+	<string>Main</string>
86
 	<key>UIRequiredDeviceCapabilities</key>
86
 	<key>UIRequiredDeviceCapabilities</key>
87
 	<array>
87
 	<array>
88
 		<string>armv7</string>
88
 		<string>armv7</string>

+ 7
- 7
ios/example-pip-app/example-pip-app.xcodeproj/project.pbxproj View File

35
 
35
 
36
 /* Begin PBXFileReference section */
36
 /* Begin PBXFileReference section */
37
 		C6A34247204DF18000E062DD /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = "<group>"; };
37
 		C6A34247204DF18000E062DD /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = "<group>"; };
38
-		C6F99C37204DE6BE0001F710 /* example-pip-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example-pip-app.app; sourceTree = BUILT_PRODUCTS_DIR; };
38
+		C6F99C37204DE6BE0001F710 /* example-pip-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example-pip-app.app"; sourceTree = BUILT_PRODUCTS_DIR; };
39
 		C6F99C3A204DE6BE0001F710 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
39
 		C6F99C3A204DE6BE0001F710 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
40
 		C6F99C3C204DE6BE0001F710 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
40
 		C6F99C3C204DE6BE0001F710 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
41
 		C6F99C3F204DE6BE0001F710 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
41
 		C6F99C3F204DE6BE0001F710 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
116
 			);
116
 			);
117
 			dependencies = (
117
 			dependencies = (
118
 			);
118
 			);
119
-			name = example-pip-app;
120
-			productName = example-pip-app;
119
+			name = "example-pip-app";
120
+			productName = "example-pip-app";
121
 			productReference = C6F99C37204DE6BE0001F710 /* example-pip-app.app */;
121
 			productReference = C6F99C37204DE6BE0001F710 /* example-pip-app.app */;
122
 			productType = "com.apple.product-type.application";
122
 			productType = "com.apple.product-type.application";
123
 		};
123
 		};
364
 				CODE_SIGN_STYLE = Automatic;
364
 				CODE_SIGN_STYLE = Automatic;
365
 				FRAMEWORK_SEARCH_PATHS = "../../node_modules/react-native-webrtc/ios";
365
 				FRAMEWORK_SEARCH_PATHS = "../../node_modules/react-native-webrtc/ios";
366
 				INFOPLIST_FILE = src/Info.plist;
366
 				INFOPLIST_FILE = src/Info.plist;
367
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
367
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
368
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
368
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
369
-				PRODUCT_BUNDLE_IDENTIFIER = com.jitsi.example-pip-app;
369
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jitsi.example-pip-app";
370
 				PRODUCT_NAME = "$(TARGET_NAME)";
370
 				PRODUCT_NAME = "$(TARGET_NAME)";
371
 				SWIFT_VERSION = 4.0;
371
 				SWIFT_VERSION = 4.0;
372
 				TARGETED_DEVICE_FAMILY = "1,2";
372
 				TARGETED_DEVICE_FAMILY = "1,2";
380
 				CODE_SIGN_STYLE = Automatic;
380
 				CODE_SIGN_STYLE = Automatic;
381
 				FRAMEWORK_SEARCH_PATHS = "../../node_modules/react-native-webrtc/ios";
381
 				FRAMEWORK_SEARCH_PATHS = "../../node_modules/react-native-webrtc/ios";
382
 				INFOPLIST_FILE = src/Info.plist;
382
 				INFOPLIST_FILE = src/Info.plist;
383
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
383
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
384
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
384
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
385
-				PRODUCT_BUNDLE_IDENTIFIER = com.jitsi.example-pip-app;
385
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jitsi.example-pip-app";
386
 				PRODUCT_NAME = "$(TARGET_NAME)";
386
 				PRODUCT_NAME = "$(TARGET_NAME)";
387
 				SWIFT_VERSION = 4.0;
387
 				SWIFT_VERSION = 4.0;
388
 				TARGETED_DEVICE_FAMILY = "1,2";
388
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 0
- 2
ios/sdk/sdk.xcodeproj/project.pbxproj View File

409
 			);
409
 			);
410
 			inputPaths = (
410
 			inputPaths = (
411
 				"${SRCROOT}/../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
411
 				"${SRCROOT}/../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
412
-				"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
413
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
412
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
414
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
413
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
415
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
414
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
429
 			);
428
 			);
430
 			name = "[CP] Copy Pods Resources";
429
 			name = "[CP] Copy Pods Resources";
431
 			outputPaths = (
430
 			outputPaths = (
432
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib",
433
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
431
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
434
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
432
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
435
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
433
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",

+ 1
- 14
ios/sdk/src/callkit/CallKit.m View File

44
 
44
 
45
 @implementation RNCallKit
45
 @implementation RNCallKit
46
 
46
 
47
-RCT_EXTERN void RCTRegisterModule(Class);
48
-
49
-+ (void)load {
50
-    // Make the react-native module RNCallKit available (to JS) only if CallKit
51
-    // is available on the executing operating sytem. For example, CallKit is
52
-    // not available on iOS 9.
53
-    if ([CXCallController class]) {
54
-        RCTRegisterModule(self);
55
-    }
56
-}
57
-
58
-+ (NSString *)moduleName {
59
-    return @"RNCallKit";
60
-}
47
+RCT_EXPORT_MODULE();
61
 
48
 
62
 - (NSArray<NSString *> *)supportedEvents {
49
 - (NSArray<NSString *> *)supportedEvents {
63
     return @[
50
     return @[

+ 0
- 2
ios/sdk/src/callkit/JMCallKitEmitter.swift View File

18
 import CallKit
18
 import CallKit
19
 import Foundation
19
 import Foundation
20
 
20
 
21
-@available(iOS 10.0, *)
22
 internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
21
 internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
23
 
22
 
24
     private var listeners = Set<JMCallKitEventListenerWrapper>()
23
     private var listeners = Set<JMCallKitEventListenerWrapper>()
129
     }
128
     }
130
 }
129
 }
131
 
130
 
132
-@available(iOS 10.0, *)
133
 fileprivate struct JMCallKitEventListenerWrapper: Hashable {
131
 fileprivate struct JMCallKitEventListenerWrapper: Hashable {
134
 
132
 
135
     public var hashValue: Int
133
     public var hashValue: Int

+ 0
- 9
ios/sdk/src/callkit/JMCallKitListener.swift View File

18
 import CallKit
18
 import CallKit
19
 import Foundation
19
 import Foundation
20
 
20
 
21
-@available(iOS 10.0, *)
22
 @objc public protocol JMCallKitListener: NSObjectProtocol {
21
 @objc public protocol JMCallKitListener: NSObjectProtocol {
23
 
22
 
24
-    @available(iOS 10.0, *)
25
     @objc optional func providerDidReset()
23
     @objc optional func providerDidReset()
26
 
24
 
27
-    @available(iOS 10.0, *)
28
     @objc optional func performAnswerCall(UUID: UUID)
25
     @objc optional func performAnswerCall(UUID: UUID)
29
 
26
 
30
-    @available(iOS 10.0, *)
31
     @objc optional func performEndCall(UUID: UUID)
27
     @objc optional func performEndCall(UUID: UUID)
32
 
28
 
33
-    @available(iOS 10.0, *)
34
     @objc optional func performSetMutedCall(UUID: UUID, isMuted: Bool)
29
     @objc optional func performSetMutedCall(UUID: UUID, isMuted: Bool)
35
 
30
 
36
-    @available(iOS 10.0, *)
37
     @objc optional func performStartCall(UUID: UUID, isVideo: Bool)
31
     @objc optional func performStartCall(UUID: UUID, isVideo: Bool)
38
 
32
 
39
-    @available(iOS 10.0, *)
40
     @objc optional func providerDidActivateAudioSession(session: AVAudioSession)
33
     @objc optional func providerDidActivateAudioSession(session: AVAudioSession)
41
 
34
 
42
-    @available(iOS 10.0, *)
43
     @objc optional func providerDidDeactivateAudioSession(session: AVAudioSession)
35
     @objc optional func providerDidDeactivateAudioSession(session: AVAudioSession)
44
 
36
 
45
-    @available(iOS 10.0, *)
46
     @objc optional func providerTimedOutPerformingAction(action: CXAction)
37
     @objc optional func providerTimedOutPerformingAction(action: CXAction)
47
 }
38
 }

+ 0
- 1
ios/sdk/src/callkit/JMCallKitProxy.swift View File

20
 /// JitsiMeet CallKit proxy
20
 /// JitsiMeet CallKit proxy
21
 // NOTE: The methods this class exposes are meant to be called in the UI thread.
21
 // NOTE: The methods this class exposes are meant to be called in the UI thread.
22
 // All delegate methods called by JMCallKitEmitter will be called in the UI thread.
22
 // All delegate methods called by JMCallKitEmitter will be called in the UI thread.
23
-@available(iOS 10.0, *)
24
 @objc public final class JMCallKitProxy: NSObject {
23
 @objc public final class JMCallKitProxy: NSObject {
25
 
24
 
26
     private override init() {}
25
     private override init() {}

Loading…
Cancel
Save