Merge pull request #700 from Instabug/release/11.0.0

[MOB-8879] Release/11.0.0

Author: ymabdallah

.circleci/config.yml

@@ -1,4 +1,6 @@
-version: 2
+version: 2.1
+orbs:
+  android: circleci/[email protected]
 jobs:
   danger:
     docker:
@@ -70,24 +72,22 @@ jobs:
           path: InstabugSample/test-results
 
   test_android:
+    executor:
+      name: android/android-machine
+      tag: "2022.03.1"
     working_directory: ~/project/InstabugSample
-    docker:
-      - image: circleci/android@sha256:793ae9aa1777ba7fc375109978b307ed03a49be468295a8778d588eba0670e4b
-    environment:
-      JVM_OPTS: -Xmx3200m
     steps:
       - checkout:
           path: ~/project
-      - run: yarn
-      - run:
-          name: chmod permissions
-          command: cd android && chmod +x ./gradlew
       - run:
-          name: Download Dependencies
-          command: cd android && ./gradlew androidDependencies
+          name: Install Yarn
+          command: npm install -g yarn
       - run:
-          name: Run UnitTest
-          command: cd android && ./gradlew test
+          name: Install Node Packages
+          command: yarn
+      - android/run-tests:
+          working-directory: ./android
+          test-command: ./gradlew test
 
   test_ios:
     macos:
@@ -146,62 +146,37 @@ jobs:
           command: detox test --configuration ios.sim.release --cleanup
 
   e2e_android:
-    macos:
-      xcode: "10.2.0"
-    working_directory: ~/project/InstabugSample
+    executor:
+      name: android/android-machine
+      tag: "2022.03.1"
+    working_directory: ~/project/InstabugSample/android
     steps:
       - checkout:
           path: ~/project
-      - run:
-          name: Install Android SDK
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask
-            HOMEBREW_NO_AUTO_UPDATE=1 brew cask install android-sdk
-      - run:
-          name: Accept Android SDK Licenses
-          command: (yes | sdkmanager --licenses) || true
-      - run:
-          name: Setup Android Environment Variables
-          command: |
-            echo 'export JAVA_HOME=`/usr/libexec/java_home -v 1.8`' >> $BASH_ENV
-            echo 'export ANDROID_HOME=/usr/local/share/android-sdk' >> $BASH_ENV
-            echo 'export ANDROID_SDK_ROOT=/usr/local/share/android-sdk' >> $BASH_ENV
-            echo 'export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools' >> $BASH_ENV
-      - run:
-          name: SDK Manager - Download Emulator Image
-          command: (yes | sdkmanager "platform-tools" "platforms;android-27" "extras;intel;Hardware_Accelerated_Execution_Manager" "build-tools;27.0.3" "system-images;android-27;google_apis;x86" "emulator" --verbose) || true
-      - run:
-          name: AVD Manager - Setup Emulator
-          command: avdmanager create avd -n Nexus_6P_API_27 -k "system-images;android-27;google_apis;x86" -g google_apis -d "Nexus 6P"
-      - run:
-          name: Run Emulator in background
-          command: /usr/local/share/android-sdk/emulator/emulator @Nexus_6P_API_27 -noaudio -no-boot-anim -no-window
-          background: true
-      - run:
-          name: Install Node Packages
-          command: sudo yarn
-      - run:
-          name: Generate Android Keystore
-          command: cd android/app && keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=AA, OU=AA, O=AA, L=AA, S=AA, C=EG"
-      - run:
-          name: Make gradlew Executable
-          command: cd android && chmod +x ./gradlew
-      - run:
-          name: Download Android Dependencies
-          command: cd android && ./gradlew androidDependencies
+      - run: 
+          name: Install Yarn
+          command: npm install --global yarn
       - run:
           name: Install Detox CLI
-          command: sudo npm install -g detox-cli
+          command: npm install --global detox-cli
       - run:
