Parcourir la source

[iOS] Fix iOS 9 after CallKit

Revert "[RN] Remove unnecessary source code" (commit
a3441030a3). But since the project file
needs to explicitly mention the CallKit and Intents framework, do not
use the semantic @import as that's confusing in the case.
j8
Lyubo Marinov il y a 7 ans
Parent
révision
af53a5c48c
3 fichiers modifiés avec 11 ajouts et 4 suppressions
  1. 8
    0
      ios/sdk/sdk.xcodeproj/project.pbxproj
  2. 1
    2
      ios/sdk/src/CallKit.m
  3. 2
    2
      ios/sdk/src/JitsiMeetView.m

+ 8
- 0
ios/sdk/sdk.xcodeproj/project.pbxproj Voir le fichier

14
 		0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */; };
14
 		0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */; };
15
 		0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */; };
15
 		0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */; };
16
 		0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
16
 		0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
17
+		0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD761F5EC6CE001C08DB /* CallKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
18
+		0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD781F5EC6D7001C08DB /* Intents.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
17
 		0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */; };
19
 		0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */; };
18
 		0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7C1F60356D001C08DB /* AppInfo.m */; };
20
 		0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7C1F60356D001C08DB /* AppInfo.m */; };
19
 		0BC4B8691F8C03A700CE8B21 /* CallKitIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */; };
21
 		0BC4B8691F8C03A700CE8B21 /* CallKitIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */; };
34
 		0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridgeWrapper.h; sourceTree = "<group>"; };
36
 		0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridgeWrapper.h; sourceTree = "<group>"; };
35
 		0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBridgeWrapper.m; sourceTree = "<group>"; };
37
 		0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBridgeWrapper.m; sourceTree = "<group>"; };
36
 		0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExternalAPI.m; sourceTree = "<group>"; };
38
 		0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExternalAPI.m; sourceTree = "<group>"; };
39
+		0BB9AD761F5EC6CE001C08DB /* CallKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CallKit.framework; path = System/Library/Frameworks/CallKit.framework; sourceTree = SDKROOT; };
40
+		0BB9AD781F5EC6D7001C08DB /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; };
37
 		0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallKit.m; sourceTree = "<group>"; };
41
 		0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallKit.m; sourceTree = "<group>"; };
38
 		0BB9AD7C1F60356D001C08DB /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
42
 		0BB9AD7C1F60356D001C08DB /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
39
 		0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CallKitIcon.png; path = ../../react/features/mobile/callkit/CallKitIcon.png; sourceTree = "<group>"; };
43
 		0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CallKitIcon.png; path = ../../react/features/mobile/callkit/CallKitIcon.png; sourceTree = "<group>"; };
54
 			isa = PBXFrameworksBuildPhase;
58
 			isa = PBXFrameworksBuildPhase;
55
 			buildActionMask = 2147483647;
59
 			buildActionMask = 2147483647;
56
 			files = (
60
 			files = (
61
+				0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */,
62
+				0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */,
57
 				0B93EF7B1EC608550030D24D /* CoreText.framework in Frameworks */,
63
 				0B93EF7B1EC608550030D24D /* CoreText.framework in Frameworks */,
58
 				0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */,
64
 				0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */,
59
 			);
65
 			);
113
 		9C3C6FA2341729836589B856 /* Frameworks */ = {
119
 		9C3C6FA2341729836589B856 /* Frameworks */ = {
114
 			isa = PBXGroup;
120
 			isa = PBXGroup;
115
 			children = (
121
 			children = (
122
+				0BB9AD781F5EC6D7001C08DB /* Intents.framework */,
123
+				0BB9AD761F5EC6CE001C08DB /* CallKit.framework */,
116
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
124
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
117
 				0BCA49631EC4B76D00B793EE /* WebRTC.framework */,
125
 				0BCA49631EC4B76D00B793EE /* WebRTC.framework */,
118
 				03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */,
126
 				03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */,

+ 1
- 2
ios/sdk/src/CallKit.m Voir le fichier

19
 //
19
 //
20
 
20
 
21
 #import <AVFoundation/AVFoundation.h>
21
 #import <AVFoundation/AVFoundation.h>
22
+#import <CallKit/CallKit.h>
22
 #import <Foundation/Foundation.h>
23
 #import <Foundation/Foundation.h>
23
 #import <UIKit/UIKit.h>
24
 #import <UIKit/UIKit.h>
24
 
25
 
25
-@import CallKit;
26
-
27
 #import <React/RCTBridge.h>
26
 #import <React/RCTBridge.h>
28
 #import <React/RCTConvert.h>
27
 #import <React/RCTConvert.h>
29
 #import <React/RCTEventDispatcher.h>
28
 #import <React/RCTEventDispatcher.h>

+ 2
- 2
ios/sdk/src/JitsiMeetView.m Voir le fichier

15
  */
15
  */
16
 
16
 
17
 #import <CoreText/CoreText.h>
17
 #import <CoreText/CoreText.h>
18
-#include <mach/mach_time.h>
18
+#import <Intents/Intents.h>
19
 
19
 
20
-@import Intents;
20
+#include <mach/mach_time.h>
21
 
21
 
22
 #import <React/RCTAssert.h>
22
 #import <React/RCTAssert.h>
23
 #import <React/RCTLinkingManager.h>
23
 #import <React/RCTLinkingManager.h>

Chargement…
Annuler
Enregistrer