Merge remote-tracking branch 'origin/dev' into feat/support-app-flows

Author: abdelhamid-f-nasser

.circleci/config.yml

@@ -1,9 +1,9 @@
 version: 2.1
 
 orbs:
-  android: circleci/[email protected]
+  android: circleci/android@2.5.0
   advanced-checkout: vsco/[email protected]
-  node: circleci/node@5.1.0
+  node: circleci/node@5.2.0
 
 references:
   release_dependencies: &release_dependencies
@@ -26,7 +26,7 @@ commands:
     steps:
       - node/install:
           install-yarn: true
-          node-version: 'v18.17.0'
+          node-version: 'v20.11.1'
       - node/install-packages:
           pkg-manager: yarn
           # Network concurrency is set to 1 for installation from GitHub to work.
@@ -113,13 +113,13 @@ jobs:
   test_android:
     executor:
       name: android/android-machine
-      tag: '2022.03.1'
+      tag: default
     working_directory: ~/project/examples/default
     environment:
       INSTABUG_SOURCEMAPS_UPLOAD_DISABLE: true
     steps:
       - advanced-checkout/shallow-checkout
-      - node/install-yarn
+      #      - node/install-yarn
       - install_node_modules
       - android/run-tests:
           working-directory: android
@@ -227,13 +227,13 @@ jobs:
   e2e_android:
     executor:
       name: android/android-machine
-      tag: 2022.03.1
+      tag: default
       resource-class: large
     environment:
       INSTABUG_SOURCEMAPS_UPLOAD_DISABLE: true
     steps:
       - advanced-checkout/shallow-checkout
-      - node/install-yarn
+      #      - node/install-yarn
       - install_node_modules
       - node/install-packages:
           pkg-manager: yarn
@@ -287,6 +287,35 @@ jobs:
       - run:
           name: Publish new enterprise version
           command: npm publish
+  # Automate the enterprise injazat sdk changes
+  release_injazat:
+    working_directory: ~/project
+    executor:
+      name: node/default
+    steps:
+      - advanced-checkout/shallow-checkout
+      - install_node_modules
+      - run:
+          name: Remove README.md file
+          command: rm README.md
+      - search_and_replace:
+          file: package.json
+          replace-pattern: 's/instabug-reactnative/@instabug\/react-native-injazat/g'
+      - search_and_replace:
+          file: cli/UploadSourcemaps.ts
+          replace-pattern: 's/api.instabug.com\/api\/sdk/st001013mec1.instabug.com\/api\/sdk/g'
+      - search_and_replace:
+          file: android/native.gradle
+          replace-pattern: 's/com\.instabug\.library:instabug:/com.instabug.library-injazat:instabug:/g'
+      - run:
+          name: Build the SDK
+          command: yarn build
+      - run:
+          name: Authorize with npm
+          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+      - run:
+          name: Publish new enterprise version
+          command: npm publish
   # Automate the enterprise D11 sdk changes
   release_d11:
     working_directory: ~/project
@@ -345,6 +374,31 @@ jobs:
       - run:
           working_directory: project
           command: Escape react-native publish
+  publish_new_namespace:
+    macos:
+      xcode: 13.4.1
+    resource_class: macos.m1.medium.gen1
+    working_directory: '~'
+    steps:
+      - advanced-checkout/shallow-checkout
+      - search_and_replace:
+          file: package.json
+          replace-pattern: 's/instabug-reactnative/@instabug\/react-native/g'
+      - run: git clone [email protected]:Instabug/Escape.git
+      - run:
+          working_directory: Escape
+          command: swift build -c release
+      - run:
+          working_directory: Escape/.build/release
+          command: cp -f Escape /usr/local/bin/escape
+      - install_node_modules:
+          app-dir: project
+      - run:
+          working_directory: project
+          command: yarn build
+      - run:
+          working_directory: project
+          command: Escape react-native publish
 
   generate_snapshot:
     executor:
@@ -421,6 +475,15 @@ workflows:
           filters:
             branches:
               only: master
+      - hold_release_injazat:
+          requires: *release_dependencies
+          type: approval
+      - hold_publish_new_namespace:
+          requires: *release_dependencies
+          type: approval
+          filters:
+            branches:
+              only: master
       - hold_release_d11:
           requires: *release_dependencies
           type: approval
@@ -430,12 +493,21 @@ workflows:
           filters:
             branches:
               only: master