-          name: Detox - Build Release App
-          command: |
-            sudo chmod -R 777 /Users/distiller/project/InstabugSample/node_modules/instabug-reactnative
-            detox build --configuration android.emu.release
+          name: Install Node Packages
+          command: yarn
+      - android/create-avd:
+          avd-name: Nexus_6P_API_27
+          install: true
+          system-image: system-images;android-27;default;x86
+      - android/start-emulator:
+          avd-name: Nexus_6P_API_27
+          no-window: true
+          post-emulator-launch-assemble-command: |
+              rm -rf ~/.gradle/caches
+              ./gradlew androidDependencies
+              cd ..
+              detox build -c android.emu.release
       - run:
           name: Detox - Run E2E Tests
-          command: |
-            sudo chmod -R 777 /Users/distiller/Library/Detox
-            detox test --configuration android.emu.release --cleanup
+          command: cd .. && detox test -c android.emu.release
 
   publish:
     macos:
@@ -216,7 +191,6 @@ jobs:
       - run: cd project && Escape react-native publish
 
 workflows:
-  version: 2
   publish:
     jobs:
       - danger:
@@ -226,15 +200,15 @@ workflows:
       - test_android
       - test_ios
       - e2e_ios
-      # - e2e_android
+      - e2e_android
       - hold:
           requires:
             - test_module
             - test_sample
-            # - test_android
+            - test_android
             - test_ios
             - e2e_ios
-            # - e2e_android
+            - e2e_android
           type: approval
           filters:
             branches:

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 11.0.0 (2022-06-07)
+
+* Bumps Instabug native SDKs to v11
+* Adds the ability to initialize the Android SDK from JavaScript. Check the migration guide referenced in our docs
+* Adds the ability to opt out of iOS source maps auto upload through the INSTABUG_SOURCEMAPS_UPLOAD_DISABLE env variable
+* Adds dynamic entry file support through the INSTABUG_ENTRY_FILE env variable
+* Adds the string keys for Repro Steps
+* Adds the new APIs: Instabug.addPrivateView and Instabug.removePrivateView
+* Deprecates Instabug.setPrivateView in favor of the newly introduced APIs
+* Removes the deprecated APIs. Check the migration guide referenced in our docs
+* Removes Surveys.setThresholdForReshowingSurveyAfterDismiss
+* Removes the string keys: surveysCustomThanksTitle and surveysCustomThanksSubtitle
+* Renames BugReporting.setAutoScreenRecordingMaxDuration to BugReporting.setAutoScreenRecordingDurationIOS to target iOS only
+* Fixes an issue with the setRequestFilterExpression API not working with Hermes
+* Fixes an issue with the swipe invocation event not working on Android
+
 ## 10.13.0 (2022-03-17)
 
 * Adds Instabug Experiments APIs

InstabugSample/.eslintrc.js

@@ -1,4 +1,16 @@
 module.exports = {
   root: true,
   extends: '@react-native-community',
+  overrides: [
+    {
+      files: ['__e2e__/**.js'],
+      env: { jest: true },
+      globals: {
+        device: false,
+        waitFor: false,
+        element: false,
+        by: false,
+      },
+    },
+  ],
 };

InstabugSample/App.js

@@ -20,7 +20,6 @@ import Instabug, {
   BugReporting,
   FeatureRequests,
   Surveys,
-  Chats,
   CrashReporting,
   Replies,
 } from 'instabug-reactnative';
