From c6cf96be5d0db85b2ba9ef3a145d54013abad38f Mon Sep 17 00:00:00 2001 From: Arthas Date: Thu, 9 Nov 2023 12:59:13 +0800 Subject: [PATCH 01/11] chore: upgrade iris to 4.2.6-build.1 (#733) * [AUTO] Update dependencies * chore: wip --------- Co-authored-by: LichKing-2234 --- .github/workflows/terra.yml | 2 +- android/build.gradle | 6 +++--- example/ios/Podfile | 2 +- package.json | 3 ++- react-native-agora.podspec | 4 ++-- scripts/bootstrap.cjs | 14 +++++--------- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/terra.yml b/.github/workflows/terra.yml index f1f982a8..c0ae6ce3 100644 --- a/.github/workflows/terra.yml +++ b/.github/workflows/terra.yml @@ -38,7 +38,7 @@ jobs: - name: Generate ts interface run: | - yarn + yarn build:ts-interface - name: Generate comments uses: ./.github/actions/doc diff --git a/android/build.gradle b/android/build.gradle index bb90a21f..546748a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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.2.3' - implementation 'io.agora.rtc:full-screen-sharing:4.2.3' - implementation 'io.agora.rtc:iris-rtc:4.2.3-build.4' + api 'io.agora.rtc:agora-full-preview:4.2.6-build.1' + implementation 'io.agora.rtc:full-screen-sharing-special:4.2.6-build.1' + implementation 'io.agora.rtc:iris-rtc:4.2.6-build.1' } if (isNewArchitectureEnabled()) { diff --git a/example/ios/Podfile b/example/ios/Podfile index f33faca4..5f4f5e2e 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do end target 'ScreenShare' do - pod 'AgoraRtcEngine_iOS', '4.2.3' + pod 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.1' end diff --git a/package.json b/package.json index fa85e558..8ff325f3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib", "prepare": "bob build", "release": "release-it", - "doc": "typedoc src --out ./docs --exclude \"example/**\"" + "doc": "typedoc src --out ./docs --exclude \"example/**\"", + "build:ts-interface": "ts-interface-builder src/*.ts -o src/ti/" }, "keywords": [ "react-native", diff --git a/react-native-agora.podspec b/react-native-agora.podspec index ab9f8e4d..b80bea88 100644 --- a/react-native-agora.podspec +++ b/react-native-agora.podspec @@ -40,8 +40,8 @@ Pod::Spec.new do |s| end end - s.dependency 'AgoraRtcEngine_iOS', '4.2.3' - s.dependency 'AgoraIrisRTC_iOS', '4.2.3-build.4' + s.dependency 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.1' + s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.1' s.libraries = 'stdc++' s.framework = 'ReplayKit' end diff --git a/scripts/bootstrap.cjs b/scripts/bootstrap.cjs index 15bef558..c0bc82be 100644 --- a/scripts/bootstrap.cjs +++ b/scripts/bootstrap.cjs @@ -35,15 +35,11 @@ module.exports = { } if ( - child_process.spawnSync( - 'yarn', - ['ts-interface-builder', 'src/*.ts', '-o', 'src/ti/'], - { - stdio: 'inherit', - encoding: 'utf-8', - shell: true, - } - ).status !== 0 + child_process.spawnSync('yarn', ['build:ts-interface'], { + stdio: 'inherit', + encoding: 'utf-8', + shell: true, + }).status !== 0 ) { throw new Error('Failed to run ts-interface-builder'); } From 3332fa8abe646cb6941e8f712e02c8e8e5a920cc Mon Sep 17 00:00:00 2001 From: sda-rob <149643938+sda-rob@users.noreply.github.com> Date: Thu, 9 Nov 2023 14:00:22 +0800 Subject: [PATCH 02/11] [AUTO] Update dependencies (#734) * [AUTO] Update dependencies * chore: wip * chore: wip * chore: wip * chore: wip --------- Co-authored-by: LichKing-2234 Co-authored-by: HUI --- .github/workflows/build.yml | 4 ++-- .github/workflows/ci.yml | 10 +++++----- .github/workflows/dep.yml | 28 +++++++++++++++++++++++++++- .github/workflows/doc.yml | 2 +- .github/workflows/gitleaks.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/terra.yml | 2 +- .github/workflows/typedoc.yml | 6 +++--- android/build.gradle | 6 +++--- example/ios/Podfile | 2 +- react-native-agora.podspec | 4 ++-- 11 files changed, 47 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4acb48c..e05c901c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: turbo_cache_hit: 0 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -87,7 +87,7 @@ jobs: turbo_cache_hit: 0 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 084766cb..e23c5b59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -54,7 +54,7 @@ jobs: runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -73,7 +73,7 @@ jobs: turbo_cache_hit: 0 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -154,7 +154,7 @@ jobs: turbo_cache_hit: 0 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup diff --git a/.github/workflows/dep.yml b/.github/workflows/dep.yml index aa18404e..9715f521 100644 --- a/.github/workflows/dep.yml +++ b/.github/workflows/dep.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup @@ -46,3 +46,29 @@ jobs: Dependencies content: ${{ steps.dep.outputs.matches }} + + update-pod: + runs-on: macos-latest + needs: update-dependencies + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }}-dep-update + token: ${{ secrets.GH_TOKEN }} + + - name: Setup + uses: ./.github/actions/setup + + - name: Update Podfile.lock + run: | + pod update + working-directory: example/ios + + - name: Commit changes + run: | + git config --global user.email "${{ secrets.GIT_EMAIL }}" + git config --global user.name "${{ secrets.GIT_USERNAME }}" + git add example + git commit -m "chore(example): update Podfile.lock by new dependencies" + git push diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index ff175641..ef148990 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml index dc9efd47..c231ecda 100644 --- a/.github/workflows/gitleaks.yml +++ b/.github/workflows/gitleaks.yml @@ -12,7 +12,7 @@ jobs: name: gitleaks runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: gitleaks/gitleaks-action@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e72eccf8..16422536 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/terra.yml b/.github/workflows/terra.yml index c0ae6ce3..010f42a1 100644 --- a/.github/workflows/terra.yml +++ b/.github/workflows/terra.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup diff --git a/.github/workflows/typedoc.yml b/.github/workflows/typedoc.yml index 758da62f..78f7fc19 100644 --- a/.github/workflows/typedoc.yml +++ b/.github/workflows/typedoc.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup uses: ./.github/actions/setup - name: Build TypeDoc @@ -49,10 +49,10 @@ jobs: asset_name: react-native-agora-docs.zip tag: ${{ github.ref_name }} - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v2 with: # Upload docs directory path: 'docs' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v2 diff --git a/android/build.gradle b/android/build.gradle index 546748a2..c3173ce3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -164,9 +164,9 @@ dependencies { //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:+" implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') - api 'io.agora.rtc:agora-full-preview:4.2.6-build.1' - implementation 'io.agora.rtc:full-screen-sharing-special:4.2.6-build.1' - implementation 'io.agora.rtc:iris-rtc:4.2.6-build.1' + api 'io.agora.rtc:agora-full-preview:4.2.6-build.2' + implementation 'io.agora.rtc:full-screen-sharing-special:4.2.6-build.2' + implementation 'io.agora.rtc:iris-rtc:4.2.6-build.2' } if (isNewArchitectureEnabled()) { diff --git a/example/ios/Podfile b/example/ios/Podfile index 5f4f5e2e..bf7c9396 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do end target 'ScreenShare' do - pod 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.1' + pod 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.2' end diff --git a/react-native-agora.podspec b/react-native-agora.podspec index b80bea88..9c4f41c4 100644 --- a/react-native-agora.podspec +++ b/react-native-agora.podspec @@ -40,8 +40,8 @@ Pod::Spec.new do |s| end end - s.dependency 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.1' - s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.1' + s.dependency 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.2' + s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.2' s.libraries = 'stdc++' s.framework = 'ReplayKit' end From 2b1c3b48a70cd76dacf78d817b07407cd692ec26 Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 9 Nov 2023 14:05:21 +0800 Subject: [PATCH 03/11] ci: add `if-no-files-found: error` --- .github/workflows/build.yml | 3 +++ .github/workflows/typedoc.yml | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e05c901c..b80b34d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,7 @@ jobs: name: AgoraRtcNgExample path: | example/android/app/build/outputs/apk/release/*.apk + if-no-files-found: error build-ios: if: ${{ contains(github.event.pull_request.labels.*.name, 'ci:dep-update') }} @@ -174,6 +175,7 @@ jobs: name: AgoraRtcNgExample path: | example/ios/*.ipa + if-no-files-found: error - name: Upload dSYM uses: actions/upload-artifact@v3 @@ -181,6 +183,7 @@ jobs: name: AgoraRtcNgExampleSymbol path: | example/ios/*.dSYM.zip + if-no-files-found: error notification: runs-on: ubuntu-latest diff --git a/.github/workflows/typedoc.yml b/.github/workflows/typedoc.yml index 78f7fc19..e98f57b5 100644 --- a/.github/workflows/typedoc.yml +++ b/.github/workflows/typedoc.yml @@ -29,18 +29,24 @@ jobs: steps: - name: Checkout 🛎️ uses: actions/checkout@v4 + - name: Setup uses: ./.github/actions/setup + - name: Build TypeDoc run: yarn doc + - name: Zip It Up 🤐 run: | zip -r react-native-agora-docs.zip docs + - name: Upload Artifact ⬆️ uses: actions/upload-artifact@v3 with: name: react-native-agora-docs.zip path: react-native-agora-docs.zip + if-no-files-found: error + - name: Upload Doc Archive to GitHub release ⬆️ if: github.event.release uses: svenstaro/upload-release-action@2.6.0 @@ -48,11 +54,13 @@ jobs: file: react-native-agora-docs.zip asset_name: react-native-agora-docs.zip tag: ${{ github.ref_name }} + - name: Upload artifact uses: actions/upload-pages-artifact@v2 with: # Upload docs directory path: 'docs' + - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v2 From 59090844174e6677ebf964613cf78271bd94922a Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 9 Nov 2023 14:49:33 +0800 Subject: [PATCH 04/11] chore: wip --- .github/actions/setup/action.yml | 7 +++++++ .github/workflows/build.yml | 5 ----- .github/workflows/ci.yml | 5 ----- .github/workflows/dep.yml | 10 ++++++++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index bedf7a15..1166d336 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,6 +9,13 @@ runs: with: node-version-file: .nvmrc + - name: Setup cocoapods + if: ${{ runner.os == 'macOS' }} + run: | + gem install cocoapods -v 1.13.0 + gem install activesupport -v 7.0.8 + shell: bash + - name: Cache dependencies id: yarn-cache uses: actions/cache@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b80b34d5..63e101d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,11 +93,6 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Setup cocoapods - run: | - gem install cocoapods -v 1.13.0 - gem install activesupport -v 7.0.8 - - name: Cache turborepo for iOS uses: actions/cache@v3 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e23c5b59..4d0cbf44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,11 +159,6 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Setup cocoapods - run: | - gem install cocoapods -v 1.13.0 - gem install activesupport -v 7.0.8 - - name: Cache turborepo for iOS uses: actions/cache@v3 with: diff --git a/.github/workflows/dep.yml b/.github/workflows/dep.yml index 9715f521..2b7e842d 100644 --- a/.github/workflows/dep.yml +++ b/.github/workflows/dep.yml @@ -60,6 +60,16 @@ jobs: - name: Setup uses: ./.github/actions/setup + - name: Cache cocoapods + id: cocoapods-cache + uses: actions/cache@v3 + with: + path: | + **/ios/Pods + key: ${{ runner.os }}-cocoapods-0-${{ hashFiles('example/ios/Podfile.lock') }} + restore-keys: | + ${{ runner.os }}-cocoapods-0- + - name: Update Podfile.lock run: | pod update From 795c569e2ec02563e22bc37f4a950e9d2d9a0567 Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 9 Nov 2023 15:21:13 +0800 Subject: [PATCH 05/11] chore: wip --- .github/actions/setup/action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1166d336..c4c3bbaf 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -11,10 +11,9 @@ runs: - name: Setup cocoapods if: ${{ runner.os == 'macOS' }} - run: | - gem install cocoapods -v 1.13.0 - gem install activesupport -v 7.0.8 - shell: bash + uses: maxim-lobanov/setup-cocoapods@v1 + with: + version: 1.13.0 - name: Cache dependencies id: yarn-cache From fc6a4443ae5fdbdaba5defda0ba7728cda54d7ad Mon Sep 17 00:00:00 2001 From: Arthas Date: Thu, 9 Nov 2023 17:37:49 +0800 Subject: [PATCH 06/11] chore(example): update Podfile.lock by new dependencies (#737) * chore(example): update Podfile.lock by new dependencies * chore: wip * chore: wip * chore: wip --------- Co-authored-by: sda_rob --- .github/actions/setup/action.yml | 8 ++- .github/workflows/build.yml | 4 ++ .../project.pbxproj | 6 --- example/ios/Podfile.lock | 50 ++++--------------- 4 files changed, 22 insertions(+), 46 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index c4c3bbaf..f31ad0c9 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,7 +9,13 @@ runs: with: node-version-file: .nvmrc - - name: Setup cocoapods + - name: Setup Ruby + if: ${{ runner.os == 'macOS' }} + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + - name: Setup Cocoapods if: ${{ runner.os == 'macOS' }} uses: maxim-lobanov/setup-cocoapods@v1 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63e101d2..57263fb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,6 +92,10 @@ jobs: - name: Setup uses: ./.github/actions/setup + + - name: Setup fastlane + run: | + brew install fastlane - name: Cache turborepo for iOS uses: actions/cache@v3 diff --git a/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj b/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj index b4d10046..3eacf931 100644 --- a/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj +++ b/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj @@ -774,10 +774,7 @@ ); OTHER_LDFLAGS = ( "$(inherited)", - "-Wl", - "-ld_classic", " ", - "-Wl -ld_classic ", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -850,10 +847,7 @@ ); OTHER_LDFLAGS = ( "$(inherited)", - "-Wl", - "-ld_classic", " ", - "-Wl -ld_classic ", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 3aa32ff7..5b6f4baf 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,34 +1,6 @@ PODS: - - AgoraIrisRTC_iOS (4.2.3-build.4) - - AgoraRtcEngine_iOS (4.2.3): - - AgoraRtcEngine_iOS/AIAEC (= 4.2.3) - - AgoraRtcEngine_iOS/AINS (= 4.2.3) - - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.3) - - AgoraRtcEngine_iOS/ClearVision (= 4.2.3) - - AgoraRtcEngine_iOS/ContentInspect (= 4.2.3) - - AgoraRtcEngine_iOS/DRM (= 4.2.3) - - AgoraRtcEngine_iOS/FaceDetection (= 4.2.3) - - AgoraRtcEngine_iOS/ReplayKit (= 4.2.3) - - AgoraRtcEngine_iOS/RtcBasic (= 4.2.3) - - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.3) - - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.3) - - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.3) - - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.3) - - AgoraRtcEngine_iOS/VQA (= 4.2.3) - - AgoraRtcEngine_iOS/AIAEC (4.2.3) - - AgoraRtcEngine_iOS/AINS (4.2.3) - - AgoraRtcEngine_iOS/AudioBeauty (4.2.3) - - AgoraRtcEngine_iOS/ClearVision (4.2.3) - - AgoraRtcEngine_iOS/ContentInspect (4.2.3) - - AgoraRtcEngine_iOS/DRM (4.2.3) - - AgoraRtcEngine_iOS/FaceDetection (4.2.3) - - AgoraRtcEngine_iOS/ReplayKit (4.2.3) - - AgoraRtcEngine_iOS/RtcBasic (4.2.3) - - AgoraRtcEngine_iOS/SpatialAudio (4.2.3) - - AgoraRtcEngine_iOS/VideoCodecDec (4.2.3) - - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.3) - - AgoraRtcEngine_iOS/VirtualBackground (4.2.3) - - AgoraRtcEngine_iOS/VQA (4.2.3) + - AgoraIrisRTC_iOS (4.2.6-build.2) + - AgoraRtcEngine_iOS_Preview (4.2.6-build.2) - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) @@ -405,9 +377,9 @@ PODS: - React-jsinspector (0.72.5) - React-logger (0.72.5): - glog - - react-native-agora (4.2.4): - - AgoraIrisRTC_iOS (= 4.2.3-build.4) - - AgoraRtcEngine_iOS (= 4.2.3) + - react-native-agora (4.2.5): + - AgoraIrisRTC_iOS (= 4.2.6-build.2) + - AgoraRtcEngine_iOS_Preview (= 4.2.6-build.2) - RCT-Folly (= 2021.07.22.00) - React-Core - react-native-agora-rawdata (0.1.0): @@ -547,7 +519,7 @@ PODS: - Yoga (~> 1.14) DEPENDENCIES: - - AgoraRtcEngine_iOS (= 4.2.3) + - AgoraRtcEngine_iOS_Preview (= 4.2.6-build.2) - 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`) @@ -626,7 +598,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - AgoraIrisRTC_iOS - - AgoraRtcEngine_iOS + - AgoraRtcEngine_iOS_Preview - CocoaAsyncSocket - Flipper - Flipper-Boost-iOSX @@ -746,8 +718,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - AgoraIrisRTC_iOS: 84ae4f5824d68480d1215cbdd8db261549a7c94e - AgoraRtcEngine_iOS: eb0a7e87dbc9e818b267d413b48f76a57959e6f4 + AgoraIrisRTC_iOS: a8cc748795e95e2c81580f7a8917f549b46141a5 + AgoraRtcEngine_iOS_Preview: 8332758c6efacb8e7706d2c6b5a4cc3d8cfd979c boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 @@ -781,7 +753,7 @@ SPEC CHECKSUMS: React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 - react-native-agora: 38f534bb58937768025bd7055d8e296785db920f + react-native-agora: d8d93a4dc7c2b94ed1f460412d47f89840ca8a68 react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31 react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284 @@ -813,6 +785,6 @@ SPEC CHECKSUMS: Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 3933d6cb9d233a740943b1ee0fa22084b6fdc7e0 +PODFILE CHECKSUM: 2ffb834fb4eb80edba1c276048c00a7cb9b91d52 COCOAPODS: 1.13.0 From 6b31bbf7315e8950e8807a06de1a3da396555424 Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 16 Nov 2023 20:19:07 +0800 Subject: [PATCH 07/11] chore: wip --- .github/actions/setup/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index f31ad0c9..124a13d6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -20,6 +20,11 @@ runs: uses: maxim-lobanov/setup-cocoapods@v1 with: version: 1.13.0 + + - name: Setup activesupport + run: + gem install activesupport -v 7.0.8 + shell: bash - name: Cache dependencies id: yarn-cache From 594b349ed6af0055ad156aca92d12467a4a45d6d Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 16 Nov 2023 20:20:55 +0800 Subject: [PATCH 08/11] chore: wip --- .github/actions/setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 124a13d6..64e2b258 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -22,6 +22,7 @@ runs: version: 1.13.0 - name: Setup activesupport + if: ${{ runner.os == 'macOS' }} run: gem install activesupport -v 7.0.8 shell: bash From 34a6d32670f4beabd59727ff52eceae1f1e2bfa6 Mon Sep 17 00:00:00 2001 From: HUI Date: Thu, 16 Nov 2023 20:44:03 +0800 Subject: [PATCH 09/11] chore: wip --- .github/actions/setup/action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 64e2b258..c2807bef 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -15,18 +15,18 @@ runs: with: bundler-cache: true - - name: Setup Cocoapods - if: ${{ runner.os == 'macOS' }} - uses: maxim-lobanov/setup-cocoapods@v1 - with: - version: 1.13.0 - - name: Setup activesupport if: ${{ runner.os == 'macOS' }} run: gem install activesupport -v 7.0.8 shell: bash + - name: Setup Cocoapods + if: ${{ runner.os == 'macOS' }} + uses: maxim-lobanov/setup-cocoapods@v1 + with: + version: 1.13.0 + - name: Cache dependencies id: yarn-cache uses: actions/cache@v3 From 940ceebb4fdcc3d24d31181fb6646261441f2534 Mon Sep 17 00:00:00 2001 From: sda-rob <149643938+sda-rob@users.noreply.github.com> Date: Thu, 16 Nov 2023 21:20:41 +0800 Subject: [PATCH 10/11] [AUTO] Update dependencies (#740) * [AUTO] Update dependencies * chore(example): update Podfile.lock by new dependencies --------- Co-authored-by: LichKing-2234 --- android/build.gradle | 6 ++--- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 48 ++++++++++++++++++++++++++++++-------- react-native-agora.podspec | 4 ++-- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c3173ce3..0f1daee8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -164,9 +164,9 @@ dependencies { //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:+" implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') - api 'io.agora.rtc:agora-full-preview:4.2.6-build.2' - implementation 'io.agora.rtc:full-screen-sharing-special:4.2.6-build.2' - implementation 'io.agora.rtc:iris-rtc:4.2.6-build.2' + api 'io.agora.rtc:full-sdk:4.2.6' + implementation 'io.agora.rtc:full-screen-sharing:4.2.6' + implementation 'io.agora.rtc:iris-rtc:4.2.6-build.3' } if (isNewArchitectureEnabled()) { diff --git a/example/ios/Podfile b/example/ios/Podfile index bf7c9396..c2e47ea1 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do end target 'ScreenShare' do - pod 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.2' + pod 'AgoraRtcEngine_iOS', '4.2.6' end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 5b6f4baf..aa5de4d4 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,6 +1,34 @@ PODS: - - AgoraIrisRTC_iOS (4.2.6-build.2) - - AgoraRtcEngine_iOS_Preview (4.2.6-build.2) + - AgoraIrisRTC_iOS (4.2.6-build.3) + - AgoraRtcEngine_iOS (4.2.6): + - AgoraRtcEngine_iOS/AIAEC (= 4.2.6) + - AgoraRtcEngine_iOS/AINS (= 4.2.6) + - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.6) + - AgoraRtcEngine_iOS/ClearVision (= 4.2.6) + - AgoraRtcEngine_iOS/ContentInspect (= 4.2.6) + - AgoraRtcEngine_iOS/DRM (= 4.2.6) + - AgoraRtcEngine_iOS/FaceDetection (= 4.2.6) + - AgoraRtcEngine_iOS/ReplayKit (= 4.2.6) + - AgoraRtcEngine_iOS/RtcBasic (= 4.2.6) + - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.6) + - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.6) + - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.6) + - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.6) + - AgoraRtcEngine_iOS/VQA (= 4.2.6) + - AgoraRtcEngine_iOS/AIAEC (4.2.6) + - AgoraRtcEngine_iOS/AINS (4.2.6) + - AgoraRtcEngine_iOS/AudioBeauty (4.2.6) + - AgoraRtcEngine_iOS/ClearVision (4.2.6) + - AgoraRtcEngine_iOS/ContentInspect (4.2.6) + - AgoraRtcEngine_iOS/DRM (4.2.6) + - AgoraRtcEngine_iOS/FaceDetection (4.2.6) + - AgoraRtcEngine_iOS/ReplayKit (4.2.6) + - AgoraRtcEngine_iOS/RtcBasic (4.2.6) + - AgoraRtcEngine_iOS/SpatialAudio (4.2.6) + - AgoraRtcEngine_iOS/VideoCodecDec (4.2.6) + - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.6) + - AgoraRtcEngine_iOS/VirtualBackground (4.2.6) + - AgoraRtcEngine_iOS/VQA (4.2.6) - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) @@ -378,8 +406,8 @@ PODS: - React-logger (0.72.5): - glog - react-native-agora (4.2.5): - - AgoraIrisRTC_iOS (= 4.2.6-build.2) - - AgoraRtcEngine_iOS_Preview (= 4.2.6-build.2) + - AgoraIrisRTC_iOS (= 4.2.6-build.3) + - AgoraRtcEngine_iOS (= 4.2.6) - RCT-Folly (= 2021.07.22.00) - React-Core - react-native-agora-rawdata (0.1.0): @@ -519,7 +547,7 @@ PODS: - Yoga (~> 1.14) DEPENDENCIES: - - AgoraRtcEngine_iOS_Preview (= 4.2.6-build.2) + - AgoraRtcEngine_iOS (= 4.2.6) - 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`) @@ -598,7 +626,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - AgoraIrisRTC_iOS - - AgoraRtcEngine_iOS_Preview + - AgoraRtcEngine_iOS - CocoaAsyncSocket - Flipper - Flipper-Boost-iOSX @@ -718,8 +746,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - AgoraIrisRTC_iOS: a8cc748795e95e2c81580f7a8917f549b46141a5 - AgoraRtcEngine_iOS_Preview: 8332758c6efacb8e7706d2c6b5a4cc3d8cfd979c + AgoraIrisRTC_iOS: 8346499b82968a4967e3d0bec2cf14bf7c0c3f76 + AgoraRtcEngine_iOS: ac647332ad8f86d79cf810601c9e62b28c3a4de0 boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 @@ -753,7 +781,7 @@ SPEC CHECKSUMS: React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 - react-native-agora: d8d93a4dc7c2b94ed1f460412d47f89840ca8a68 + react-native-agora: 70e2396eb53445d650af92ca2a5de5173f26f33b react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31 react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284 @@ -785,6 +813,6 @@ SPEC CHECKSUMS: Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 2ffb834fb4eb80edba1c276048c00a7cb9b91d52 +PODFILE CHECKSUM: 6d0fe7dc02969298cf6c0c7f0d7e078bc429a2f1 COCOAPODS: 1.13.0 diff --git a/react-native-agora.podspec b/react-native-agora.podspec index 9c4f41c4..1749d872 100644 --- a/react-native-agora.podspec +++ b/react-native-agora.podspec @@ -40,8 +40,8 @@ Pod::Spec.new do |s| end end - s.dependency 'AgoraRtcEngine_iOS_Preview', '4.2.6-build.2' - s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.2' + s.dependency 'AgoraRtcEngine_iOS', '4.2.6' + s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.3' s.libraries = 'stdc++' s.framework = 'ReplayKit' end From 0ec805fdb44fb1e095aa51610870a3b82a268d69 Mon Sep 17 00:00:00 2001 From: HUI Date: Fri, 17 Nov 2023 13:59:46 +0800 Subject: [PATCH 11/11] chore: wip --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57263fb0..8241893b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,4 +189,4 @@ jobs: needs: [ build-android, build-ios ] steps: - run: | - curl -X POST "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${{ secrets.WECHAT_KEY }}" -d '{"msgtype":"text","text":{"content":"ReactNative:\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}}' + curl -X POST "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${{ secrets.WECHAT_KEY }}" -d '{"msgtype":"text","text":{"content":"ReactNative Example:\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\nDownload Link:\nhttps://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}"}}'