[FIX] China shouldn't use CallKit (#1274)

This commit is contained in:
Djorkaeff Alexandre 2019-10-07 10:38:59 -03:00 committed by Diego Mello
parent 79a936d331
commit 08dac6ff86
21 changed files with 1638 additions and 1545 deletions

View File

@ -67,6 +67,8 @@ target 'ShareRocketChatRN' do
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
pod 'JitsiMeetSDK', :git => 'https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git'
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'

View File

@ -101,7 +101,7 @@ PODS:
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.3.0):
- GoogleUtilities/Logger
- JitsiMeetSDK (2.3.0)
- JitsiMeetSDK (2.4.0)
- libwebp (1.0.3):
- libwebp/demux (= 1.0.3)
- libwebp/mux (= 1.0.3)
@ -284,8 +284,8 @@ PODS:
- React
- react-native-document-picker (3.2.4):
- React
- react-native-jitsi-meet (2.0.1):
- JitsiMeetSDK (= 2.3.0)
- react-native-jitsi-meet (2.0.3):
- JitsiMeetSDK
- React
- react-native-keyboard-input (5.3.1):
- React
@ -417,6 +417,7 @@ DEPENDENCIES:
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- JitsiMeetSDK (from `https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
@ -492,7 +493,6 @@ SPEC REPOS:
- GoogleDataTransport
- GoogleDataTransportCCTSupport
- GoogleUtilities
- JitsiMeetSDK
- libwebp
- nanopb
- QBImagePickerController
@ -534,6 +534,8 @@ EXTERNAL SOURCES:
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
JitsiMeetSDK:
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
RCTRequired:
:path: "../node_modules/react-native/Libraries/RCTRequired"
RCTTypeSafety:
@ -659,6 +661,11 @@ EXTERNAL SOURCES:
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
CHECKOUT OPTIONS:
JitsiMeetSDK:
:commit: 0d7b379179ef81965e505677cd10d07956c3a2dc
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BugsnagReactNative: 2114356c3acac0a71fb4b8962d3d1afdeb35f4d9
@ -686,7 +693,7 @@ SPEC CHECKSUMS:
GoogleDataTransport: 8f9897b8e073687f24ca8d3c3a8013dec7d2d1cc
GoogleDataTransportCCTSupport: 7455d07b98851aa63e4c05a34dad356ca588479e
GoogleUtilities: 9c2c544202301110b29f7974a82e77fdcf12bf51
JitsiMeetSDK: 0db2222f160cb6a9ccbeacc828acd11ff0057ba5
JitsiMeetSDK: d4a3aeed1a75fd57e6a78e5d202b6051dfcb9320
libwebp: 057912d6d0abfb6357d8bb05c0ea470301f5d61e
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
@ -701,7 +708,7 @@ SPEC CHECKSUMS:
React-jsinspector: 574d597112f9ea3d1b717f6fb62aef764c70dd6f
react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b
react-native-document-picker: c36bf5f067a581657ecaf7124dcd921a8be19061
react-native-jitsi-meet: 03565e2933f0a7ad9ce6f6483749b128c970e2c5
react-native-jitsi-meet: 1ca89538b8ef3158bfd306d60325d7f11ca1451a
react-native-keyboard-input: 2a01e0aceac330592bbe9b3101761bb9d8e6d1fb
react-native-keyboard-tracking-view: 1ebd24a2b6ca2314549aa51775995678094bffa1
react-native-notifications: 163ddedac6fcc8d850ea15b06abdadcacdff00f1
@ -750,6 +757,6 @@ SPEC CHECKSUMS:
UMTaskManagerInterface: 8664abd37a00715727e60df9ecd65e42ba47b548
Yoga: d8c572ddec8d05b7dba08e4e5f1924004a177078
PODFILE CHECKSUM: 5d8093830d053a40863c3d0e436c9704eb2af2f0
PODFILE CHECKSUM: 18d0b080112c72e9cc76a381c1baba1172c6ca4d
COCOAPODS: 1.6.2

View File

@ -1,4 +1,4 @@
// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)
// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgcc-compat"
@ -110,6 +110,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
# endif
#endif
#if !defined(SWIFT_RESILIENT_CLASS)
# if __has_attribute(objc_class_stub)
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
# else
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
# endif
#endif
#if !defined(SWIFT_PROTOCOL)
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
@ -151,6 +160,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#if !defined(SWIFT_AVAILABILITY)
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
#endif
#if !defined(SWIFT_WEAK_IMPORT)
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
#endif
#if !defined(SWIFT_DEPRECATED)
# define SWIFT_DEPRECATED __attribute__((deprecated))
#endif
@ -162,6 +174,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#else
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
#endif
#if !defined(IBSegueAction)
# define IBSegueAction
#endif
#if __has_feature(modules)
#if __has_warning("-Watimport-in-framework-header")
#pragma clang diagnostic ignored "-Watimport-in-framework-header"

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,21 @@
{
"name": "JitsiMeetSDK",
"version": "2.4.0",
"summary": "Jitsi Meet iOS SDK",
"description": "Jitsi Meet is a WebRTC compatible, free and Open Source video conferencing system that provides browsers and mobile applications with Real Time Communications capabilities.",
"homepage": "https://github.com/jitsi/jitsi-meet-ios-sdk-releases",
"license": "Apache 2",
"authors": "The Jitsi Meet project authors",
"source": {
"git": "https://github.com/jitsi/jitsi-meet-ios-sdk-releases.git",
"tag": "2.4.0"
},
"social_media_url": "https://twitter.com/jitsinews",
"platforms": {
"ios": "10.0"
},
"vendored_frameworks": [
"Frameworks/JitsiMeet.framework",
"Frameworks/WebRTC.framework"
]
}

View File

@ -1,6 +1,6 @@
{
"name": "react-native-jitsi-meet",
"version": "2.0.1",
"version": "2.0.3",
"summary": "Jitsi Meet SDK wrapper for React Native.",
"license": "Apache-2.0",
"authors": {
@ -13,7 +13,7 @@
},
"source": {
"git": "https://github.com/skrafft/react-native-jitsi-meet.git",
"tag": "v2.0.1"
"tag": "v2.0.3"
},
"source_files": "ios/**/*.{h,m}",
"dependencies": {
@ -21,7 +21,7 @@
],
"JitsiMeetSDK": [
"2.3.0"
]
}
}

21
ios/Pods/Manifest.lock generated
View File

@ -101,7 +101,7 @@ PODS:
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.3.0):
- GoogleUtilities/Logger
- JitsiMeetSDK (2.3.0)
- JitsiMeetSDK (2.4.0)
- libwebp (1.0.3):
- libwebp/demux (= 1.0.3)
- libwebp/mux (= 1.0.3)
@ -284,8 +284,8 @@ PODS:
- React
- react-native-document-picker (3.2.4):
- React
- react-native-jitsi-meet (2.0.1):
- JitsiMeetSDK (= 2.3.0)
- react-native-jitsi-meet (2.0.3):
- JitsiMeetSDK
- React
- react-native-keyboard-input (5.3.1):
- React
@ -417,6 +417,7 @@ DEPENDENCIES:
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- JitsiMeetSDK (from `https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
@ -492,7 +493,6 @@ SPEC REPOS:
- GoogleDataTransport
- GoogleDataTransportCCTSupport
- GoogleUtilities
- JitsiMeetSDK
- libwebp
- nanopb
- QBImagePickerController
@ -534,6 +534,8 @@ EXTERNAL SOURCES:
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
JitsiMeetSDK:
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
RCTRequired:
:path: "../node_modules/react-native/Libraries/RCTRequired"
RCTTypeSafety:
@ -659,6 +661,11 @@ EXTERNAL SOURCES:
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
CHECKOUT OPTIONS:
JitsiMeetSDK:
:commit: 0d7b379179ef81965e505677cd10d07956c3a2dc
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BugsnagReactNative: 2114356c3acac0a71fb4b8962d3d1afdeb35f4d9
@ -686,7 +693,7 @@ SPEC CHECKSUMS:
GoogleDataTransport: 8f9897b8e073687f24ca8d3c3a8013dec7d2d1cc
GoogleDataTransportCCTSupport: 7455d07b98851aa63e4c05a34dad356ca588479e
GoogleUtilities: 9c2c544202301110b29f7974a82e77fdcf12bf51
JitsiMeetSDK: 0db2222f160cb6a9ccbeacc828acd11ff0057ba5
JitsiMeetSDK: d4a3aeed1a75fd57e6a78e5d202b6051dfcb9320
libwebp: 057912d6d0abfb6357d8bb05c0ea470301f5d61e
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
@ -701,7 +708,7 @@ SPEC CHECKSUMS:
React-jsinspector: 574d597112f9ea3d1b717f6fb62aef764c70dd6f
react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b
react-native-document-picker: c36bf5f067a581657ecaf7124dcd921a8be19061
react-native-jitsi-meet: 03565e2933f0a7ad9ce6f6483749b128c970e2c5
react-native-jitsi-meet: 1ca89538b8ef3158bfd306d60325d7f11ca1451a
react-native-keyboard-input: 2a01e0aceac330592bbe9b3101761bb9d8e6d1fb
react-native-keyboard-tracking-view: 1ebd24a2b6ca2314549aa51775995678094bffa1
react-native-notifications: 163ddedac6fcc8d850ea15b06abdadcacdff00f1
@ -750,6 +757,6 @@ SPEC CHECKSUMS:
UMTaskManagerInterface: 8664abd37a00715727e60df9ecd65e42ba47b548
Yoga: d8c572ddec8d05b7dba08e4e5f1924004a177078
PODFILE CHECKSUM: 5d8093830d053a40863c3d0e436c9704eb2af2f0
PODFILE CHECKSUM: 18d0b080112c72e9cc76a381c1baba1172c6ca4d
COCOAPODS: 1.6.2

View File

@ -817,7 +817,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
);
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -930,7 +930,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
);
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;

View File

@ -58,7 +58,7 @@
"react-native-gesture-handler": "^1.4.1",
"react-native-image-crop-picker": "git+https://github.com/RocketChat/react-native-image-crop-picker.git",
"react-native-image-zoom-viewer": "^2.2.26",
"react-native-jitsi-meet": "RocketChat/react-native-jitsi-meet#android-sdk",
"react-native-jitsi-meet": "RocketChat/react-native-jitsi-meet",
"react-native-keyboard-aware-scroll-view": "0.8.0",
"react-native-keyboard-input": "^5.3.1",
"react-native-keyboard-tracking-view": "^5.5.0",

View File

@ -9135,9 +9135,9 @@ react-native-iphone-x-helper@^1.0.3:
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796"
integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag==
react-native-jitsi-meet@RocketChat/react-native-jitsi-meet#android-sdk:
version "2.0.1"
resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/d030708d9f9cbb744c827760a6dabc2a79c0f366"
react-native-jitsi-meet@RocketChat/react-native-jitsi-meet:
version "2.0.3"
resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/4e67967de26e1f9cbf4b0ca6ab8a673794f62f70"
react-native-keyboard-aware-scroll-view@0.8.0:
version "0.8.0"