Merge pull request #133 from Instabug/release/11.0.0

[MOB-9110] Release/11.0.0

Author: Alwahsh

.circleci/config.yml

@@ -1,136 +1,99 @@
-version: 2
+version: 2.1
+
+orbs:
+  android: circleci/android@2.0
+
 jobs:
-  android_tests:
-    working_directory: ~/project
-    macos:
-      xcode: "9.4.0"
-    environment:
-      JVM_OPTS: -Xmx3200m
+
+   test_android:
+    working_directory: ~/project/example
+    executor:
+      name: android/android-machine
+      resource-class: xlarge
+      tag: 2022.04.1
     steps:
       - checkout:
           path: ~/project
       - run:
-          name: Setup environment variables
-          command: |
-            echo 'export PATH="$PATH:/usr/local/opt/node@8/bin:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin:/usr/local/share/android-sdk/tools/bin"' >> $BASH_ENV
-            echo 'export ANDROID_HOME="/usr/local/share/android-sdk"' >> $BASH_ENV
-            echo 'export ANDROID_SDK_HOME="/usr/local/share/android-sdk"' >> $BASH_ENV
-            echo 'export ANDROID_SDK_ROOT="/usr/local/share/android-sdk"' >> $BASH_ENV
-            echo 'export QEMU_AUDIO_DRV=none' >> $BASH_ENV
-            echo 'export JAVA_HOME=/Library/Java/Home' >> $BASH_ENV
-            echo 'export PATH="$PATH:`pwd`/flutter/bin"'  >> $BASH_ENV
-            echo "export PATH=\$PATH:/usr/local/share/android-sdk/platform-tools/" >>$BASH_ENV
-      - run:
-          name: Install Android sdk
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask android-sdk
-      - run:
-          name: Install Gradle
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install gradle
-          no_output_timeout: 30m
-      - run:
-          name: Install emulator dependencies
-          command: (yes | sdkmanager "platform-tools" "platforms;android-26" "extras;intel;Hardware_Accelerated_Execution_Manager" "build-tools;26.0.0" "system-images;android-26;google_apis;x86" "emulator" --verbose) || true
-      - run: avdmanager create avd -n Pixel_2_API_26 -k "system-images;android-26;google_apis;x86" -g google_apis -d "Nexus 5"
-      - run:
-          name: Run emulator in background
-          command: /usr/local/share/android-sdk/tools/emulator @Pixel_2_API_26 -noaudio -no-boot-anim -no-window
-          background: true
-      - run:
-          name: download Cordova 
+          name: Install Cordova CLI
           command: npm install -g cordova
       - run:
-          name: Copy sampleApp
-          command: cp -a sampleApp ../
-      - run:
-          name: chmod permissions
-          command: cd ../; chmod -R 777 sampleApp
-      - run: 
-          name: Npm Install
-          command: cd ../sampleApp; npm install
-      - run: 
-          name: Add Instabug
-          command: cd ../sampleApp; cordova plugin add ../project
-      - run: 
-          name: Build App
-          command: cd ../sampleApp; cordova build android
+          name: Install Android Platform
+          command: cordova platform add android || true
       - run:
-          name: Download Android Dependencies
-          command: cd ../sampleApp/platforms/android; ./gradlew androidDependencies
-      - run:
-          name: Disable animations
-          command: |
-            adb shell settings put global window_animation_scale 0.0
-            adb shell settings put global transition_animation_scale 0.0
-            adb shell settings put global animator_duration_scale 0.0
-            adb shell settings put secure long_press_timeout 1500
+          name: Install Plugins
+          command: cordova plugins add --link ../ tests
       - run:
-          name: Run unit Tests
-          command: cd ../sampleApp/platforms/android; ./gradlew test
-      # - run:
-      #     name: Run UI Tests
-      #     command: cd ../sampleApp/platforms/android; ./gradlew app:connectedAndroidTest
+          name: Install Build Tools v30.0.3
+          command: sdkmanager "build-tools;30.0.3"
+      - android/start-emulator-and-run-tests:
+          run-tests-working-directory: platforms/android
+          system-image: system-images;android-30;google_apis;x86
+          additional-avd-args: -d "Nexus 5"
+          post-emulator-launch-assemble-command: cordova build android
+          test-command: ./gradlew app:connectedAndroidTest
+      - android/run-tests:
+          working-directory: platforms/android
+          test-command: ./gradlew test
 
-  ios_tests:
+   test_ios:
+    working_directory: ~/project/example
     macos:
-      xcode: "10.2.0"
-    working_directory: ~/project
-    environment:
-      FL_OUTPUT_DIR: output
+      xcode: 13.3.0
     steps:
       - checkout:
           path: ~/project
       - run:
-          name: download Cordova 
+          name: Install Cordova CLI
           command: npm install -g cordova
       - run:
-          name: Copy sampleApp
-          command: cp -a sampleApp ../
+          name: Install iOS Platform
+          command: cordova platform add ios || true
       - run:
-          name: chmod permissions
-          command: cd ../; chmod -R 777 sampleApp
-      - run: 
-          name: Npm Install
-          command: cd ../sampleApp; npm install
-      - run: 
-          name: Add Instabug
-          command: cd ../sampleApp; cordova plugin add ../project
-      - run: 
-          name: Build App
-          command: cd ../sampleApp; cordova build ios
+          name: Install Plugins
+          command: cordova plugins add --link ../ tests
       - run:
-          name: Build and run tests
-          command: cd ../sampleApp/platforms/ios; xcodebuild   -workspace HelloCordova.xcworkspace   -scheme HelloCordova   -sdk iphonesimulator   -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2'   test | xcpretty
+          name: Build iOS App
+          command: cordova build ios
+      - run:
+          name: Run Tests
+          working_directory: platforms/ios
+          command: |
+              xcodebuild -allowProvisioningUpdates \
+                         -workspace InstabugExample.xcworkspace \
+                         -scheme InstabugExample \
+                         -sdk iphonesimulator \
+                         -destination 'name=iPhone 12 Pro Max' \
+                         test | xcpretty
 
-  publish:
+   publish:
     macos:
-      xcode: "10.1.0"
+      xcode: 13.3.0
+    working_directory: "~"
     steps:
       - checkout
       - run: git clone https://InstabugCI:$RELEASE_GITHUB_TOKEN@github.com/Instabug/Escape.git
-      - run: cd Escape; swift build -c release -Xswiftc -static-stdlib
-      - run: cd Escape/.build/release; cp -f Escape /usr/local/bin/escape
+      - run: cd Escape && swift build -c release
+      - run: cd Escape/.build/release && cp -f Escape /usr/local/bin/escape
       - run: Escape cordova publish
+
 workflows:
   version: 2
-  publish:
+  build-test-and-approval-deploy:
     jobs:
-      - android_tests
-      - ios_tests
+      - test_android
+      - test_ios
       - hold:
           type: approval
           requires:
-            - android_tests
-            - ios_tests
+            - test_android
+            - test_ios
           filters:
             branches:
               only: master
       - publish:
-          context: cross-platform
           requires:
             - hold
           filters:
             branches:
               only: master
-

.gitignore

@@ -9,8 +9,3 @@
 
 local.properties
 node_modules/
-
-#sample-app
-sample-app/.idea
-sample-app/hooks/
-sample-app/plugins/