ci: upgrade android orb, node orbe android image (#454)

* ci: upgrade android orb, node orb and android_image versions

* ci: apply Circle Ci recommendations

* ci: fix missing tag circle ci error

* ci: fix image android:2024.01.1-ndk is not a valid resource class
 error

* Updated config.yml

* ci: add default to android tag


* ci: remove [ additional-avd-args: -d "pixel_4"]

* ci: upgrade [android system-image from android-30 to android-33 ]

* ci: upgrade [system image to x86_64]

* ci: upgrade [system image to x86_64]

* chore(CI): using x86 android  emulator system image

* chore(CI): using x86 android  emulator system image

* chore (CI): change system-image to [system-images;android-29;default;x86]

* chore (CI): add install avd command

* chore (CI): hash non related jobs

* chore (CI): rename emulator

* ci: remove espresso test cases


---------

Co-authored-by: Ahmed alaa <[email protected]>

Author: AndrewAminInstabug

.circleci/config.yml

@@ -1,9 +1,10 @@
 version: 2.1
 
 orbs:
-  android: circleci/[email protected]
+  android: circleci/android@2.5.0
   flutter: circleci/[email protected]
-  node: circleci/[email protected]
+  node: circleci/[email protected]
+  advanced-checkout: vsco/[email protected]
 
 commands:
   setup_flutter:
@@ -103,13 +104,12 @@ commands:
                 name: Build Pigeons
                 command: dart run build_runner build --delete-conflicting-outputs
 
-
 jobs:
   danger:
     executor:
       name: node/default
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - node/install-packages:
           pkg-manager: yarn
           override-ci-command: yarn install --frozen-lockfile --network-concurrency 1
@@ -126,7 +126,7 @@ jobs:
     docker:
       - image: cirrusci/flutter:<<parameters.version>>
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - install_flutter_and_dart_packages:
           generate_pigeons: true
       - run: flutter test --coverage
@@ -142,16 +142,10 @@ jobs:
     executor:
       name: android/android-machine
       resource-class: xlarge
-      tag: 2022.04.1
+      tag: default
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - setup_flutter
-      - android/start-emulator-and-run-tests:
-          system-image: system-images;android-30;google_apis;x86
-          additional-avd-args: -d "Nexus 5"
-          post-emulator-launch-assemble-command: cd example && flutter build apk
-          run-tests-working-directory: example/android
-          test-command: ./gradlew app:connectedAndroidTest -Ptarget=`pwd`/../test_driver/example.dart
       - android/run-tests:
           working-directory: example/android
           test-command: ./gradlew test
@@ -160,42 +154,45 @@ jobs:
     executor:
       name: android/android-machine
       resource-class: xlarge
-      tag: 2022.04.1
+      tag: default
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - setup_captain:
           platform: android
       - setup_flutter
       - android/start-emulator-and-run-tests:
-          system-image: system-images;android-30;google_apis;x86
-          additional-avd-args: -d "pixel_4"
-          post-emulator-launch-assemble-command: cd example || true && flutter build apk --debug
-          test-command: cd e2e || true && dotnet test
+          run-tests-working-directory: e2e
+          system-image: system-images;android-33;default;x86_64
+          post-emulator-launch-assemble-command: cd example && flutter build apk --debug
+          test-command: dotnet test
 
   test_ios:
     macos:
-      xcode: 13.4.1
+      xcode: 15.3.0
     resource_class: macos.m1.medium.gen1
+    environment:
+      INSTABUG_SOURCEMAPS_UPLOAD_DISABLE: true
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - setup_ios
       - run:
           name: Build and run tests
-          working_directory: example/ios
+          working_directory:  ~/project/example/ios
           command: |
             xcodebuild -allowProvisioningUpdates \
-                       -workspace Runner.xcworkspace \
-                       -scheme Runner \
-                       -sdk iphonesimulator \
-                       -destination 'name=iPhone 12 Pro Max' \
-                       test | xcpretty
+                -workspace Runner.xcworkspace \
+                -scheme Runner \
+                -resultBundlePath coverage/result.xcresult \
+                -sdk iphonesimulator \
+                -destination 'platform=iOS Simulator,name=iPhone 15 Pro Max,OS=17.4' \
+                test | xcpretty
 
   e2e_ios_captain:
     macos:
-      xcode: 13.4.1
+      xcode: 15.3.0
     resource_class: macos.m1.medium.gen1
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - setup_captain:
           platform: ios
       - setup_ios
@@ -213,7 +210,7 @@ jobs:
     docker:
       - image: cirrusci/flutter
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - install_flutter_and_dart_packages:
           generate_pigeons: false
       - run:
@@ -224,7 +221,7 @@ jobs:
     docker:
       - image: cirrusci/flutter
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - install_flutter_and_dart_packages:
           generate_pigeons: true
       - run:
@@ -235,7 +232,7 @@ jobs:
     docker:
       - image: cirrusci/flutter
     steps:
-      - checkout
+      - advanced-checkout/shallow-checkout
       - install_flutter_and_dart_packages:
           generate_pigeons: true
       - run:
@@ -245,11 +242,11 @@ jobs:
 
   release:
     macos:
-      xcode: 13.4.1
+      xcode: 15.3.0
     resource_class: macos.m1.medium.gen1
     working_directory: "~"
     steps:
-      - checkout:
+      - advanced-checkout/shallow-checkout:
           path: ~/project
       # Flutter doesn't support Apple Silicon yet, so we need to install Rosetta use Flutter on M1 machines.
       - run:
@@ -284,6 +281,7 @@ workflows:
   version: 2
   build-test-and-approval-deploy:
     jobs:
+      - test_android
       - danger:
           requires:
             - test_flutter-stable
@@ -293,7 +291,6 @@ workflows:
       - test_flutter:
           name: test_flutter-2.10.5
           version: 2.10.5
-      - test_android
       - e2e_android_captain
       - test_ios
       - e2e_ios_captain

e2e/Utils/CaptainTest.cs

@@ -9,11 +9,11 @@ public class CaptainTest : IDisposable
   {
     AndroidApp = Path.GetFullPath("../../../../example/build/app/outputs/flutter-apk/app-debug.apk"),
     AndroidAppId = "com.instabug.flutter.example",
-    AndroidVersion = "11",
+    AndroidVersion = "13",
     IosApp = Path.GetFullPath("../../../../example/build/ios/iphonesimulator/Runner.app"),
     IosAppId = "com.instabug.InstabugSample",
-    IosVersion = "15.5",
-    IosDevice = "iPhone 13 Pro Max"
+    IosVersion = "17.4",
+    IosDevice = "iPhone 15 Pro Max"
   };
   protected static readonly Captain captain = new(_config);