Merge pull request #677 from 100mslive/develop

Release 0.9.7: Develop to main
100mslive · Jun 16, 2022 · 045a939 · 045a939
2 parents 58eb70f + 92beac1
commit 045a939
Show file tree

Hide file tree

Showing 37 changed files with 969 additions and 764 deletions.
diff --git a/README.md b/README.md
@@ -354,15 +354,14 @@ hmsInstance?.startScreenshare();
 ```js
 import {
   HMSUpdateListenerActions,
-  HMSSpeakerUpdate,
   HMSSpeaker,
 } from '@100mslive/react-native-hms';
 
 // hms instance acquired by build method
 hmsInstance?.addEventListener(HMSUpdateListenerActions.ON_SPEAKER, onSpeaker);
 
-const onSpeaker = (data: HMSSpeakerUpdate) => {
-  data?.peers?.map((speaker: HMSSpeaker) =>
+const onSpeaker = (data: HMSSpeaker[]) => {
+  data?.map((speaker: HMSSpeaker) =>
     console.log('speaker audio level: ', speaker?.level)
   );
 };

diff --git a/android/build.gradle b/android/build.gradle
@@ -63,8 +63,8 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"  // From node_modules
-    implementation 'com.github.100mslive.android-sdk:lib:2.3.9'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.github.100mslive.android-sdk:lib:2.4.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.1'
 }
diff --git a/android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt b/android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt
@@ -340,7 +340,6 @@ class HMSRNSDK(
             object : HMSAudioListener {
               override fun onAudioLevelUpdate(speakers: Array<HMSSpeaker>) {
                 val data: WritableMap = Arguments.createMap()
-                data.putInt("count", speakers.size)
                 data.putString("event", "ON_SPEAKER")
 
                 val peers: WritableArray = Arguments.createArray()
@@ -351,7 +350,7 @@ class HMSRNSDK(
                   speakerArray.putMap("track", HMSDecoder.getHmsTrack(speaker.hmsTrack))
                   peers.pushMap(speakerArray)
                 }
-                data.putArray("peers", peers)
+                data.putArray("speakers", peers)
                 data.putString("id", id)
                 delegate.emitEvent("ON_SPEAKER", data)
               }

diff --git a/example/android/Gemfile.lock b/example/android/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.597.0)
+    aws-partitions (1.598.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -107,9 +107,9 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.3.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.21.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.5.0)
+    google-apis-androidpublisher_v3 (0.22.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-core (0.6.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -118,12 +118,12 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.14.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.11.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-playcustomapp_v1 (0.8.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-storage_v1 (0.15.0)
+      google-apis-core (>= 0.5, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -136,8 +136,8 @@ android {
         applicationId "live.hms.rn"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 62
-        versionName "1.0.62"
+        versionCode 66
+        versionName "1.0.66"
     }
     splits {
         abi {

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -20,9 +20,11 @@
       android:theme="@style/AppTheme"
       android:requestLegacyExternalStorage="true">
       <activity
+        android:exported="true"
         android:name="com.reactnativehmssdk.HmsScreenshareActivity"
         android:label="@string/app_name" />
       <activity
+        android:exported="true"
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         minSdkVersion = 21
-        compileSdkVersion = 29
+        compileSdkVersion = 30
         targetSdkVersion = 29
         ndkVersion = "20.1.5948944"
     }

diff --git a/example/ios/Gemfile.lock b/example/ios/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.597.0)
+    aws-partitions (1.598.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -107,9 +107,9 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.3.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.21.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.5.0)
+    google-apis-androidpublisher_v3 (0.22.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-core (0.6.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -118,12 +118,12 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.14.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.11.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-playcustomapp_v1 (0.8.0)
+      google-apis-core (>= 0.5, < 2.a)
+    google-apis-storage_v1 (0.15.0)
+      google-apis-core (>= 0.5, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -277,7 +277,7 @@ PODS:
   - React-jsinspector (0.64.2)
   - react-native-cameraroll (4.1.2):
     - React-Core
-  - react-native-hms (0.9.6):
+  - react-native-hms (0.9.7):
     - HMSSDK (= 0.3.1)
     - React-Core
   - react-native-safe-area-context (3.4.1):
@@ -358,7 +358,7 @@ PODS:
     - React-Core
   - RNCPicker (2.4.1):
     - React-Core
-  - RNDeviceInfo (8.7.1):
+  - RNDeviceInfo (9.0.2):
     - React-Core
   - RNFS (2.20.0):
     - React-Core
@@ -369,7 +369,7 @@ PODS:
   - RNScreens (3.13.1):
     - React-Core
     - React-RCTImage
-  - RNShare (7.6.0):
+  - RNShare (7.6.2):
     - React-Core
   - RNVectorIcons (9.1.0):
     - React-Core
@@ -590,7 +590,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
   React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
   react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
-  react-native-hms: 98c5804f1a56baaa55c4a5997d0eafab1b27f3aa
+  react-native-hms: 12c2e96eb59b0f123086e3eaf0e8440aa6e56379
   react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
   react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f
   react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
@@ -608,12 +608,12 @@ SPEC CHECKSUMS:
   ReactCommon: 149906e01aa51142707a10665185db879898e966
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNCPicker: abc646b53a3d28ccfa3232c927a0ca52e0cf024d
-  RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
+  RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNPermissions: 34d678157c800b25b22a488e4d8babb57456e796
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
-  RNShare: 5972e774cd69eec879131b5283f883c1b93fc91c
+  RNShare: da0fd52f08c7b9f1ca31aef98a4890e98fc2c4c5
   RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac

diff --git a/example/ios/RNHMSExample.xcodeproj/project.pbxproj b/example/ios/RNHMSExample.xcodeproj/project.pbxproj
@@ -493,7 +493,7 @@
 				CODE_SIGN_ENTITLEMENTS = RNHMSExample/RNHMSExample.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
-				CURRENT_PROJECT_VERSION = 75;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 5N85PP82A9;
 				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -531,7 +531,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = RNHMSExample/RNHMSExample.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CURRENT_PROJECT_VERSION = 75;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 5N85PP82A9;
 				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;

diff --git a/example/ios/RNHMSExample/Info.plist b/example/ios/RNHMSExample/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.62.0</string>
+	<string>1.66.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>75</string>
+	<string>79</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>