@@ -138,13 +137,11 @@ class Home extends Component<{}> {
   }
 
   sendFeedback() {
-    BugReporting.showWithOptions(BugReporting.reportType.feedback, [
-      BugReporting.option.emailFieldHidden,
-    ]);
+    BugReporting.show(BugReporting.reportType.feedback, [BugReporting.option.emailFieldHidden]);
   }
 
   startNewConversation() {
-    BugReporting.showWithOptions(BugReporting.reportType.question);
+    BugReporting.show(BugReporting.reportType.question);
   }
 
   showUnreadMessagesCount() {

InstabugSample/__e2e__/firstTest.e2e.js

@@ -0,0 +1,21 @@
+import { getElement } from './utils/elements';
+import mockData from './utils/mock-data';
+
+beforeEach(async () => {
+  await device.launchApp();
+});
+
+beforeEach(async () => {
+  await device.reloadReactNative();
+});
+
+it('reports a bug', async () => {
+  await getElement('floatingButton').tap();
+  await getElement('reportBugMenuItem').tap();
+
+  await getElement('emailField').typeText(mockData.email);
+  await getElement('commentField').typeText(mockData.bugComment);
+  await getElement('sendBugButton').tap();
+
+  await expect(getElement('thanksMessage')).toBeVisible();
+});

InstabugSample/__e2e__/report-bug.e2e.js

@@ -0,0 +1,48 @@
+import { device, element, by } from 'detox';
+
+const elements = {
+  floatingButton: {
+    ios: () => element(by.id('IBGFloatingButtonAccessibilityIdentifier')),
+    android: () => element(by.type('android.widget.ImageButton')),
+  },
+  reportBugMenuItem: () => element(by.text('Report a bug')),
+  emailField: {
+    ios: () => element(by.id('IBGBugInputViewEmailFieldAccessibilityIdentifier')),
+    android: () => element(by.type('android.widget.EditText')).atIndex(0),
+  },
+  commentField: {
+    ios: () => element(by.id('IBGBugInputViewCommentFieldAccessibilityIdentifier')),
+    android: () => element(by.type('android.widget.EditText')).atIndex(1),
+  },
+  sendBugButton: {
+    ios: () => element(by.id('IBGBugVCNextButtonAccessibilityIdentifier')),
+    android: () => element(by.type('androidx.appcompat.widget.ActionMenuView')),
+  },
+  thanksMessage: {
+    ios: () => element(by.text('Thank you')),
+    android: () => element(by.text('Thank you!')),
+  },
+};
+
+/**
+ * Get element based on current platform.
+ *
+ * @param {keyof elements} name
+ */
+export function getElement(name) {
+  if (!elements.hasOwnProperty(name)) {
+    throw new Error(`Element with name ${name} does not exist.`);
+  }
+
+  const el = elements[name];
+
+  if (typeof el === 'function') {
+    return el();
+  }
+
+  if (device.getPlatform() === 'ios') {
+    return el.ios();
+  }
+
+  return el.android();
+}

InstabugSample/__e2e__/utils/elements.js

@@ -0,0 +1,4 @@
+export default {
+  email: '[email protected]',
+  bugComment: 'This is a test bug',
+};

InstabugSample/__e2e__/utils/mock-data.js

@@ -137,7 +137,8 @@ android {
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
-
+        testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     splits {
         abi {
@@ -194,7 +195,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation "androidx.multidex:multidex:2.0.1"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {

InstabugSample/android/app/build.gradle

@@ -1,6 +1,7 @@
 package com.instabugsample;
 
 import com.wix.detox.Detox;
+import com.wix.detox.config.DetoxConfig;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -19,6 +20,11 @@ public class DetoxTest {
 
     @Test
     public void runDetoxTests() {
-        Detox.runTests(mActivityRule);
+        DetoxConfig detoxConfig = new DetoxConfig();
+        detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
+        detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
+        detoxConfig.rnContextLoadTimeoutSec = (com.instabugsample.BuildConfig.DEBUG ? 180 : 60);
+
+        Detox.runTests(mActivityRule, detoxConfig);
     }
 }

InstabugSample/android/app/src/androidTest/java/com/instabugsample/DetoxTest.java

@@ -9,9 +9,11 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:networkSecurityConfig="@xml/network_security_config">
       <activity
         android:name=".MainActivity"
+        android:exported="true"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"

InstabugSample/android/app/src/main/AndroidManifest.xml

@@ -9,7 +9,6 @@
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
-import com.instabug.reactlibrary.RNInstabugReactnativePackage;
 
 import java.util.List;
 
@@ -45,12 +44,6 @@ public ReactNativeHost getReactNativeHost() {
   @Override
   public void onCreate() {
     super.onCreate();
-     new RNInstabugReactnativePackage.Builder("2c63627b9923e10eee2c8abf92e6925f", MainApplication.this)
-            .setInvocationEvent("button")
-            .setPrimaryColor("#1D82DC")
-            .setFloatingEdge("left")
-            .setFloatingButtonOffsetFromTop(250)
-            .build();
     SoLoader.init(this, /* native exopackage */ false);
     initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }

InstabugSample/android/app/src/main/java/com/instabugsample/MainApplication.java

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">10.0.2.2</domain>
+        <domain includeSubdomains="true">localhost</domain>
+    </domain-config>
+</network-security-config>