Merge pull request #1293 from Instabug/dev

release/13.4.0

Author: mzelzoghbi

.circleci/config.yml

@@ -1,5 +1,24 @@
 # Changelog
 
+## [13.4.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...v13.4.0) (October 2, 2024)
+
+### Added
+
+- Add support for Expo Router navigation tracking ([#1270](https://github.com/Instabug/Instabug-React-Native/pull/1270)).
+- Enhance the network interceptor to capture more client error messages ([#1257](https://github.com/Instabug/Instabug-React-Native/pull/1257)).
+
+### Changed
+
+- Bump Instabug iOS SDK to v13.4.2 ([#1285](https://github.com/Instabug/Instabug-React-Native/pull/1285)). See release notes for [13.4.0](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.0), [13.4.1](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.1) and [13.4.2](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.2).
+- Bump Instabug Android SDK to v13.4.1 ([#1285](https://github.com/Instabug/Instabug-React-Native/pull/1285)). See release notes for [13.4.0](https://github.com/Instabug/Instabug-Android/releases/tag/v13.4.0) and [13.4.1](https://github.com/Instabug/Instabug-Android/releases/tag/v13.4.1).
+
+### Fixed
+
+- Fix an issue with JavaScript fatal crashes on iOS causing them to be reported as native iOS crashes instead. ([#1290](https://github.com/Instabug/Instabug-React-Native/pull/1290)).
+- Correctly resolve the flavor path when uploading sourcemaps on Android. ([#1225](https://github.com/Instabug/Instabug-React-Native/pull/1225)).
+- Drop non-error objects reported as crashes since they don't have a stack trace ([#1279](https://github.com/Instabug/Instabug-React-Native/pull/1279)).
+- Fix APM network logging on iOS when the response body is missing or empty. ([#1273](https://github.com/Instabug/Instabug-React-Native/pull/1273)).
+
 ## [13.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...v13.3.0) (August 4, 2024)
 
 ### Added

CHANGELOG.md

@@ -57,7 +57,7 @@ android {
         minSdkVersion getExtOrDefault('minSdkVersion').toInteger()
         targetSdkVersion getExtOrDefault('targetSdkVersion').toInteger()
         versionCode 1
-        versionName "13.3.0"
+        versionName "13.4.0"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"

android/build.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
-    version: '13.3.0'
+    version: '13.4.1'
 ]
 
 dependencies {

android/native.gradle

@@ -13,12 +13,13 @@ gradle.projectsEvaluated {
         def start = name.startsWith(prefixes[0]) ? prefixes[0].length() : prefixes[1].length()
         def end = name.length() - suffix.length()
         def flavor = name.substring(start, end).uncapitalize()
+        def defaultVersion = getDefaultVersion(flavor)
 
-        task.finalizedBy createUploadSourcemapsTask(flavor)
+        task.finalizedBy createUploadSourcemapsTask(flavor, defaultVersion.name, defaultVersion.code)
     }
 }
 
-Task createUploadSourcemapsTask(String flavor) {
+Task createUploadSourcemapsTask(String flavor, String defaultVersionName, String defaultVersionCode) {
     def name = 'uploadSourcemaps' + flavor.capitalize()
 
     // Don't recreate the task if it already exists.
@@ -38,13 +39,7 @@ Task createUploadSourcemapsTask(String flavor) {
             try {
                 def appProject = project(':app')
                 def appDir = appProject.projectDir
-                def flavorPath = flavor + (flavor.empty ? '' : '/')
-                def sourceMapDest = "build/generated/sourcemaps/react/${flavorPath}release/index.android.bundle.map"
-                def sourceMapFile = new File(appDir, sourceMapDest)
-
-                if (!sourceMapFile.exists()) {
-                    throw new InvalidUserDataException("Unable to find source map file at: ${sourceMapFile.absolutePath}")
-                }
+                def sourceMapFile = getSourceMapFile(appDir, flavor)
 
                 def jsProjectDir = rootDir.parentFile
                 def instabugDir = new File(['node', '-p', 'require.resolve("instabug-reactnative/package.json")'].execute(null, rootDir).text.trim()).getParentFile()
@@ -53,9 +48,8 @@ Task createUploadSourcemapsTask(String flavor) {
                 def inferredToken = executeShellScript(tokenShellFile, jsProjectDir)
                 def appToken = resolveVar('App Token', 'INSTABUG_APP_TOKEN', inferredToken)
 
-                def projectConfig = appProject.android.defaultConfig
-                def versionName = resolveVar('Version Name', 'INSTABUG_VERSION_NAME', "${projectConfig.versionName}")
-                def versionCode = resolveVar('Version Code', 'INSTABUG_VERSION_CODE', "${projectConfig.versionCode}")
+                def versionName = resolveVar('Version Name', 'INSTABUG_VERSION_NAME', defaultVersionName)
+                def versionCode = resolveVar('Version Code', 'INSTABUG_VERSION_CODE', defaultVersionCode)
 
                 exec {
                     def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c'] : []
@@ -80,6 +74,59 @@ Task createUploadSourcemapsTask(String flavor) {
     return provider.get()
 }
 
+File getSourceMapFile(File appDir, String flavor) {
+    def defaultFlavorPath = flavor.empty ? 'release' : "${flavor}Release"
+    def defaultSourceMapDest = "build/generated/sourcemaps/react/${defaultFlavorPath}/index.android.bundle.map"
+    def defaultSourceMapFile = new File(appDir, defaultSourceMapDest)
+
+    if (defaultSourceMapFile.exists()) {
+        return defaultSourceMapFile
+    }
+
+    if (flavor.empty) {
+        throw new InvalidUserDataException("Unable to find source map file at: ${defaultSourceMapFile.absolutePath}.")
+    }
+
+    def fallbackSourceMapDest = "build/generated/sourcemaps/react/${flavor}/release/index.android.bundle.map"
+    def fallbackSourceMapFile = new File(appDir, fallbackSourceMapDest)
+
+    project.logger.info "Unable to find source map file at: ${defaultSourceMapFile.absolutePath}.\n" +
+            "Falling back to ${fallbackSourceMapFile.absolutePath}."
+
+    if (!fallbackSourceMapFile.exists()) {
+        throw new InvalidUserDataException("Unable to find source map file at: ${fallbackSourceMapFile.absolutePath} either.")
+    }
+
+    return fallbackSourceMapFile
+}
+
+/**
+ * Infers the app version to use in source map upload based on the flavor.
+ * This is needed since different flavors may have different version codes and names (e.g. version suffixes).
+ *
+ * It checks the version for the flavor's variant.
+ * If no variant is found it falls back to the app's default config.
+ *
+ *
+ * @param flavor The flavor to get the app version for.
+ * @return A map containing the version code and version name.
+ */
+Map<String, String> getDefaultVersion(String flavor) {
+    def appProject = project(':app')
+    def defaultConfig = appProject.android.defaultConfig
+
+    def variants = appProject.android.applicationVariants
+
+    // uncapitalize is used to turn "Release" into "release" if the flavor is empty
+    def variantName = "${flavor}Release".uncapitalize()
+    def variant = variants.find { it.name.uncapitalize() == variantName }
+
+    def versionName = variant?.versionName ?: defaultConfig.versionName
+    def versionCode = variant?.versionCode ?: defaultConfig.versionCode
+
+    return [name: "${versionName}", code: "${versionCode}"]
+}
+
 boolean isUploadSourcemapsEnabled() {
     def envValue = System.getenv('INSTABUG_SOURCEMAPS_UPLOAD_DISABLE')?.toBoolean()
     def defaultValue = true

android/sourcemaps.gradle

@@ -6,14 +6,6 @@
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.instabug.reactlibrary.RNInstabugAPMModule;
-import com.instabug.reactlibrary.RNInstabugBugReportingModule;
-import com.instabug.reactlibrary.RNInstabugCrashReportingModule;
-import com.instabug.reactlibrary.RNInstabugFeatureRequestsModule;
-import com.instabug.reactlibrary.RNInstabugReactnativeModule;
-import com.instabug.reactlibrary.RNInstabugRepliesModule;
-import com.instabug.reactlibrary.RNInstabugSessionReplayModule;
-import com.instabug.reactlibrary.RNInstabugSurveysModule;
 
 import java.util.ArrayList;
 import java.util.Collections;

examples/default/android/app/src/main/java/com/instabug/react/example/RNInstabugExampleReactnativePackage.java

@@ -0,0 +1,4 @@
+{
+  "instabug-domain": "api.instabug.com",
+  "apm-domain": "api-apm.instabug.com"
+}

examples/default/android/app/src/main/res/raw/instabug_config.json

@@ -27,5 +27,13 @@ allprojects {
         maven {
             url("$rootDir/../node_modules/detox/Detox-android")
         }
+
+        maven {
+            credentials {
+                username System.getenv("DREAM11_MAVEN_USERNAME")
+                password System.getenv("DREAM11_MAVEN_PASSWORD")
+            }
+            url "https://mvn.instabug.com/nexus/repository/dream-11"
+        }
     }
 }

examples/default/android/build.gradle

@@ -21,6 +21,7 @@
 		CC3DF8932A1DFC9A003E9914 /* InstabugSurveysTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3DF88B2A1DFC99003E9914 /* InstabugSurveysTests.m */; };
 		CC3DF8942A1DFC9A003E9914 /* InstabugAPMTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3DF88C2A1DFC99003E9914 /* InstabugAPMTests.m */; };
 		CC3DF8952A1DFC9A003E9914 /* IBGConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3DF88D2A1DFC9A003E9914 /* IBGConstants.m */; };
+		CC487A9C2C71FCFC0021F680 /* Instabug.plist in Resources */ = {isa = PBXBuildFile; fileRef = CC487A9B2C71FCFC0021F680 /* Instabug.plist */; };
 		CCF1E4092B022CF20024802D /* RNInstabugTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF1E4082B022CF20024802D /* RNInstabugTests.m */; };
 		CD36F4707EA1F435D2CC7A15 /* libPods-InstabugExample-InstabugTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF7A6E02D40E0CEEA833CC4 /* libPods-InstabugExample-InstabugTests.a */; };
 		F7BF47401EF3A435254C97BB /* libPods-InstabugExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BAED0D0441A708AE2390E153 /* libPods-InstabugExample.a */; };
@@ -64,6 +65,7 @@
 		CC3DF88B2A1DFC99003E9914 /* InstabugSurveysTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstabugSurveysTests.m; sourceTree = "<group>"; };
 		CC3DF88C2A1DFC99003E9914 /* InstabugAPMTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstabugAPMTests.m; sourceTree = "<group>"; };
 		CC3DF88D2A1DFC9A003E9914 /* IBGConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IBGConstants.m; sourceTree = "<group>"; };
+		CC487A9B2C71FCFC0021F680 /* Instabug.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = Instabug.plist; path = InstabugExample/Instabug.plist; sourceTree = "<group>"; };
 		CCF1E4082B022CF20024802D /* RNInstabugTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNInstabugTests.m; sourceTree = "<group>"; };
 		DBCB1B1D023646D84146C91E /* Pods-InstabugExample-InstabugTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugExample-InstabugTests.release.xcconfig"; path = "Target Support Files/Pods-InstabugExample-InstabugTests/Pods-InstabugExample-InstabugTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -120,6 +122,7 @@
 		13B07FAE1A68108700A75B9A /* InstabugExample */ = {
 			isa = PBXGroup;
 			children = (
+				CC487A9B2C71FCFC0021F680 /* Instabug.plist */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
@@ -296,6 +299,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
+				CC487A9C2C71FCFC0021F680 /* Instabug.plist in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;