feat: support native 4.2.6.3

AgoraIO-Extensions · Mar 11, 2024 · f0639e4 · f0639e4
1 parent 1f48ebc
commit f0639e4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 47 deletions.
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.6'
-  implementation 'io.agora.rtc:full-screen-sharing:4.2.6'
-  implementation 'io.agora.rtc:iris-rtc:4.2.6-build.3'
+  implementation 'io.agora.rtc:agora-special-full:4.2.6.3'
+  implementation 'io.agora.rtc:full-screen-sharing:4.2.6.3'
+  implementation 'io.agora.rtc:iris-rtc:4.2.6.3-build.1'
 }
 
 if (isNewArchitectureEnabled()) {

diff --git a/ci/config/terra_config.yaml b/ci/config/terra_config.yaml
@@ -1,4 +1,4 @@
-include: shared:rtc_4.2.3/shared_configs.yaml
+include: shared:rtc_4.2.6.3/shared_configs.yaml
 
 language: ts
 

diff --git a/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj b/example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj
@@ -775,6 +775,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -848,6 +849,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-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.6'
+  pod 'AgoraRtcEngine_Special_iOS', '4.2.6.3'
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,34 +1,6 @@
 PODS:
-  - 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)
+  - AgoraIrisRTC_iOS (4.2.6.3-build.1)
+  - AgoraRtcEngine_Special_iOS (4.2.6.3)
   - 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.5):
-    - AgoraIrisRTC_iOS (= 4.2.6-build.3)
-    - AgoraRtcEngine_iOS (= 4.2.6)
+  - react-native-agora (4.2.6):
+    - AgoraIrisRTC_iOS (= 4.2.6.3-build.1)
+    - AgoraRtcEngine_Special_iOS (= 4.2.6.3)
     - 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.6)
+  - AgoraRtcEngine_Special_iOS (= 4.2.6.3)
   - 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_Special_iOS
     - CocoaAsyncSocket
     - Flipper
     - Flipper-Boost-iOSX
@@ -746,9 +718,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AgoraIrisRTC_iOS: 8346499b82968a4967e3d0bec2cf14bf7c0c3f76
-  AgoraRtcEngine_iOS: ac647332ad8f86d79cf810601c9e62b28c3a4de0
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  AgoraIrisRTC_iOS: ee4eab41999febb67bc21539741b95d9577725a9
+  AgoraRtcEngine_Special_iOS: 3b515beaee084fc27a8cac8415fc346d609af269
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7
@@ -781,7 +753,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
-  react-native-agora: 70e2396eb53445d650af92ca2a5de5173f26f33b
+  react-native-agora: 9f015b041fbaf567f6f4fd08d8e044483fabdac7
   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: 6d0fe7dc02969298cf6c0c7f0d7e078bc429a2f1
+PODFILE CHECKSUM: 9f4320733c8ae86db92f023832be783d9a48cda0
 
 COCOAPODS: 1.13.0
diff --git 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.6'
-  s.dependency 'AgoraIrisRTC_iOS', '4.2.6-build.3'
+  s.dependency 'AgoraRtcEngine_Special_iOS', '4.2.6.3'
+  s.dependency 'AgoraIrisRTC_iOS', '4.2.6.3-build.1'
   s.libraries = 'stdc++'
   s.framework = 'ReplayKit'
 end