Skip to content

Commit

Permalink
feat: support native 4.3.1 (#769)
Browse files Browse the repository at this point in the history
* feat: support native 4.3.1

* chore: optimize

* chore: optimize

* chore: bump to 0313 build

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

* chore: optimize

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

Co-authored-by: guoxianzhe <[email protected]>

* chore: optimize

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

Co-authored-by: guoxianzhe <[email protected]>

* [AUTO] Generate comments by iris-doc (#781)

Co-authored-by: Nero-Hu <[email protected]>

* chore: optimize

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

Co-authored-by: guoxianzhe <[email protected]>

* chore: optimize

* chore: optimize

* chore: optimize

---------

Co-authored-by: sda-rob <[email protected]>
Co-authored-by: guoxianzhe <[email protected]>
Co-authored-by: Nero-Hu <[email protected]>
  • Loading branch information
4 people authored May 8, 2024
1 parent 617742b commit a05c57d
Show file tree
Hide file tree
Showing 34 changed files with 900 additions and 303 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
lint:
strategy:
matrix:
platform: [ ubuntu, windows ]
platform: [ubuntu, windows]
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
Expand All @@ -35,7 +35,7 @@ jobs:
test:
strategy:
matrix:
platform: [ ubuntu, windows ]
platform: [ubuntu, windows]
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
Expand All @@ -50,7 +50,7 @@ jobs:
build-library:
strategy:
matrix:
platform: [ ubuntu, windows ]
platform: [ubuntu, windows]
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
Expand All @@ -65,8 +65,8 @@ jobs:
test-android:
strategy:
matrix:
newArch: [ true, false ]
runs-on: macos-latest
newArch: [true, false]
runs-on: macos-12
env:
TURBO_CACHE_DIR: .turbo/android
ORG_GRADLE_PROJECT_newArchEnabled: ${{ matrix.newArch }}
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
test-ios:
strategy:
matrix:
newArch: [ 1, 0 ]
newArch: [1, 0]
runs-on: macos-latest
env:
TURBO_CACHE_DIR: .turbo/ios
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

- name: Build example for iOS
run: |
yarn turbo run detox:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --force=true
yarn turbo run detox:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
- uses: futureware-tech/simulator-action@v1
with:
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.3.0'
implementation 'io.agora.rtc:full-screen-sharing:4.3.0'
implementation 'io.agora.rtc:iris-rtc:4.3.0-build.2'
api 'io.agora.rtc:full-sdk:4.3.1'
implementation 'io.agora.rtc:full-screen-sharing:4.3.1'
implementation 'io.agora.rtc:iris-rtc:4.3.1-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 @@ -6,7 +6,7 @@ module.exports = {
config: 'e2e/jest.config.js'
},
jest: {
setupTimeout: 1200000
setupTimeout: 2100000
}
},
apps: {
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.3.0'
pod 'AgoraRtcEngine_iOS', '4.3.1'
end
84 changes: 44 additions & 40 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
PODS:
- AgoraIrisRTC_iOS (4.3.0-build.2)
- AgoraRtcEngine_iOS (4.3.0):
- AgoraRtcEngine_iOS/AIAEC (= 4.3.0)
- AgoraRtcEngine_iOS/AINS (= 4.3.0)
- AgoraRtcEngine_iOS/AudioBeauty (= 4.3.0)
- AgoraRtcEngine_iOS/ClearVision (= 4.3.0)
- AgoraRtcEngine_iOS/ContentInspect (= 4.3.0)
- AgoraRtcEngine_iOS/FaceCapture (= 4.3.0)
- AgoraRtcEngine_iOS/FaceDetection (= 4.3.0)
- AgoraRtcEngine_iOS/ReplayKit (= 4.3.0)
- AgoraRtcEngine_iOS/RtcBasic (= 4.3.0)
- AgoraRtcEngine_iOS/SpatialAudio (= 4.3.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (= 4.3.0)
- AgoraRtcEngine_iOS/VideoCodecDec (= 4.3.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (= 4.3.0)
- AgoraRtcEngine_iOS/VirtualBackground (= 4.3.0)
- AgoraRtcEngine_iOS/VQA (= 4.3.0)
- AgoraRtcEngine_iOS/AIAEC (4.3.0)
- AgoraRtcEngine_iOS/AINS (4.3.0)
- AgoraRtcEngine_iOS/AudioBeauty (4.3.0)
- AgoraRtcEngine_iOS/ClearVision (4.3.0)
- AgoraRtcEngine_iOS/ContentInspect (4.3.0)
- AgoraRtcEngine_iOS/FaceCapture (4.3.0)
- AgoraRtcEngine_iOS/FaceDetection (4.3.0)
- AgoraRtcEngine_iOS/ReplayKit (4.3.0)
- AgoraRtcEngine_iOS/RtcBasic (4.3.0)
- AgoraRtcEngine_iOS/SpatialAudio (4.3.0)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (4.3.0)
- AgoraRtcEngine_iOS/VideoCodecDec (4.3.0)
- AgoraRtcEngine_iOS/VideoCodecEnc (4.3.0)
- AgoraRtcEngine_iOS/VirtualBackground (4.3.0)
- AgoraRtcEngine_iOS/VQA (4.3.0)
- AgoraIrisRTC_iOS (4.3.1-build.1)
- AgoraRtcEngine_iOS (4.3.1):
- AgoraRtcEngine_iOS/AIAEC (= 4.3.1)
- AgoraRtcEngine_iOS/AINS (= 4.3.1)
- AgoraRtcEngine_iOS/AudioBeauty (= 4.3.1)
- AgoraRtcEngine_iOS/ClearVision (= 4.3.1)
- AgoraRtcEngine_iOS/ContentInspect (= 4.3.1)
- AgoraRtcEngine_iOS/FaceCapture (= 4.3.1)
- AgoraRtcEngine_iOS/FaceDetection (= 4.3.1)
- AgoraRtcEngine_iOS/LipSync (= 4.3.1)
- AgoraRtcEngine_iOS/ReplayKit (= 4.3.1)
- AgoraRtcEngine_iOS/RtcBasic (= 4.3.1)
- AgoraRtcEngine_iOS/SpatialAudio (= 4.3.1)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (= 4.3.1)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (= 4.3.1)
- AgoraRtcEngine_iOS/VideoCodecDec (= 4.3.1)
- AgoraRtcEngine_iOS/VideoCodecEnc (= 4.3.1)
- AgoraRtcEngine_iOS/VirtualBackground (= 4.3.1)
- AgoraRtcEngine_iOS/VQA (= 4.3.1)
- AgoraRtcEngine_iOS/AIAEC (4.3.1)
- AgoraRtcEngine_iOS/AINS (4.3.1)
- AgoraRtcEngine_iOS/AudioBeauty (4.3.1)
- AgoraRtcEngine_iOS/ClearVision (4.3.1)
- AgoraRtcEngine_iOS/ContentInspect (4.3.1)
- AgoraRtcEngine_iOS/FaceCapture (4.3.1)
- AgoraRtcEngine_iOS/FaceDetection (4.3.1)
- AgoraRtcEngine_iOS/LipSync (4.3.1)
- AgoraRtcEngine_iOS/ReplayKit (4.3.1)
- AgoraRtcEngine_iOS/RtcBasic (4.3.1)
- AgoraRtcEngine_iOS/SpatialAudio (4.3.1)
- AgoraRtcEngine_iOS/VideoAv1CodecDec (4.3.1)
- AgoraRtcEngine_iOS/VideoAv1CodecEnc (4.3.1)
- AgoraRtcEngine_iOS/VideoCodecDec (4.3.1)
- AgoraRtcEngine_iOS/VideoCodecEnc (4.3.1)
- AgoraRtcEngine_iOS/VirtualBackground (4.3.1)
- AgoraRtcEngine_iOS/VQA (4.3.1)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -407,9 +411,9 @@ PODS:
- React-jsinspector (0.72.10)
- React-logger (0.72.10):
- glog
- react-native-agora (4.2.6):
- AgoraIrisRTC_iOS (= 4.3.0-build.2)
- AgoraRtcEngine_iOS (= 4.3.0)
- react-native-agora (4.3.0):
- AgoraIrisRTC_iOS (= 4.3.1-build.1)
- AgoraRtcEngine_iOS (= 4.3.1)
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-agora-rawdata (0.1.0):
Expand Down Expand Up @@ -549,7 +553,7 @@ PODS:
- Yoga (~> 1.14)

DEPENDENCIES:
- AgoraRtcEngine_iOS (= 4.3.0)
- AgoraRtcEngine_iOS (= 4.3.1)
- 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 @@ -747,8 +751,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AgoraIrisRTC_iOS: 2caf892fa827777fe43b6ac7d12e9b42579eb865
AgoraRtcEngine_iOS: 267c0980c1fb97e056d05b850f8629b05b6e467a
AgoraIrisRTC_iOS: 7710d853202eca4900c2916aefc44abd5a139d4e
AgoraRtcEngine_iOS: f64be00fdda786bb7edd84ab461c31b7b4c93534
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -782,7 +786,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 45ef2ec6dcde31b90469175ec76ddac77b91dfc3
React-jsinspector: de0198127395fec3058140a20c045167f761bb16
React-logger: dc3a2b174d79c2da635059212747d8d929b54e06
react-native-agora: d485857dafe397d26f2ba2355b4b7db98508bc17
react-native-agora: 4f85b3cdfa151e91df4953d4b9bf4fdbb3d527ff
react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31
react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
Expand Down Expand Up @@ -814,6 +818,6 @@ SPEC CHECKSUMS:
Yoga: d0003f849d2b5224c072cef6568b540d8bb15cd3
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 130d9ef97e0ac413532866c101953098003f33da
PODFILE CHECKSUM: a1a891aa26be28bd4953131bc93b8f452d3aff23

COCOAPODS: 1.13.0
4 changes: 2 additions & 2 deletions react-native-agora.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Pod::Spec.new do |s|
end
end

s.dependency 'AgoraRtcEngine_iOS', '4.3.0'
s.dependency 'AgoraIrisRTC_iOS', '4.3.0-build.2'
s.dependency 'AgoraRtcEngine_iOS', '4.3.1'
s.dependency 'AgoraIrisRTC_iOS', '4.3.1-build.1'
s.libraries = 'stdc++'
s.framework = 'ReplayKit'
end
22 changes: 14 additions & 8 deletions scripts/mirror.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ MY_PATH=$(realpath $(dirname "$0"))
PROJECT_ROOT=$(realpath ${MY_PATH}/..)

LINE="npmRegistryServer: https://registry.npmmirror.com"
if ! grep -q "$LINE" ${PROJECT_ROOT}/.yarnrc.yml; then
sed -i "" "1i\\
$LINE
" ${PROJECT_ROOT}/.yarnrc.yml
fi

sed -i "" 's#"react-native-agora-rawdata": "github:AgoraLibrary/react-native-agora-rawdata"#"react-native-agora-rawdata": "git+https://gitee.com/agoraio-community/react-native-agora-rawdata.git"#g' ${PROJECT_ROOT}/example/package.json
sed -i "" 's#"react-native-image-tool": "github:LichKing-2234/react-native-image-tools"#"react-native-image-tool": "git+https://gitee.com/agoraio-community/react-native-image-tools.git"#g' ${PROJECT_ROOT}/example/package.json
grep -q "$LINE" ${PROJECT_ROOT}/.yarnrc.yml || echo -e "$LINE\n$(cat ${PROJECT_ROOT}/.yarnrc.yml)" > ${PROJECT_ROOT}/.yarnrc.yml.tmp && mv ${PROJECT_ROOT}/.yarnrc.yml.tmp ${PROJECT_ROOT}/.yarnrc.yml

echo ".yarnrc.yml updated"

old1='"react-native-agora-rawdata": "github:AgoraLibrary/react-native-agora-rawdata"'
new1='"react-native-agora-rawdata": "git+https://gitee.com/agoraio-community/react-native-agora-rawdata.git"'

old2='"react-native-image-tool": "github:LichKing-2234/react-native-image-tools"'
new2='"react-native-image-tool": "git+https://gitee.com/agoraio-community/react-native-image-tools.git"'

sed "s#${old1}#${new1}#g" ${PROJECT_ROOT}/example/package.json > tmp && mv tmp ${PROJECT_ROOT}/example/package.json
sed "s#${old2}#${new2}#g" ${PROJECT_ROOT}/example/package.json > tmp && mv tmp ${PROJECT_ROOT}/example/package.json

echo "example/package.json updated"
2 changes: 1 addition & 1 deletion scripts/terra/config/impl_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ parsers:
- name: RTCParser
package: '@agoraio-extensions/terra_shared_configs'
args:
sdkVersion: 4.3.0
sdkVersion: 4.3.1
FixEnumConstantParser:
skipCalEnumValue: true

Expand Down
2 changes: 1 addition & 1 deletion scripts/terra/config/types_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ parsers:
- name: RTCParser
package: '@agoraio-extensions/terra_shared_configs'
args:
sdkVersion: 4.3.0
sdkVersion: 4.3.1
FixEnumConstantParser:
skipCalEnumValue: true

Expand Down
2 changes: 0 additions & 2 deletions scripts/terra/generate-code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ npm exec terra -- run \
cd ${PROJECT_ROOT}

yarn build:ts-interface

yarn lint --fix
2 changes: 1 addition & 1 deletion scripts/terra/impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type ClazzMethodUserData = IrisApiIdParserUserData & {
};

export function impl(parseResult: ParseResult) {
let preParseResult = deepClone(parseResult, ['parent']);
let preParseResult = deepClone(parseResult, ['parent', 'outVariable']);
let cxxfiles = parseResult.nodes as CXXFile[];
//only render file which has clazz
let view = cxxfiles
Expand Down
Loading

0 comments on commit a05c57d

Please sign in to comment.