Skip to content

Commit

Permalink
feat: support 4.5.0 (#837)
Browse files Browse the repository at this point in the history
* chore: readme #823

* chore: config terra and iris to 4.5.0

* [AUTO] Generate codes by terra (#827)

Co-authored-by: guoxianzhe <guoxianzhe@users.noreply.github.com>

* chore: update iris to 4.5.0-dev.6

* chore: fix NMS-23504

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: fix NMS-23582

* chore: fix NMS-23559

* chore: optimize

* chore: remove encodedVideoFrame case

* [AUTO] Generate codes by terra (#833)

Co-authored-by: guoxianzhe <guoxianzhe@users.noreply.github.com>

* chore: optimize

* chore: bump to 4.5.0-dev.11

* chore: bump to 4.5.0-dev.10

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: bump to dev.12

* chore: optimize

* chore: bump iris to 4.5.0-build.1

* [AUTO] Generate codes by terra (#841)

Co-authored-by: guoxianzhe <guoxianzhe@users.noreply.github.com>

* chore: change runner in ci.yml

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

---------

Co-authored-by: sda-rob <149643938+sda-rob@users.noreply.github.com>
Co-authored-by: guoxianzhe <guoxianzhe@users.noreply.github.com>
  • Loading branch information
3 people authored Dec 10, 2024
1 parent 05838cc commit 8c8452d
Show file tree
Hide file tree
Showing 30 changed files with 907 additions and 465 deletions.
7 changes: 3 additions & 4 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ runs:
with:
bundler-cache: true

- name: Setup activesupport
- name: Setup by gem
if: ${{ runner.os == 'macOS' }}
run:
gem install activesupport -v 7.0.8
run: gem install 'activesupport:7.0.8' 'xcodeproj:1.25.1'
shell: bash

- name: Setup Cocoapods
Expand All @@ -41,7 +40,7 @@ runs:
- name: Install dependencies
env:
POD_INSTALL: "0"
POD_INSTALL: '0'
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --immutable
shell: bash
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
matrix:
newArch: [true, false]
runs-on: macos-12
runs-on: macos-13
env:
TURBO_CACHE_DIR: .turbo/android
ORG_GRADLE_PROJECT_newArchEnabled: ${{ matrix.newArch }}
Expand Down Expand Up @@ -208,9 +208,9 @@ jobs:
run: |
yarn turbo run detox:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
- uses: futureware-tech/simulator-action@v1
- uses: futureware-tech/simulator-action@v4
with:
model: 'iPhone 14'
model: 'iPhone 15'

- name: Run e2e tests
# https://github.com/wix/Detox/issues/3720#issuecomment-1347855162
Expand Down
46 changes: 32 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
> NOTE: These sdk and samples only for the Agora Video 4.x APIs. For examples using previous releases please see the following branches:
> - [3.x](https://github.com/AgoraIO-Extensions/react-native-agora/tree/3.x)
> - [3.x](https://github.com/AgoraIO-Extensions/react-native-agora/tree/3.x)
# react-native-agora

Expand Down Expand Up @@ -46,26 +46,26 @@ pod install
## General Usage

```typescript
import {createAgoraRtcEngine} from 'react-native-agora';
import { createAgoraRtcEngine } from 'react-native-agora';

const engine = createAgoraRtcEngine();
engine.initialize({appId: 'YOUR APP ID'});
engine.initialize({ appId: 'YOUR APP ID' });
```

or

```javascript
const createAgoraRtcEngine = require('react-native-agora');
const engine = createAgoraRtcEngine();
engine.initialize({appId: 'YOUR APP ID'});
engine.initialize({ appId: 'YOUR APP ID' });
```

## Using TypeScript

We suggest you use TypeScript to develop, or use TypeScript eslint to lint your code.

* [Getting Started with TypeScript](https://reactnative.dev/docs/typescript#getting-started-with-typescript)
* [Adding TypeScript to an Existing Project](https://reactnative.dev/docs/typescript#adding-typescript-to-an-existing-project)
- [Getting Started with TypeScript](https://reactnative.dev/docs/typescript#getting-started-with-typescript)
- [Adding TypeScript to an Existing Project](https://reactnative.dev/docs/typescript#adding-typescript-to-an-existing-project)

## Troubleshooting

Expand Down Expand Up @@ -117,19 +117,37 @@ Fixed in React Native 0.59.9.

Source: https://github.com/facebook/react-native/issues/25154

### FOREGROUND_SERVICE_MEDIA_PROJECTION permission

If you are not using screen sharing feature in your app, you should exclude Screen Sharing extension as below:

```
// build.gradle (project-level)
signingConfigs{
....
}
configurations.configureEach {
exclude group: "io.agora.rtc", module: "full-screen-sharing"
}
compileOptions{
...
}
```

## API

* [React Native API](https://api-ref.agora.io/en/video-sdk/react-native/4.x/API/rtc_api_overview_ng.html)
* [Android API](https://api-ref.agora.io/en/video-sdk/android/4.x/API/rtc_api_overview_ng.html)
* [iOS API](https://api-ref.agora.io/en/video-sdk/ios/4.x/API/rtc_api_overview_ng.html)
- [React Native API](https://api-ref.agora.io/en/video-sdk/react-native/4.x/API/rtc_api_overview_ng.html)
- [Android API](https://api-ref.agora.io/en/video-sdk/android/4.x/API/rtc_api_overview_ng.html)
- [iOS API](https://api-ref.agora.io/en/video-sdk/ios/4.x/API/rtc_api_overview_ng.html)

## Resources

* Complete [API Doc](https://docs.agora.io/en/) at the Developer Center
* [Changelog](CHANGELOG.md)
* [Release Notes](https://docs.agora.io/en/video-calling/reference/release-notes?platform=react-native)
* [File bugs about this sample](https://github.com/AgoraIO-Extensions/react-native-agora/issues)
* [React Native Getting Started](https://facebook.github.io/react-native/docs/getting-started.html)
- Complete [API Doc](https://docs.agora.io/en/) at the Developer Center
- [Changelog](CHANGELOG.md)
- [Release Notes](https://docs.agora.io/en/video-calling/reference/release-notes?platform=react-native)
- [File bugs about this sample](https://github.com/AgoraIO-Extensions/react-native-agora/issues)
- [React Native Getting Started](https://facebook.github.io/react-native/docs/getting-started.html)

## Contributing

Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
api 'io.agora.rtc:full-sdk:4.4.1'
implementation 'io.agora.rtc:full-screen-sharing:4.4.1'
implementation 'io.agora.rtc:iris-rtc:4.4.0-build.6'
api 'io.agora.rtc:agora-special-full:4.5.0.1'
implementation 'io.agora.rtc:full-screen-sharing:4.5.0.1'
implementation 'io.agora.rtc:iris-rtc:4.5.0-build.1'
}

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion example/.detoxrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = {
simulator: {
type: 'ios.simulator',
device: {
type: 'iPhone 14'
type: 'iPhone 15'
}
},
attached: {
Expand Down
1 change: 0 additions & 1 deletion example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Any scene of this project can run successfully alone.
| [ChannelMediaRelay](./src/examples/advanced/ChannelMediaRelay) | Starts relaying media streams across channels. This method can be used to implement scenarios such as co-host across channels |
| [ContentInspect](./src/examples/advanced/ContentInspect) | Content inspect |
| [DirectCdnStreaming](./src/examples/advanced/DirectCdnStreaming) | Direct CDN streaming |
| [EncodedVideoFrame](./src/examples/advanced/EncodedVideoFrame) | Encoded video frame |
| [Encryption](./src/examples/advanced/Encryption) | Enables/Disables the built-in encryption |
| [Extension](./src/examples/advanced/Extension) | Enables/Disables extensions |
| [JoinMultipleChannel](./src/examples/advanced/JoinMultipleChannel) | Joins a channel with the connection ID |
Expand Down
4 changes: 2 additions & 2 deletions example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@
INFOPLIST_FILE = ScreenShare/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -922,7 +922,7 @@
INFOPLIST_FILE = ScreenShare/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do
end

target 'ScreenShare' do
pod 'AgoraRtcEngine_iOS', '4.4.0'
pod 'AgoraRtcEngine_iOS', '4.5.0'
end
104 changes: 53 additions & 51 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
PODS:
- AgoraIrisRTC_iOS (4.4.0-build.6)
- AgoraRtcEngine_iOS (4.4.0):
- AgoraRtcEngine_iOS/AIAEC (= 4.4.0)
- AgoraRtcEngine_iOS/AIAECLL (= 4.4.0)
- AgoraRtcEngine_iOS/AINS (= 4.4.0)
- AgoraRtcEngine_iOS/AINSLL (= 4.4.0)
- AgoraRtcEngine_iOS/AudioBeauty (= 4.4.0)
- AgoraRtcEngine_iOS/Basic (= 4.4.0)
- AgoraRtcEngine_iOS/ClearVision (= 4.4.0)
- AgoraRtcEngine_iOS/ContentInspect (= 4.4.0)
- AgoraRtcEngine_iOS/FaceCapture (= 4.4.0)
- AgoraRtcEngine_iOS/FaceDetection (= 4.4.0)
- AgoraRtcEngine_iOS/LipSync (= 4.4.0)
- AgoraRtcEngine_iOS/ReplayKit (= 4.4.0)
- AgoraRtcEngine_iOS/RtcBasic (= 4.4.0)
- AgoraRtcEngine_iOS/SpatialAudio (= 4.4.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (= 4.4.0)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (= 4.4.0)
- AgoraRtcEngine_iOS/VideoCodecDec (= 4.4.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (= 4.4.0)
- AgoraRtcEngine_iOS/VirtualBackground (= 4.4.0)
- AgoraRtcEngine_iOS/VQA (= 4.4.0)
- AgoraRtcEngine_iOS/AIAEC (4.4.0)
- AgoraRtcEngine_iOS/AIAECLL (4.4.0)
- AgoraRtcEngine_iOS/AINS (4.4.0)
- AgoraRtcEngine_iOS/AINSLL (4.4.0)
- AgoraRtcEngine_iOS/AudioBeauty (4.4.0)
- AgoraRtcEngine_iOS/Basic (4.4.0)
- AgoraRtcEngine_iOS/ClearVision (4.4.0)
- AgoraRtcEngine_iOS/ContentInspect (4.4.0)
- AgoraRtcEngine_iOS/FaceCapture (4.4.0)
- AgoraRtcEngine_iOS/FaceDetection (4.4.0)
- AgoraRtcEngine_iOS/LipSync (4.4.0)
- AgoraRtcEngine_iOS/ReplayKit (4.4.0)
- AgoraRtcEngine_iOS/RtcBasic (4.4.0)
- AgoraRtcEngine_iOS/SpatialAudio (4.4.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (4.4.0)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (4.4.0)
- AgoraRtcEngine_iOS/VideoCodecDec (4.4.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (4.4.0)
- AgoraRtcEngine_iOS/VirtualBackground (4.4.0)
- AgoraRtcEngine_iOS/VQA (4.4.0)
- AgoraInfra_iOS (1.2.13)
- AgoraIrisRTC_iOS (4.5.0-build.1)
- AgoraRtcEngine_iOS (4.5.0):
- AgoraRtcEngine_iOS/AIAEC (= 4.5.0)
- AgoraRtcEngine_iOS/AIAECLL (= 4.5.0)
- AgoraRtcEngine_iOS/AINS (= 4.5.0)
- AgoraRtcEngine_iOS/AINSLL (= 4.5.0)
- AgoraRtcEngine_iOS/AudioBeauty (= 4.5.0)
- AgoraRtcEngine_iOS/ClearVision (= 4.5.0)
- AgoraRtcEngine_iOS/ContentInspect (= 4.5.0)
- AgoraRtcEngine_iOS/FaceCapture (= 4.5.0)
- AgoraRtcEngine_iOS/FaceDetection (= 4.5.0)
- AgoraRtcEngine_iOS/LipSync (= 4.5.0)
- AgoraRtcEngine_iOS/ReplayKit (= 4.5.0)
- AgoraRtcEngine_iOS/RtcBasic (= 4.5.0)
- AgoraRtcEngine_iOS/SpatialAudio (= 4.5.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (= 4.5.0)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (= 4.5.0)
- AgoraRtcEngine_iOS/VideoCodecDec (= 4.5.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (= 4.5.0)
- AgoraRtcEngine_iOS/VirtualBackground (= 4.5.0)
- AgoraRtcEngine_iOS/VQA (= 4.5.0)
- AgoraRtcEngine_iOS/AIAEC (4.5.0)
- AgoraRtcEngine_iOS/AIAECLL (4.5.0)
- AgoraRtcEngine_iOS/AINS (4.5.0)
- AgoraRtcEngine_iOS/AINSLL (4.5.0)
- AgoraRtcEngine_iOS/AudioBeauty (4.5.0)
- AgoraRtcEngine_iOS/ClearVision (4.5.0)
- AgoraRtcEngine_iOS/ContentInspect (4.5.0)
- AgoraRtcEngine_iOS/FaceCapture (4.5.0)
- AgoraRtcEngine_iOS/FaceDetection (4.5.0)
- AgoraRtcEngine_iOS/LipSync (4.5.0)
- AgoraRtcEngine_iOS/ReplayKit (4.5.0)
- AgoraRtcEngine_iOS/RtcBasic (4.5.0):
- AgoraInfra_iOS (= 1.2.13)
- AgoraRtcEngine_iOS/SpatialAudio (4.5.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (4.5.0)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (4.5.0)
- AgoraRtcEngine_iOS/VideoCodecDec (4.5.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (4.5.0)
- AgoraRtcEngine_iOS/VirtualBackground (4.5.0)
- AgoraRtcEngine_iOS/VQA (4.5.0)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -417,9 +417,9 @@ PODS:
- React-jsinspector (0.72.12)
- React-logger (0.72.12):
- glog
- react-native-agora (4.3.2):
- AgoraIrisRTC_iOS (= 4.4.0-build.6)
- AgoraRtcEngine_iOS (= 4.4.0)
- react-native-agora (4.4.0):
- AgoraIrisRTC_iOS (= 4.5.0-build.1)
- AgoraRtcEngine_iOS (= 4.5.0)
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-image-tools (0.8.1):
Expand Down Expand Up @@ -557,7 +557,7 @@ PODS:
- Yoga (~> 1.14)

DEPENDENCIES:
- AgoraRtcEngine_iOS (= 4.4.0)
- AgoraRtcEngine_iOS (= 4.5.0)
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
Expand Down Expand Up @@ -633,7 +633,8 @@ DEPENDENCIES:
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
trunk:
- AgoraInfra_iOS
- AgoraIrisRTC_iOS
- AgoraRtcEngine_iOS
- CocoaAsyncSocket
Expand Down Expand Up @@ -752,8 +753,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AgoraIrisRTC_iOS: b28c8aa87cfa3eeec9be2bf1df35e6b5c28aaff1
AgoraRtcEngine_iOS: 645039304ab4e32cb43506659056fb71f5d1a3b0
AgoraInfra_iOS: 65e11a2183ab7836258768868d06058c22701b13
AgoraIrisRTC_iOS: 8207edf56ceaae6b8ee773d8e2137c6b7cb062be
AgoraRtcEngine_iOS: 38b5e0a49bbad5616f284e6a4f9e4f5bb3fb3b2e
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -787,7 +789,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 95bdf0ab46024ca9849e08739b6abd8fe489cd33
React-jsinspector: 8e291ed0ab371314de269001d6b9b25db6aabf42
React-logger: d4010de0b0564e63637ad08373bc73b5d919974b
react-native-agora: e440bb9c0abad211ff7ab6877dd12f07252c5168
react-native-agora: e851f18fa99b8ff8cb38bd2f2b7d17f06fd1a470
react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
Expand Down Expand Up @@ -818,6 +820,6 @@ SPEC CHECKSUMS:
Yoga: 87e59f6d458e5061d2421086c5de994b3f7cd151
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: e6f852241acd4926e2d97e62a62ba5748df7ca3e
PODFILE CHECKSUM: 3754fe81d40fc873534ad6c2bee5dc849457061f

COCOAPODS: 1.13.0
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-native-color-picker": "^0.6.0",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.9.0",
"react-native-image-tool": "github:LichKing-2234/react-native-image-tools",
"react-native-image-tool": "AgoraIO-Extensions/react-native-image-tools",
"react-native-picker-select": "^8.0.4",
"react-native-safe-area-context": "^4.5.0",
"react-native-screens": "^3.20.0",
Expand Down
Loading

0 comments on commit 8c8452d

Please sign in to comment.