From e8e78383b36c5141379498efc472d47139cd7ccd Mon Sep 17 00:00:00 2001 From: Arthas Date: Thu, 9 Nov 2023 17:37:49 +0800 Subject: [PATCH] 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 c4c3bbaf9..f31ad0c93 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 63e101d2f..57263fb0a 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 b4d10046b..3eacf931b 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 3aa32ff79..5b6f4baf4 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