feat: support native 4.2.6 (#735)

* chore: upgrade iris to 4.2.6-build.1 (#733) * [AUTO] Update dependencies * chore: wip --------- Co-authored-by: LichKing-2234 <LichKing-2234@users.noreply.github.com> * [AUTO] Update dependencies (#734) * [AUTO] Update dependencies * chore: wip * chore: wip * chore: wip * chore: wip --------- Co-authored-by: LichKing-2234 <LichKing-2234@users.noreply.github.com> Co-authored-by: HUI <luxuhui@agora.io> * ci: add `if-no-files-found: error` * chore: wip * chore: wip * 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 <sda_rob@agora.io> * chore: wip * chore: wip * chore: wip * [AUTO] Update dependencies (#740) * [AUTO] Update dependencies * chore(example): update Podfile.lock by new dependencies --------- Co-authored-by: LichKing-2234 <LichKing-2234@users.noreply.github.com> * chore: wip --------- Co-authored-by: LichKing-2234 <LichKing-2234@users.noreply.github.com> Co-authored-by: sda-rob <149643938+sda-rob@users.noreply.github.com> Co-authored-by: sda_rob <sda_rob@agora.io>
AgoraIO-Extensions · Nov 21, 2023 · 40634a2 · 40634a2
1 parent 0c5f0d0
commit 40634a2
Show file tree

Hide file tree

Showing 16 changed files with 136 additions and 86 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -9,6 +9,24 @@ runs:
       with:
         node-version-file: .nvmrc
 
+    - name: Setup Ruby
+      if: ${{ runner.os == 'macOS' }}
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+
+    - 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

diff --git 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
@@ -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') }}
@@ -87,15 +88,14 @@ jobs:
       turbo_cache_hit: 0
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup
         uses: ./.github/actions/setup
-
-      - name: Setup cocoapods
+      
+      - name: Setup fastlane
         run: |
-          gem install cocoapods -v 1.13.0
-          gem install activesupport -v 7.0.8
+          brew install fastlane
 
       - name: Cache turborepo for iOS
         uses: actions/cache@v3
@@ -174,17 +174,19 @@ jobs:
           name: AgoraRtcNgExample
           path: |
             example/ios/*.ipa
+          if-no-files-found: error
 
       - name: Upload dSYM
         uses: actions/upload-artifact@v3
         with:
           name: AgoraRtcNgExampleSymbol
           path: |
             example/ios/*.dSYM.zip
+          if-no-files-found: error
 
   notification:
     runs-on: ubuntu-latest
     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 }}"}}'
diff --git 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,16 +154,11 @@ jobs:
       turbo_cache_hit: 0
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - 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
@@ -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,39 @@ 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: 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
+        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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.github/workflows/typedoc.yml b/.github/workflows/typedoc.yml
@@ -28,31 +28,39 @@ 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
         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
         with:
           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@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
@@ -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: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/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 b/example/ios/Podfile
@@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do
 end
 
 target 'ScreenShare' do
-  pod 'AgoraRtcEngine_iOS', '4.2.3'
+  pod 'AgoraRtcEngine_iOS', '4.2.6'
 end