feat: upgrade native sdk 6.1.1-sp.41121.b.3 (#1456)

Update native sdk 6.1.1-sp.41121.b.3 dependencies > This pull request is trigger by bot, you can checkout this branch and update it. --------- Co-authored-by: littleGnAl <[email protected]> Co-authored-by: HUI <[email protected]>
AgoraIO-Extensions · Dec 1, 2023 · 8d44eae · 8d44eae
1 parent 427dfa6
commit 8d44eae
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -47,7 +47,7 @@ dependencies {
   if (isDev(project)) {
     implementation fileTree(dir: "libs", include: ["*.jar"])
   } else {
-    api 'io.agora.rtc:iris-rtc:4.1.1.21-banban.1'
+    api 'io.agora.rtc:iris-rtc:4.1.1.21-banban.6'
     api 'io.agora.rtc:agora-special-full:4.1.1.21'
     api 'io.agora.rtc:full-screen-sharing:4.1.1.21'
   }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/lib/examples/advanced/index.dart b/example/lib/examples/advanced/index.dart
@@ -76,7 +76,7 @@ final advanced = [
     },
   // TODO(littlegnal): Not supported for this special version
   // {'name': 'ProcessVideoRawData', 'widget': const ProcessVideoRawData()},
-  // {'name': 'ProcessAudioRawData', 'widget': const ProcessAudioRawData()},
+  {'name': 'ProcessAudioRawData', 'widget': const ProcessAudioRawData()},
   {'name': 'AudioSpectrum', 'widget': const AudioSpectrum()},
   {'name': 'MediaRecorder', 'widget': const MediaRecorder()},
   {'name': 'PushVideoFrame', 'widget': const PushVideoFrame()},

diff --git a/ios/agora_rtc_engine.podspec b/ios/agora_rtc_engine.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*.{h,mm,m,swift}'
   s.dependency 'Flutter'
-  s.dependency 'AgoraIrisRTC_iOS', '4.1.1.21-banban.1'
+  s.dependency 'AgoraIrisRTC_iOS', '4.1.1.21-banban.6'
   s.dependency 'AgoraRtcEngine_Special_iOS', '4.1.1.21'
   # s.dependency 'AgoraRtcWrapper'
   s.platform = :ios, '9.0'

diff --git a/macos/agora_rtc_engine.podspec b/macos/agora_rtc_engine.podspec
@@ -17,7 +17,7 @@ A new flutter plugin project.
   s.dependency 'FlutterMacOS'
   #   s.dependency 'AgoraRtcWrapper'
   s.dependency 'AgoraRtcEngine_macOS', '4.1.0'
-  s.dependency 'AgoraIrisRTC_macOS', '4.1.1.21-banban.1'
+  s.dependency 'AgoraIrisRTC_macOS', '4.1.1.21-banban.6'
 
   s.platform = :osx, '10.11'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: agora_rtc_engine
 description: >-
   Flutter plugin of Agora RTC SDK, allow you to simply integrate Agora Video
   Calling or Live Video Streaming to your app with just a few lines of code.
-version: 6.1.1-sp.41121.b.2
+version: 6.1.1-sp.41121.b.3
 homepage: https://www.agora.io
 repository: https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/tree/main
 environment:

diff --git a/scripts/artifacts_version.sh b/scripts/artifacts_version.sh
@@ -1,6 +1,6 @@
 set -e
 
-export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.1_DCG_Android_Video_20231114_0339.zip"
-export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.1_DCG_iOS_Video_20231114_0339.zip"
-export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.1_DCG_Mac_Video_20231114_0339.zip"
-export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.1_DCG_Windows_Video_20231114_0339.zip"
+export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.6_DCG_Android_Video_20231201_1205.zip"
+export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.6_DCG_iOS_Video_20231201_1205.zip"
+export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.6_DCG_Mac_Video_20231201_1205.zip"
+export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.1.1.21-banban.6_DCG_Windows_Video_20231201_1205.zip"
diff --git a/scripts/build-iris-android.sh b/scripts/build-iris-android.sh
@@ -11,28 +11,32 @@ IRIS_TYPE="dcg"
 NATIVE_SDK_PATH_NAME=$3 # Agora_Native_SDK_for_Mac_rel.v3.8.201.2_39877_full_20220608_2158
 SCRIPTS_PATH=$(dirname "$0")
 
-bash $SCRIPTS_PATH/build-android-arch.sh $IRIS_PROJECT_PATH ALL $BUILD_TYPE
+bash $IRIS_PROJECT_PATH/ci/build-android.sh buildALL $BUILD_TYPE
+
+    # build/android/DCG/ALL_ARCHITECTURE/output/Debug
+
+IRIS_OUTPUT=${IRIS_PROJECT_PATH}/build/android/$IRIS_TYPE/ALL_ARCHITECTURE/output/$BUILD_TYPE
 
 for ABI in ${ABIS};
 do
     echo "Copying $IRIS_PROJECT_PATH/build/android/$ABI/output/$IRIS_TYPE/$BUILD_TYPE/libAgoraRtcWrapper.so to $AGORA_FLUTTER_PROJECT_PATH/android/libs/$ABI/libAgoraRtcWrapper.so"
     # bash $IRIS_PROJECT_PATH/$IRIS_TYPE/ci/build-android.sh build $ABI $BUILD_TYPE
     mkdir -p "$AGORA_FLUTTER_PROJECT_PATH/android/libs/$ABI/"
-     
-    cp -RP "$IRIS_PROJECT_PATH/build/android/ALL_ARCHITECTURE/output/$IRIS_TYPE/$BUILD_TYPE/$ABI/libAgoraRtcWrapper.so" \
+
+    cp -RP "${IRIS_OUTPUT}/$ABI/libAgoraRtcWrapper.so" \
           "$AGORA_FLUTTER_PROJECT_PATH/android/libs/$ABI/libAgoraRtcWrapper.so" 
 
     if [ -f "${IRIS_PROJECT_PATH}/build/android/ALL_ARCHITECTURE/output/${IRIS_TYPE}/${BUILD_TYPE}/${ABI}/libIrisDebugger.so" ]; then
         mkdir -p ${AGORA_FLUTTER_PROJECT_PATH}/test_shard/iris_tester/android/libs/${ABI}
-        cp -RP "${IRIS_PROJECT_PATH}/build/android/ALL_ARCHITECTURE/output/${IRIS_TYPE}/${BUILD_TYPE}/${ABI}/libIrisDebugger.so" "${AGORA_FLUTTER_PROJECT_PATH}/test_shard/iris_tester/android/libs/${ABI}/libIrisDebugger.so"
+        cp -RP "${IRIS_OUTPUT}/$ABI/libIrisDebugger.so" "${AGORA_FLUTTER_PROJECT_PATH}/test_shard/iris_tester/android/libs/${ABI}/libIrisDebugger.so"
     fi
 done;
 
 # echo "Copying $IRIS_PROJECT_PATH/build/android/ALL_ARCHITECTURE/output/$IRIS_TYPE/$BUILD_TYPE/AgoraRtcWrapper.aar to $AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.aar"
 # cp -r "$IRIS_PROJECT_PATH/build/android/ALL_ARCHITECTURE/output/$IRIS_TYPE/$BUILD_TYPE/AgoraRtcWrapper.aar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.aar"
 
-echo "Copying $IRIS_PROJECT_PATH/build/android/ALL_ARCHITECTURE/output/$IRIS_TYPE/$BUILD_TYPE/AgoraRtcWrapper.jar to $AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.jar"
-cp -r "$IRIS_PROJECT_PATH/build/android/ALL_ARCHITECTURE/output/$IRIS_TYPE/$BUILD_TYPE/AgoraRtcWrapper.jar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.jar"
+echo "Copying ${IRIS_OUTPUT}/AgoraRtcWrapper.jar to $AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.jar"
+cp -r "${IRIS_OUTPUT}/AgoraRtcWrapper.jar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraRtcWrapper.jar"
 
 for ABI in ${ABIS};
 do
@@ -50,4 +54,4 @@ echo "Copying $IRIS_PROJECT_PATH/third_party/agora/$IRIS_TYPE/libs/$NATIVE_SDK_P
 cp -r "$IRIS_PROJECT_PATH/third_party/agora/$IRIS_TYPE/libs/$NATIVE_SDK_PATH_NAME/rtc/sdk/agora-rtc-sdk.jar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/agora-rtc-sdk.jar"
 
 # /Users/fenglang/codes/aw/iris/third_party/agora/dcg/libs/Agora_Native_SDK_for_Android_FULL/rtc/sdk/AgoraScreenShareExtension.aar
-cp -r "$IRIS_PROJECT_PATH/third_party/agora/$IRIS_TYPE/libs/$NATIVE_SDK_PATH_NAME/rtc/sdk/AgoraScreenShareExtension.aar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraScreenShareExtension.aar"
+cp -r "$IRIS_PROJECT_PATH/third_party/agora/$IRIS_TYPE/libs/$NATIVE_SDK_PATH_NAME/rtc/sdk/AgoraScreenShareExtension.aar" "$AGORA_FLUTTER_PROJECT_PATH/android/libs/AgoraScreenShareExtension.aar"
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
@@ -12,8 +12,8 @@ project(${PROJECT_NAME} LANGUAGES CXX)
 # not be changed
 set(PLUGIN_NAME "agora_rtc_engine_plugin")
 
-set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.1.1.21-banban.1_DCG_Windows_Video_20231114_0339.zip")
-set(IRIS_SDK_DOWNLOAD_NAME "iris_4.1.1.21-banban.1_DCG_Windows")
+set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.1.1.21-banban.6_DCG_Windows_Video_20231201_1205.zip")
+set(IRIS_SDK_DOWNLOAD_NAME "iris_4.1.1.21-banban.6_DCG_Windows")
 set(RTC_SDK_DOWNLOAD_NAME "Agora_Native_SDK_for_Windows_FULL")
 set(IRIS_SDK_VERSION "v3_6_2_fix.1")