+      - publish_new_namespace:
+          requires:
+            - hold_publish_new_namespace
+          filters:
+            branches:
+              only: master
       - release_nn:
           requires:
             - hold_release_nn
           filters:
             branches:
               only: master
+      - release_injazat:
+          requires:
+            - hold_release_injazat
       - release_d11:
           requires:
             - hold_release_d11

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...dev)
+## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...dev)(April 2, 2024)
 
 ### Added
 
@@ -12,6 +12,16 @@
 
 - Deprecate execution traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setFlowAttribute` in favor of the new app flow APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
 
+### Changed
+
+- Bump Instabug Android SDK to v12.9.0 ([#1168](https://github.com/Instabug/Instabug-React-Native/pull/1168)). [See release notes](https://github.com/Instabug/android/releases/tag/v12.9.0).
+- Bump Instabug iOS SDK to v12.9.0 ([#1168](https://github.com/Instabug/Instabug-React-Native/pull/1168)). [See release notes](https://github.com/instabug/instabug-ios/releases/tag/12.9.0).
+
+### Fixed
+
+- Remove the use of the nullish coalescing assignment operator (`??=`) causing a syntax error with older TypeScript versions ([#1166](https://github.com/Instabug/Instabug-React-Native/pull/1166)), closes [#1161
+  ](https://github.com/Instabug/Instabug-React-Native/issues/1161).
+
 ## [12.8.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.7.1...v12.8.0) (February 25, 2024)
 
 ### Added

android/build.gradle

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

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

@@ -357,15 +357,11 @@ public void networkLog(String networkData) throws JSONException {
                 } else {
                     Log.e("IB-CP-Bridge", "apmNetworkLogByReflection was not found by reflection");
                 }
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
+            } catch (Throwable e) {
                 e.printStackTrace();
             }
         }
-        catch(Exception e) {
+        catch(Throwable e) {
             e.printStackTrace();
         }
     }

examples/default/ios/Podfile.lock

@@ -97,7 +97,7 @@ PODS:
   - hermes-engine (0.72.3):
     - hermes-engine/Pre-built (= 0.72.3)
   - hermes-engine/Pre-built (0.72.3)
-  - Instabug (12.7.0)
+  - Instabug (12.9.0)
   - instabug-reactnative-ndk (0.1.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
@@ -531,8 +531,8 @@ PODS:
   - RNGestureHandler (2.13.4):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - RNInstabug (12.8.0):
-    - Instabug (= 12.7.0)
+  - RNInstabug (12.9.0):
+    - Instabug (= 12.9.0)
     - React-Core
   - RNReanimated (3.5.4):
     - DoubleConversion
@@ -798,7 +798,7 @@ SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
-  Instabug: 59f0b0bc2c062b5cdbbf417cca365480a1fe55d8
+  Instabug: 8d39aa5f98999f4c0081fcdb38998eb368923d1a
   instabug-reactnative-ndk: 960119a69380cf4cbe47ccd007c453f757927d17
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OCMock: 300b1b1b9155cb6378660b981c2557448830bdc6
@@ -841,7 +841,7 @@ SPEC CHECKSUMS:
   React-utils: bcb57da67eec2711f8b353f6e3d33bd8e4b2efa3
   ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
   RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
-  RNInstabug: 447d1f2e2afcdf54090914a3da7d61ef227e790b
+  RNInstabug: 620175f228d29f6ec394a598502cf501bd9beace
   RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9

ios/native.rb

@@ -1,4 +1,4 @@
-$instabug = { :version => '12.7.0' }
+$instabug = { :version => '12.9.0' }
 
 def use_instabug! (spec = nil)
   version = $instabug[:version]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "instabug-reactnative",
   "description": "React Native plugin for integrating the Instabug SDK",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "author": "Instabug (https://instabug.com)",
   "repository": "github:Instabug/Instabug-React-Native",
   "homepage": "https://www.instabug.com/platforms/react-native",

src/modules/Instabug.ts

@@ -64,7 +64,9 @@ export const init = (config: InstabugConfig) => {
   captureUnhandledRejections();
 
   // Default networkInterceptionMode to JavaScript
-  config.networkInterceptionMode ??= NetworkInterceptionMode.javascript;
+  if (config.networkInterceptionMode == null) {
+    config.networkInterceptionMode = NetworkInterceptionMode.javascript;
+  }
 
   if (config.networkInterceptionMode === NetworkInterceptionMode.javascript) {
     NetworkLogger.setEnabled(true);