Merge branch 'main' into dev/atlas

AgoraIO-Extensions · Jan 22, 2025 · 9aa9434 · 9aa9434
2 parents c7a9d6a + 4afc2ba
commit 9aa9434
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -86,7 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7.0"]
+        version: ["3.7.0", "3.24.5"]
     runs-on: ubuntu-latest
     timeout-minutes: 120
     env:
@@ -211,7 +211,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7.0"]
+        version: ["3.7.0", "3.24.5"]
     runs-on: windows-2019
     timeout-minutes: 120
     env:
@@ -243,7 +243,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
@@ -266,7 +266,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7.12"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
+        version: ["3.7.12", "3.24.5"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -289,7 +289,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7.12"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
+        version: ["3.7.12", "3.24.5"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3
@@ -333,7 +333,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: macos-13
     timeout-minutes: 120
     steps:
@@ -359,7 +359,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7.0"]
+        version: ["3.7.0", "3.24.5"]
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
@@ -389,7 +389,7 @@ jobs:
           java-version: '17'
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.x'
+          flutter-version: "3.24.5"
           cache: true
       - name: Checkout hoe
         uses: actions/checkout@v3
@@ -443,7 +443,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ["3.x"]
+        version: ["3.24.5"]
     runs-on: macos-13 # Rendering test on ios simulator need macos 13+
     timeout-minutes: 60
     env:
@@ -491,7 +491,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: macos-latest
     timeout-minutes: 120
     env:
@@ -546,7 +546,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: windows-2019
     timeout-minutes: 120
     env:
@@ -600,7 +600,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
@@ -630,7 +630,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ['3.x']
+        version: ["3.24.5"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/example/lib/examples/advanced/media_recorder/media_recorder.dart b/example/lib/examples/advanced/media_recorder/media_recorder.dart
@@ -120,9 +120,9 @@ class _State extends State<MediaRecorderExample> {
 
     await _mediaRecorder?.setMediaRecorderObserver(MediaRecorderObserver(
       onRecorderStateChanged: (String channelId, int uid, RecorderState state,
-          RecorderReasonCode error) {
+          RecorderReasonCode reason) {
         logSink.log(
-            'onRecorderStateChanged channelId: $channelId, uid: $uid state: $state, error: $error');
+            'onRecorderStateChanged channelId: $channelId, uid: $uid state: $state, error: $reason');
       },
       onRecorderInfoUpdated: (String channelId, int uid, RecorderInfo info) {
         logSink.log(

diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
@@ -75,6 +75,8 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
   flutter_wrapper_plugin
   ${IRIS_SDK_BIN_PATH}/AgoraRtcWrapper.lib)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4819")
+
 set(BUNDLED_LIBRARIES
   "${IRIS_SDK_BIN_PATH}/AgoraRtcWrapper.dll"
   )