fix: pin kotlin to 1.9.10 and do not test on macos-12 anymore (#2134)

Co-authored-by: gxz <[email protected]>
AgoraIO-Extensions · Dec 24, 2024 · 49ddf90 · 49ddf90
1 parent 3e934fa
commit 49ddf90
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,7 +116,7 @@ jobs:
     strategy:
       matrix:
         version: ["3.7.0", "3.16"]
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}
@@ -128,16 +128,16 @@ jobs:
           cache: true
       - uses: futureware-tech/simulator-action@v1
         with:
-          model: 'iPhone 13 Pro Max'
+          model: 'iPhone 15'
       - run: bash ci/run_flutter_integration_test_ios.sh
 
   integration_test_macos:
     name: Run Flutter macOS Integration Tests
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ["3.7.0", "3.x"]
-    runs-on: macos-12
+        version: ["3.7.0"]
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}
@@ -241,8 +241,8 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
-        version: ["3.7.0", "3.x"]
-    runs-on: macos-12
+        version: ["3.7.0"]
+    runs-on: macos-latest
     timeout-minutes: 120
     steps:
       - uses: actions/checkout@v3
@@ -391,12 +391,9 @@ jobs:
             --apple-package-name=io.agora.agoraRtcEngineExample \
             --flutter-package-name=agora_rtc_engine \
             --iris-ios-cdn-url=${IRIS_CDN_URL_IOS}
-      - name: Create ios simulator
-        run: |
-          xcrun simctl list
-          # We generate the screenshots base on the simulator "iPhone 13 Pro Max", so we set the SimDeviceType to iPhone 13 Pro Max.
-          # If you need to change the SimDeviceType, you may need to re-generate the screenshots first.
-          xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-13-Pro-Max com.apple.CoreSimulator.SimRuntime.iOS-16-4 | xargs xcrun simctl boot
+      - uses: futureware-tech/simulator-action@v3
+        with:
+          model: 'iPhone 15'
       - run: bash ci/rendering_test_ios.sh
 
   rendering_test_macos:
@@ -405,7 +402,7 @@ jobs:
     strategy:
       matrix:
         version: ['3.x']
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}

diff --git a/.github/workflows/integration-test-iris-artifacts.yml b/.github/workflows/integration-test-iris-artifacts.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         version: ['2.10.5', '3.0.0']
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}
@@ -75,7 +75,7 @@ jobs:
     strategy:
       matrix:
         version: ['2.10.5', '3.0.0']
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}
@@ -85,9 +85,9 @@ jobs:
         with:
           flutter-version: ${{ matrix.version }}
           cache: true
-      - uses: futureware-tech/simulator-action@v1
+      - uses: futureware-tech/simulator-action@v3
         with:
-          model: 'iPhone 13 Pro Max'
+          model: 'iPhone 15'
       - name: Checkout hoe
         uses: actions/checkout@v3
         with:
@@ -119,7 +119,7 @@ jobs:
     strategy:
       matrix:
         version: ['2.10.5', '3.0.0']
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 120
     env:
       TEST_APP_ID: ${{ secrets.MY_APP_ID }}

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

diff --git a/test_shard/fake_test_app/android/build.gradle b/test_shard/fake_test_app/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

diff --git a/test_shard/integration_test_app/android/build.gradle b/test_shard/integration_test_app/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

diff --git a/test_shard/iris_tester/android/build.gradle b/test_shard/iris_tester/android/build.gradle
@@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
 
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

diff --git a/test_shard/iris_tester/example/android/build.gradle b/test_shard/iris_tester/example/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

diff --git a/test_shard/rendering_test/android/build.gradle b/test_shard/rendering_test/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // Min kotlin version for Flutter SDK 3.24
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()