Skip to content

Commit

Permalink
Release 1.9.8: Develop to main (#1314)
Browse files Browse the repository at this point in the history
# Description

- Release 1.9.8: Develop to main

### Pre-launch Checklist

- [x] The [Documentation] is updated accordingly, or this PR doesn't
require it.
- [x] I have updated the `ExampleAppChangelog.txt` file with relevant
changes.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making, or this PR is
test-exempt.
- [x] All existing and new tests are passing.

<!-- Links -->

[Documentation]: https://www.100ms.live/docs
  • Loading branch information
ygit authored Jan 11, 2024
2 parents 0789a02 + e094d0a commit f35b624
Show file tree
Hide file tree
Showing 29 changed files with 289 additions and 242 deletions.
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
plugins
user_trunk.yaml
user.yaml
tmp
8 changes: 4 additions & 4 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 0.1
cli:
version: 1.18.1
version: 1.19.0
plugins:
sources:
- id: trunk
Expand All @@ -11,13 +11,13 @@ lint:
- [email protected]
- [email protected]
- [email protected]
- [email protected].50
- [email protected].54
- [email protected]
- [email protected].1
- [email protected].2
- [email protected]
- [email protected]
- [email protected]
- [email protected].0
- [email protected].1
- [email protected]
- [email protected]
- [email protected]
Expand Down
19 changes: 11 additions & 8 deletions packages/react-native-hms/example/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.876.0)
aws-partitions (1.877.0)
aws-sdk-core (3.190.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.75.0)
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.142.0)
Expand All @@ -35,7 +35,7 @@ GEM
domain_name (0.6.20231109)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.108.0)
excon (0.109.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -65,7 +65,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.0)
fastlane (2.217.0)
fastlane (2.218.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -92,7 +92,7 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
optparse (>= 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
Expand All @@ -105,8 +105,9 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-firebase_app_distribution (0.7.4)
fastlane-plugin-firebase_app_distribution (0.8.0)
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
Expand All @@ -121,6 +122,8 @@ GEM
webrick
google-apis-firebaseappdistribution_v1 (0.3.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-firebaseappdistribution_v1alpha (0.2.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
Expand All @@ -133,7 +136,7 @@ GEM
google-cloud-env (2.1.0)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.3.1)
google-cloud-storage (1.45.0)
google-cloud-storage (1.46.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
Expand Down Expand Up @@ -161,7 +164,7 @@ GEM
multipart-post (2.3.0)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
optparse (0.4.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.4)
Expand Down
14 changes: 7 additions & 7 deletions packages/react-native-hms/example/ios/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.876.0)
aws-partitions (1.877.0)
aws-sdk-core (3.190.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.75.0)
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.142.0)
Expand All @@ -35,7 +35,7 @@ GEM
domain_name (0.6.20231109)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.108.0)
excon (0.109.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -65,7 +65,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.0)
fastlane (2.217.0)
fastlane (2.218.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -92,7 +92,7 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
optparse (>= 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
google-cloud-env (2.1.0)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.3.1)
google-cloud-storage (1.45.0)
google-cloud-storage (1.46.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
Expand Down Expand Up @@ -157,7 +157,7 @@ GEM
multipart-post (2.3.0)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
optparse (0.4.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.4)
Expand Down
10 changes: 5 additions & 5 deletions packages/react-native-hms/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ PODS:
- HMSBroadcastExtensionSDK (0.0.9)
- HMSHLSPlayerSDK (0.0.2):
- HMSAnalyticsSDK (= 0.0.2)
- HMSSDK (1.4.1):
- HMSSDK (1.4.2):
- HMSAnalyticsSDK (= 0.0.2)
- HMSWebRTC (= 1.0.5116)
- HMSWebRTC (1.0.5116)
Expand Down Expand Up @@ -292,10 +292,10 @@ PODS:
- React-Core
- react-native-document-picker (8.2.1):
- React-Core
- react-native-hms (1.9.7):
- react-native-hms (1.9.8):
- HMSBroadcastExtensionSDK (= 0.0.9)
- HMSHLSPlayerSDK (= 0.0.2)
- HMSSDK (= 1.4.1)
- HMSSDK (= 1.4.2)
- React-Core
- react-native-safe-area-context (3.4.1):
- React-Core
Expand Down Expand Up @@ -629,7 +629,7 @@ SPEC CHECKSUMS:
HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7
HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb
HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3
HMSSDK: 6a579cb806d4760cda149002150ff0beab03749b
HMSSDK: 7be2385e9e3ddbd5c03a228934622d679d033e15
HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Expand All @@ -649,7 +649,7 @@ SPEC CHECKSUMS:
react-native-avoid-softinput: 71a692888f0c1d426ad9045dc8325773583962cd
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
react-native-hms: 308c5e79ff57ee96bbd74d62ed1ae53cd2705066
react-native-hms: db24cc6601c73761dfae7529a2e0fb84d9b3bed1
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
React-perflogger: 5a890ca0911669421b7611661e9b58f91c805f5c
Expand Down
51 changes: 25 additions & 26 deletions packages/react-native-hms/example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-native-hms/example/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNHMSExample",
"version": "1.9.7",
"version": "1.9.8",
"private": true,
"scripts": {
"preinstall": "cd ../ && npm install && cd ./example",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-hms/ios/HMSHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class HMSHelper: NSObject {
}

iterator = hms.getPeerListIterator(options: HMSPeerListIteratorOptions(filterByPeerIds: [peerID], limit: 1))
iterator?.next { peers, error in
iterator?.next { peers, _ in

guard let nonnilPeers = peers, let firstPeer = nonnilPeers.first else {
completion(nil)
return
Expand Down
12 changes: 12 additions & 0 deletions packages/react-native-hms/ios/HMSRNSDK.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,23 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
let audioSettings = HMSHelper.getLocalAudioSettings(trackSettings?.value(forKey: "audio") as? NSDictionary, sdk, self?.delegate, id)
sdk.trackSettings = HMSTrackSettings(videoSettings: videoSettings, audioSettings: audioSettings)
}

NotificationCenter.default.addObserver(forName: UIApplication.willTerminateNotification,
object: nil,
queue: .main) { [weak self] _ in
if self?.hms?.room != nil {
self?.hms?.leave()
}
}
}
self.delegate = manager
self.id = id
}

deinit {
NotificationCenter.default.removeObserver(self)
}

// MARK: - Prebuilt

func getRoomLayout(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
Expand Down
Loading

0 comments on commit f35b624

Please sign in to comment.