Skip to content

Commit

Permalink
Merge pull request #731 from 100mslive/develop
Browse files Browse the repository at this point in the history
Release 0.9.92: Develop to main
  • Loading branch information
ygit authored Sep 13, 2022
2 parents b98b106 + b5c496b commit 49b26f8
Show file tree
Hide file tree
Showing 28 changed files with 1,159 additions and 576 deletions.
2 changes: 1 addition & 1 deletion android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HMSRNSDK(
private var self = this

init {
val trackSettings = HMSHelper.getTrackSettings(data)
val trackSettings = HMSHelper.getTrackSettings(data?.getMap("trackSettings"))
if (trackSettings == null) {
this.hmsSDK = HMSSDK.Builder(reactApplicationContext).build()
} else {
Expand Down
16 changes: 8 additions & 8 deletions example/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.619.0)
aws-sdk-core (3.132.0)
aws-partitions (1.625.0)
aws-sdk-core (3.139.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -37,7 +37,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.92.4)
faraday (1.10.1)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand Down Expand Up @@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.209.0)
fastlane (2.209.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.1)
json (2.6.2)
jwt (2.4.1)
jwt (2.5.0)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.1.2)
Expand All @@ -162,7 +162,7 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (4.0.7)
public_suffix (5.0.0)
rake (13.0.6)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down
6 changes: 3 additions & 3 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ android {
applicationId "live.hms.rn"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 76
versionName "1.0.76"
versionCode 104
versionName "2.0.1"
missingDimensionStrategy 'react-native-camera', 'general'
}
splits {
Expand Down Expand Up @@ -198,7 +198,7 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni'
exclude group:'com.facebook.fbjni'
}

debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
Expand Down
18 changes: 10 additions & 8 deletions example/ios/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.619.0)
aws-sdk-core (3.132.0)
aws-partitions (1.625.0)
aws-sdk-core (3.139.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -37,7 +37,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.92.4)
faraday (1.10.1)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand Down Expand Up @@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.209.0)
fastlane (2.209.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -106,6 +106,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-firebase_app_distribution (0.3.5)
fastlane-plugin-versioning (0.5.1)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.25.0)
google-apis-core (>= 0.7, < 2.a)
Expand Down Expand Up @@ -151,7 +152,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.1)
json (2.6.2)
jwt (2.4.1)
jwt (2.5.0)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.1.2)
Expand All @@ -162,7 +163,7 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (4.0.7)
public_suffix (5.0.0)
rake (13.0.6)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down Expand Up @@ -217,6 +218,7 @@ PLATFORMS
DEPENDENCIES
fastlane
fastlane-plugin-firebase_app_distribution
fastlane-plugin-versioning

BUNDLED WITH
2.3.11
6 changes: 5 additions & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ

platform :ios, '12.0'

target 'RNHMSExampleBroadcastUpload' do
use_modular_headers!
pod 'HMSBroadcastExtensionSDK'
end

target 'RNHMSExample' do
config = use_native_modules!
permissions_path = '../node_modules/react-native-permissions/ios'
Expand All @@ -18,7 +23,6 @@ target 'RNHMSExample' do
pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone"
pod 'react-native-video', :path => '../node_modules/react-native-video'

pod 'react-native-camera', :path => '../node_modules/react-native-camera'

target 'RNHMSExampleTests' do
Expand Down
23 changes: 14 additions & 9 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin
- glog (0.3.5)
- hermes-engine (0.7.2)
- HMSBroadcastExtensionSDK (0.0.2)
- HMSSDK (0.3.3):
- HMSWebRTC (= 1.0.4898)
- HMSWebRTC (1.0.4898)
Expand Down Expand Up @@ -285,7 +286,8 @@ PODS:
- React-Core
- react-native-cameraroll (4.1.2):
- React-Core
- react-native-hms (0.9.9):
- react-native-hms (0.9.92):
- HMSBroadcastExtensionSDK (= 0.0.2)
- HMSSDK (= 0.3.3)
- React-Core
- react-native-safe-area-context (3.4.1):
Expand Down Expand Up @@ -364,7 +366,7 @@ PODS:
- React-perflogger (= 0.64.2)
- rn-fetch-blob (0.12.0):
- React-Core
- RNCPicker (2.4.3):
- RNCPicker (2.4.4):
- React-Core
- RNDeviceInfo (9.0.2):
- React-Core
Expand All @@ -374,10 +376,10 @@ PODS:
- React-Core
- RNPermissions (3.4.0):
- React-Core
- RNScreens (3.15.0):
- RNScreens (3.17.0):
- React-Core
- React-RCTImage
- RNShare (7.8.0):
- RNShare (7.9.0):
- React-Core
- RNVectorIcons (9.2.0):
- React-Core
Expand Down Expand Up @@ -411,6 +413,7 @@ DEPENDENCIES:
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (~> 0.7.2)
- HMSBroadcastExtensionSDK
- libevent (~> 2.1.12)
- Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`)
- Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone`)
Expand Down Expand Up @@ -469,6 +472,7 @@ SPEC REPOS:
- Flipper-RSocket
- FlipperKit
- hermes-engine
- HMSBroadcastExtensionSDK
- HMSSDK
- HMSWebRTC
- libevent
Expand Down Expand Up @@ -583,6 +587,7 @@ SPEC CHECKSUMS:
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
HMSBroadcastExtensionSDK: 2c3bf5b25453459d60799697bab1e30576690ab5
HMSSDK: 7c9d01559f1ac06cea982097138c1d3c836df0ae
HMSWebRTC: d3a9b2866e4a36a1d3834728a548a4a46309bb86
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
Expand All @@ -602,7 +607,7 @@ SPEC CHECKSUMS:
React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
react-native-hms: 34763e96cfb254adc7d2388b24a8e68dce9ff039
react-native-hms: 060c022f5af5dc8fe793beeb978628835b659422
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
Expand All @@ -619,18 +624,18 @@ SPEC CHECKSUMS:
React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
ReactCommon: 149906e01aa51142707a10665185db879898e966
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCPicker: a99807a74d9cd65c394f6e2a6c843a377b355b4d
RNCPicker: 0b65be85fe7954fbb2062ef079e3d1cde252d888
RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNPermissions: eac721f71748c4472d6e876038270b75397d6ee7
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
RNShare: 31b418e3ff2084712f0f39618bafa5f97a322c0e
RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9
RNShare: be91a5c149585affb02c25b351bd07ba927c7006
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: e337a5a83ce7efd36d8015fd215f0b44e5529740
PODFILE CHECKSUM: 089a130e4f18580d94b16c516c651a77733a9785

COCOAPODS: 1.11.3
Loading

0 comments on commit 49b26f8

Please sign in to comment.