Skip to content

Commit

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

- Release 1.11.0: 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 Oct 29, 2024
2 parents 430815f + dd670ac commit e28c4e2
Show file tree
Hide file tree
Showing 45 changed files with 8,187 additions and 25,480 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# These owners will be the default owners for everything in the repo.
* @ygit
* @stanwolverine
14 changes: 7 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [100ms Docs](https://docs.100ms.live/) If you don't know where to start contributing, ask us on our [Discord channel](http://100ms.live/discord).
Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [100ms Docs](https://docs.100ms.live/)

In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.

Expand All @@ -26,12 +26,12 @@ Scan through our [existing issues](https://github.com/100mslive/100ms-react-nati

When you're done making the changes, open a pull request, often referred to as a PR.

- Fill out the PR description summarizing your changes so we can review your PR. This template helps reviewers understand your changes and the purpose of your pull request.
- Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge. Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request for additional information.
- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
- If you run into any merge issues, checkout this [git tutorial](https://lab.github.com/githubtraining/managing-merge-conflicts) to help you resolve merge conflicts and other issues.
- Fill out the PR description summarizing your changes so we can review your PR. This template helps reviewers understand your changes and the purpose of your pull request.
- Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge. Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request for additional information.
- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
- If you run into any merge issues, checkout this [git tutorial](https://lab.github.com/githubtraining/managing-merge-conflicts) to help you resolve merge conflicts and other issues.

### Your PR is merged!

Expand Down
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/1-bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: 🐛 Bug Report
description: Report a reproducible bug or regression in 100ms React Native Package
title: '🐛 '
labels: ['Needs Triage 🔍']
title: "🐛 "
labels: ["Needs Triage 🔍"]
body:
- type: markdown
attributes:
value: |
Please provide all the information requested. Issues that do not follow this format are likely to stall.
You can ask your questions on 100ms Discord as well: https://100ms.live/discord
- type: textarea
id: description
attributes:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/2-question-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ assignees: ""
# ❓ Question or Support Request

<!-- Do read the 100ms Docs: https://www.100ms.live/docs -->
<!-- You can ask your questions on 100ms Discord as well: https://100ms.live/discord -->

## Describe your question or ask for support

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/3-feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ assignees: ""
# 🚀 Feature Request

<!-- Do read the 100ms Docs: https://www.100ms.live/docs -->
<!-- You can request for features on 100ms Discord as well: https://100ms.live/discord -->

## Is your feature request related to a problem? Please describe

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/4-docs-bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ assignees: ""
# 📚 Documentation Task

<!-- Do read the 100ms Docs: https://www.100ms.live/docs -->
<!-- You can ask your questions on 100ms Discord as well: https://100ms.live/discord -->

## **Describe the bug**

Expand Down
21 changes: 9 additions & 12 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: 💬 Join the 100ms Discord
url: https://100ms.live/discord
about: Ask questions and discuss with 100ms Team in Real Time.
- name: 📃 100ms Documentation
url: https://www.100ms.live/docs
about: Explore the 100ms capabilities with our Popular Guides, Demos & Blogs on 100ms Documentation page
- name: 💫 Register on 100ms Dashboard
url: https://dashboard.100ms.live/register
about: Try the gold-standard for adding live audio-video to your apps for free.
- name: 🗣️ Talk to us
url: https://www.100ms.live/contact
about: Get in touch with the 100ms team today! We are committed to helping our customers maximize the potential of our cutting-edge live video platform. Whether you need advice on how to leverage live streaming for your business, pricing information, or want to learn more about the 100ms platform, our team is here to answer all your questions and provide tailored solutions to meet your unique needs.
- name: 📃 100ms Documentation
url: https://www.100ms.live/docs
about: Explore the 100ms capabilities with our Popular Guides, Demos & Blogs on 100ms Documentation page
- name: 💫 Register on 100ms Dashboard
url: https://dashboard.100ms.live/register
about: Try the gold-standard for adding live audio-video to your apps for free.
- name: 🗣️ Talk to us
url: https://www.100ms.live/contact
about: Get in touch with the 100ms team today! We are committed to helping our customers maximize the potential of our cutting-edge live video platform. Whether you need advice on how to leverage live streaming for your business, pricing information, or want to learn more about the 100ms platform, our team is here to answer all your questions and provide tailored solutions to meet your unique needs.
3 changes: 1 addition & 2 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@

1. Open a new issue and select the issue with the template called "❓ Question or Support Request".
2. Read the instructions carefully in that template and submit the issue asking for support
or any question.
or any question.
3. If you are facing any bugs then file the issue with the template called " 🐛 Bug Report".
4. Do read the 100ms Docs at https://www.100ms.live/docs
5. You can ask your questions on 100ms Discord as well: https://100ms.live/discord

See the [contributing guidelines](CONTRIBUTING.md) and read our [code of conduct](CODE_OF_CONDUCT.md).
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17.0.12
9 changes: 5 additions & 4 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
version: 0.1
cli:
version: 1.22.2
version: 1.22.3
plugins:
sources:
- id: trunk
ref: v1.6.1
uri: https://github.com/trunk-io/plugins
lint:
disabled:
- vale
- osv-scanner
enabled:
- dotenv-linter@3.3.0
- actionlint@1.7.1
- prettier@3.3.3
- swiftlint@0.54.0
- checkov@3.2.213
- trivy@0.53.0
- trufflehog@3.80.3
- checkov@3.2.228
- trivy@0.54.1
- trufflehog@3.81.9
- oxipng@9.1.2
- yamllint@1.35.1
- ktlint@1.3.1
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
[![quality](https://img.shields.io/npms-io/quality-score/@100mslive/react-native-hms)](https://www.npmjs.com/package/@100mslive/react-native-hms)
[![collaborators](https://img.shields.io/npm/collaborators/@100mslive/react-native-hms)](https://www.npmjs.com/package/@100mslive/react-native-hms)
[![Documentation](https://img.shields.io/badge/Read-Documentation-blue)](https://docs.100ms.live/react-native/v2/foundation/basics)
[![Discord](https://img.shields.io/discord/843749923060711464?label=Join%20on%20Discord)](https://100ms.live/discord)
[![Firebase](https://img.shields.io/badge/Download%20Android-Firebase-green)](https://appdistribution.firebase.dev/i/7b7ab3b30e627c35)
[![TestFlight](https://img.shields.io/badge/Download%20iOS-TestFlight-blue)](https://testflight.apple.com/join/v4bSIPad)
[![Activity](https://img.shields.io/github/commit-activity/m/100mslive/react-native-hms.svg)](https://github.com/100mslive/100ms-react-native/projects?type=classic)
Expand Down
1 change: 0 additions & 1 deletion packages/react-native-hms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
[![quality](https://img.shields.io/npms-io/quality-score/@100mslive/react-native-hms)](https://www.npmjs.com/package/@100mslive/react-native-hms)
[![collaborators](https://img.shields.io/npm/collaborators/@100mslive/react-native-hms)](https://www.npmjs.com/package/@100mslive/react-native-hms)
[![Documentation](https://img.shields.io/badge/Read-Documentation-blue)](https://docs.100ms.live/react-native/v2/foundation/basics)
[![Discord](https://img.shields.io/discord/843749923060711464?label=Join%20on%20Discord)](https://100ms.live/discord)
[![Firebase](https://img.shields.io/badge/Download%20Android-Firebase-green)](https://appdistribution.firebase.dev/i/7b7ab3b30e627c35)
[![TestFlight](https://img.shields.io/badge/Download%20iOS-TestFlight-blue)](https://testflight.apple.com/join/v4bSIPad)
[![Activity](https://img.shields.io/github/commit-activity/m/100mslive/react-native-hms.svg)](https://github.com/100mslive/react-native-hms/projects/1)
Expand Down
1 change: 1 addition & 0 deletions packages/react-native-hms/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def safeExtGet(prop, fallback) {
}

android {
namespace 'com.reactnativehmssdk'
compileSdkVersion safeExtGet('Hmssdk_compileSdkVersion', 31)
defaultConfig {
minSdkVersion safeExtGet('Hmssdk_minSdkVersion', 21)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,13 @@ class HMSManager(
) {
reactAppContext?.currentActivity?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
emitPipEvent(true)
reactAppContext?.currentActivity?.enterPictureInPictureMode(pipParams)
val success = reactAppContext?.currentActivity?.enterPictureInPictureMode(pipParams)
success?.let {
if (!it) {
reactAppContext?.currentActivity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
emitPipEvent(false)
}
}
}
}
}
Expand Down Expand Up @@ -1093,6 +1099,7 @@ class HMSManager(
activity.setPictureInPictureParams(pipParams)
return true
} catch (e: Exception) {
Log.e("HMSManager", "Error setting PictureInPictureParams: ${e.message}")
return false
}
}
Expand Down
45 changes: 19 additions & 26 deletions packages/react-native-hms/example/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.956.0)
aws-sdk-core (3.201.1)
aws-partitions (1.965.0)
aws-sdk-core (3.201.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-s3 (1.158.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand Down Expand Up @@ -60,7 +60,7 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
Expand Down Expand Up @@ -108,31 +108,24 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-firebase_app_distribution (0.9.1)
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.66.0)
google-apis-androidpublisher_v3 (0.69.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.15.0)
google-apis-core (0.15.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.1, < 3.a)
httpclient (>= 2.8.3, < 3.a)
mini_mime (~> 1.0)
mutex_m
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
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.21.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.16.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.40.0)
google-apis-storage_v1 (0.43.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
Expand All @@ -155,7 +148,7 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.6)
http-cookie (1.0.7)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
Expand All @@ -166,20 +159,21 @@ GEM
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.1)
mutex_m (0.2.0)
nanaimo (0.3.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.0)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.9)
rexml (3.3.5)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
Expand All @@ -205,13 +199,13 @@ GEM
uber (0.1.0)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand All @@ -223,7 +217,6 @@ PLATFORMS

DEPENDENCIES
fastlane
fastlane-plugin-firebase_app_distribution

BUNDLED WITH
2.5.15
2.5.17
Loading

0 comments on commit e28c4e2

Please sign in to comment.