Merge pull request #609 from Instabug/release/10.8

[MOB-5604] Release/10.8

Author: bsameh-at-instabug

.circleci/config.yml

@@ -206,14 +206,14 @@ jobs:
 
   publish:
     macos:
-      xcode: "10.2.0"
-    working_directory: ~
+      xcode: "10.1.0"
+    working_directory: "~"
     steps:
       - checkout:
           path: ~/project
       - 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 -Xswiftc -static-stdlib
+      - run: cd Escape/.build/release && cp -f Escape /usr/local/bin/escape
       - run: cd project && Escape react-native publish
 
 workflows:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v10.8.0 (2021-08-04)
+
+* Bumps Instabug native SDKs to v10.8
+* Adds string keys for the discard attachment prompt dialog.
+* Fixes Autolinking on iOS.
+
 ## v10.4.0 (2021-05-10)
 
 * Migrates iOS to use XCFramework

InstabugSample/ios/InstabugSample.xcodeproj/project.pbxproj

@@ -215,8 +215,8 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				21BA34F4E1FA153B4E4FB519 /* Upload Sourcemap */,
 				A4F6B49E8609FD1652D0F43E /* [CP] Embed Pods Frameworks */,
+				EB2EABBB5C10A5C0D7276A8A /* [CP-User] [instabug-reactnative] Upload Sourcemap */,
 			);
 			buildRules = (
 			);
@@ -299,24 +299,6 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
-		21BA34F4E1FA153B4E4FB519 /* Upload Sourcemap */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Upload Sourcemap";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
-			shellScript = "export INSTABUG_APP_TOKEN=\"YOUR_APP_TOKEN\"\nbash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"\n";
-		};
 		79262244E33DD37263C24F3E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -379,6 +361,16 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		EB2EABBB5C10A5C0D7276A8A /* [CP-User] [instabug-reactnative] Upload Sourcemap */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "bash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"";
+		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

README.md

@@ -30,10 +30,10 @@ Updating to a new version? Check the [Update Guide](#update-guide) before bumpin
     yarn add instabug-reactnative
     ```
 
-2. For projects that build for iOS, install `xcodeproj` gem:
+2. CocoaPods on iOS needs this extra step:
 
     ```bash
-    gem install xcodeproj
+    cd ios && pod install && cd ..
     ```
 
 3.  **For React Native >= 0.60**, simply run the command:

android/build.gradle

@@ -29,7 +29,7 @@ android {
 dependencies {
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.facebook.react:react-native:+'
-    api('com.instabug.library:instabug:10.4.3.4') {
+    api('com.instabug.library:instabug:10.8.1') {
         exclude group: 'com.android.support:appcompat-v7'
     }
     testImplementation 'org.mockito:mockito-core:1.10.19'

android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java

@@ -200,6 +200,11 @@ static void registerCustomTextPlaceHolderKeysArgs(Map<String, Object> args) {
         args.put("betaWelcomeMessageFinishStepContent", InstabugCustomTextPlaceHolder.Key.BETA_WELCOME_MESSAGE_FINISH_STEP_CONTENT);
         args.put("liveWelcomeMessageTitle", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_TITLE);
         args.put("liveWelcomeMessageContent", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_CONTENT);
+        args.put("discardAlertTitle", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_TITLE);
+        args.put("discardAlertMessage", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_BODY);
+        args.put("discardAlertCancel", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_NEGATIVE_ACTION);
+        args.put("discardAlertAction", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_POSITIVE_ACTION);
+        args.put("addAttachmentButtonTitleStringName", InstabugCustomTextPlaceHolder.Key.REPORT_ADD_ATTACHMENT_HEADER);
     }
 
     static void registerInstabugReportTypesArgs(Map<String, Object> args) {

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -228,6 +228,12 @@ public class RNInstabugReactnativeModule extends ReactContextBaseJavaModule {
     private final String REPORT_QUESTION_DESCRIPTION = "reportQuestionDescription";
     private final String REQUEST_FEATURE_DESCRIPTION = "requestFeatureDescription";
 
+    private final String REPORT_DISCARD_DIALOG_TITLE = "discardAlertTitle";
+    private final String REPORT_DISCARD_DIALOG_BODY = "discardAlertMessage";
+    private final String REPORT_DISCARD_DIALOG_NEGATIVE_ACTION = "discardAlertCancel";
+    private final String REPORT_DISCARD_DIALOG_POSITIVE_ACTION = "discardAlertAction";
+    private final String REPORT_ADD_ATTACHMENT_HEADER = "addAttachmentButtonTitleStringName";
+
     private Application androidApplication;
     private Instabug mInstabug;
     private InstabugInvocationEvent invocationEvent;
@@ -2309,6 +2315,16 @@ private InstabugCustomTextPlaceHolder.Key getStringToKeyConstant(String key) {
                 return InstabugCustomTextPlaceHolder.Key.REPORT_QUESTION_DESCRIPTION;
             case REQUEST_FEATURE_DESCRIPTION:
                 return InstabugCustomTextPlaceHolder.Key.REQUEST_FEATURE_DESCRIPTION;
+            case REPORT_DISCARD_DIALOG_TITLE:
+                return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_TITLE;
+            case REPORT_DISCARD_DIALOG_BODY:
+                return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_BODY;
+            case REPORT_DISCARD_DIALOG_NEGATIVE_ACTION:
+                return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_NEGATIVE_ACTION;
+            case REPORT_DISCARD_DIALOG_POSITIVE_ACTION:
+                return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_POSITIVE_ACTION;
+            case REPORT_ADD_ATTACHMENT_HEADER:
+                return InstabugCustomTextPlaceHolder.Key.REPORT_ADD_ATTACHMENT_HEADER;
             default:
                 return null;
         }
@@ -2484,6 +2500,12 @@ public Map<String, Object> getConstants() {
         constants.put(REPORT_QUESTION_DESCRIPTION, REPORT_QUESTION_DESCRIPTION);
         constants.put(REQUEST_FEATURE_DESCRIPTION, REQUEST_FEATURE_DESCRIPTION);
 
+        constants.put(REPORT_DISCARD_DIALOG_TITLE, REPORT_DISCARD_DIALOG_TITLE);
+        constants.put(REPORT_DISCARD_DIALOG_BODY, REPORT_DISCARD_DIALOG_BODY);
+        constants.put(REPORT_DISCARD_DIALOG_NEGATIVE_ACTION, REPORT_DISCARD_DIALOG_NEGATIVE_ACTION);
+        constants.put(REPORT_DISCARD_DIALOG_POSITIVE_ACTION, REPORT_DISCARD_DIALOG_POSITIVE_ACTION);
+        constants.put(REPORT_ADD_ATTACHMENT_HEADER, REPORT_ADD_ATTACHMENT_HEADER);
+
         return constants;
     }
 }

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativePackage.java

@@ -18,6 +18,7 @@
 import com.instabug.library.visualusersteps.State;
 import com.instabug.reactlibrary.utils.InstabugUtil;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
+import com.instabug.apm.APM;
 
 import android.graphics.Color;
 
@@ -67,6 +68,8 @@ public RNInstabugReactnativePackage(String androidApplicationToken, Application
         if(offset != null)
             BugReporting.setFloatingButtonOffset(offset);
 
+        // Temporarily disabling APM hot launches
+        APM.setHotAppLaunchEnabled(false);
     }
 
     public RNInstabugReactnativePackage(String androidApplicationToken, Application androidApplication,