Skip to content

Commit

Permalink
Merge branch 'develop' into feat/auto-pip
Browse files Browse the repository at this point in the history
  • Loading branch information
stanwolverine committed Oct 18, 2023
2 parents a877cb7 + 4b16c12 commit e746e43
Show file tree
Hide file tree
Showing 13 changed files with 176 additions and 150 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30

permissions:
checks: write # For trunk to post annotations
contents: read

steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -43,6 +47,11 @@ jobs:
- name: Install dependencies
run: cd packages/react-native-room-kit/example/; npm install

- name: Trunk Check
uses: trunk-io/trunk-action
with:
post-annotations: true

- name: Make Gradlew Executable
run: cd packages/react-native-room-kit/example/android && chmod +x ./gradlew

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-hms/example/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.834.0)
aws-partitions (1.836.0)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -107,7 +107,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.50.0)
google-apis-androidpublisher_v3 (0.51.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-hms/example/ios/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.834.0)
aws-partitions (1.836.0)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -107,7 +107,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.50.0)
google-apis-androidpublisher_v3 (0.51.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-hms/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ PODS:
- React-Core
- react-native-document-picker (8.2.1):
- React-Core
- react-native-hms (1.9.0):
- react-native-hms (1.9.1):
- HMSBroadcastExtensionSDK (= 0.0.9)
- HMSHLSPlayerSDK (= 0.0.2)
- HMSSDK (= 1.1.0)
Expand Down Expand Up @@ -649,7 +649,7 @@ SPEC CHECKSUMS:
react-native-avoid-softinput: 71a692888f0c1d426ad9045dc8325773583962cd
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
react-native-hms: e17e01ae2d414da43fc950a2421b404ab0512fde
react-native-hms: e119fe54d8688312472d9f16d920a5c4843124f3
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
React-perflogger: 5a890ca0911669421b7611661e9b58f91c805f5c
Expand Down
45 changes: 24 additions & 21 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.0",
"version": "1.9.1",
"private": true,
"scripts": {
"preinstall": "cd ../ && npm install && cd ./example",
Expand Down
45 changes: 24 additions & 21 deletions packages/react-native-hms/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/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@100mslive/react-native-hms",
"version": "1.9.0",
"version": "1.9.1",
"description": "Integrate Real Time Audio and Video conferencing, Interactive Live Streaming, and Chat in your apps with 100ms React Native SDK. With support for HLS and RTMP Live Streaming and Recording, Picture-in-Picture (PiP), one-to-one Video Call Modes, Audio Rooms, Video Player and much more, add immersive real-time communications to your apps.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ android {
versionName "2.3.91"
missingDimensionStrategy 'react-native-camera', 'general'
}

packagingOptions {
pickFirst '**/*.so'
}

splits {
abi {
reset()
Expand Down
45 changes: 24 additions & 21 deletions packages/react-native-room-kit/example/package-lock.json

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

0 comments on commit e746e43

Please sign in to comment.