@bugfender/rn-bugfender 2.0.0 → 2.1.1

package/README.md

@@ -47,6 +47,20 @@ Download the latest release from [Github](https://github.com/bugfender/Bugfender
 
 * Make sure you have linked `SystemConfiguration.framework`, `Security.framework`, `MobileCoreServices.framework` and `libc++.tbd` as well.
 
+## Upgrading from version 1.x
+After updating to version 2.x from version 1.x you should perform the following extra steps:
+### Android
+Open `MainApplication` class inside `android/app/src/main/java/com.<your_app>/` folder and remove any references to `com.bugfender.react.RNBugfenderPackage`
+### iOS
+Open `Podfile` inside `ios` folder and remove the following line:
+```
+pod 'RNBugfender', :path => '../node_modules/@bugfender/rn-bugfender'
+```
+and then execute the following command under `ios` folder:
+```
+pod deintegrate && pod install
+```
+
 ## RNBugfender Usage
 ```typescript
 import { Bugfender, LogLevel } from '@bugfender/rn-bugfender';
@@ -61,6 +75,7 @@ Bugfender.init({
   // logUIEvents: true,
   // registerErrorHandler: true,
   // deviceName: 'Anonymous',
+  // maximumLocalStorageSize: 5 * 1024 * 1024, // Native specific
   // enableLogcatLogging: false, // Android specific
   // logBrowserEvents: true, // Web specific
   // build: '42', // Web specific
@@ -150,7 +165,7 @@ Bugfender.forceSendOnce();
 The changelog of the Bugfender Web SDK can be found in ReleaseNotes under the [react-native](https://bugfender.releasenotes.io/tag/react-native) tag. For all the Bugfender product changes please visit the general release notes.
 
 ### 2.x Breaking Changes
-The Web SDK API has changed in order be unified with [Bugfender Web SDK](https://www.npmjs.com/package/@bugfender/sdk):
+The React Native SDK API has changed in order be unified with [Bugfender Web SDK](https://www.npmjs.com/package/@bugfender/sdk):
 * The following methods have been removed and replaced with init method attributes:
   * `setApiUrl`
   * `setBaseUrl`

package/RnBugfender.podspec

@@ -1,6 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "RnBugfender"
@@ -18,4 +19,18 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'BugfenderSDK', '~> 1.10.5'
 
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  end
 end

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Dec 10 18:55:52 CET 2021
-gradle.version=7.1
+#Tue Sep 27 11:28:00 CEST 2022
+gradle.version=7.4.2

package/android/build.gradle

@@ -1,61 +1,138 @@
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
+  repositories {
+    google()
+    mavenCentral()
+  }
 
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:3.5.3'
+  }
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
 apply plugin: 'com.android.library'
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+if (isNewArchitectureEnabled()) {
+  apply plugin: 'com.facebook.react'
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['RnBugfender_' + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['RnBugfender_' + name]).toInteger()
 }
 
 android {
-    compileSdkVersion safeExtGet('RnBugfender_compileSdkVersion', 29)
-    defaultConfig {
-        minSdkVersion safeExtGet('RnBugfender_minSdkVersion', 16)
-        targetSdkVersion safeExtGet('RnBugfender_targetSdkVersion', 29)
-        versionCode 1
-        versionName "1.0"
+  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+  lintOptions {
+    disable 'GradleCompatible'
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {
-    mavenLocal()
+  mavenCentral()
+  google()
+
+  def found = false
+  def defaultDir = null
+  def androidSourcesName = 'React Native sources'
+
+  if (rootProject.ext.has('reactNativeAndroidRoot')) {
+    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+  } else {
+    defaultDir = new File(
+      projectDir,
+      '/../../../node_modules/react-native/android'
+    )
+  }
+
+  if (defaultDir.exists()) {
     maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
+      url defaultDir.toString()
+      name androidSourcesName
     }
-    google()
-    mavenCentral()
-    jcenter()
+
+    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+    found = true
+  } else {
+    def parentDir = rootProject.projectDir
+
+    1.upto(5, {
+      if (found) return true
+      parentDir = parentDir.parentFile
+
+      def androidSourcesDir = new File(
+        parentDir,
+        'node_modules/react-native'
+      )
+
+      def androidPrebuiltBinaryDir = new File(
+        parentDir,
+        'node_modules/react-native/android'
+      )
+
+      if (androidPrebuiltBinaryDir.exists()) {
+        maven {
+          url androidPrebuiltBinaryDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+        found = true
+      } else if (androidSourcesDir.exists()) {
+        maven {
+          url androidSourcesDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+        found = true
+      }
+    })
+  }
+
+  if (!found) {
+    throw new GradleException(
+      "${project.name}: unable to locate React Native android sources. " +
+        "Ensure you have you installed React Native as a dependency in your project and try again."
+    )
+  }
 }
 
+
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    //noinspection GradleDynamicVersion
-    implementation 'com.bugfender.sdk:android:3.+'
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  //noinspection GradleDynamicVersion
+  implementation 'com.bugfender.sdk:android:3.+'
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "RnBugfender"
+    codegenJavaPackageName = "com.bugfenderrnbugfender"
+  }
 }

package/android/gradle.properties

@@ -0,0 +1,5 @@
+RnBugfender_kotlinVersion=1.7.0
+RnBugfender_minSdkVersion=21
+RnBugfender_targetSdkVersion=31
+RnBugfender_compileSdkVersion=31
+RnBugfender_ndkversion=21.4.7075529

package/android/src/main/java/com/{bugfender/react → bugfender.react}/RnBugfenderModule.java

@@ -60,8 +60,8 @@ public class RnBugfenderModule extends ReactContextBaseJavaModule implements Act
   }
 
   @ReactMethod
-  public void setMaximumLocalStorageSize(Integer sizeInMB) {
-    Bugfender.setMaximumLocalStorageSize(sizeInMB * 1024);
+  public void setMaximumLocalStorageSize(Integer sizeInBytes) {
+    Bugfender.setMaximumLocalStorageSize(sizeInBytes);
   }
 
   @ReactMethod

package/ios/{RnBugfender.m → RnBugfender.mm}

@@ -2,8 +2,11 @@
 #import <BugfenderSDK/BugfenderSDK.h>
 #import <React/RCTUtils.h>
 
-@implementation RnBugfender
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNRnBugfenderSpec.h"
+#endif
 
+@implementation RnBugfender
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(activateLogger:(NSString *)key)
@@ -135,7 +138,7 @@ RCT_EXPORT_METHOD(log:(int)lineNumber method:(NSString *)method file:(NSString *
         logLevel = BFLogLevelInfo;
     else if (rawLogLevel == 5)
         logLevel = BFLogLevelFatal;
-
+    
     [Bugfender logWithLineNumber:lineNumber method:method file:file level:logLevel tag:tag message:message];
 }
 
@@ -174,10 +177,10 @@ RCT_EXPORT_METHOD(showUserFeedback:(NSString *)title hint:(NSString *)hint subje
             reject(0, @"Feedback not sent", nil);
         }
     }];
-
+    
     UIViewController* vc = RCTPresentedViewController();
     [vc presentViewController:controller animated:YES completion:nil];
-
+    
     /*
      * Another option might be using the window.
      * But this code might not work for complex native setup, for simple cases, might work
@@ -190,4 +193,13 @@ RCT_EXPORT_METHOD(showUserFeedback:(NSString *)title hint:(NSString *)hint subje
     return dispatch_get_main_queue();
 }
 
+// Don't compile this code when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeRnBugfenderSpecJSI>(params);
+}
+#endif
+
 @end

package/ios/RnBugfender.xcodeproj/project.pbxproj

@@ -6,12 +6,6 @@
 	objectVersion = 46;
 	objects = {
 
-/* Begin PBXBuildFile section */
-
-		5E555C0D2413F4C50049A1A2 /* RnBugfender.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RnBugfender.m */; };
-
-/* End PBXBuildFile section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		58B511D91A9E6C8500147676 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -26,10 +20,8 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRnBugfender.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRnBugfender.a; sourceTree = BUILT_PRODUCTS_DIR; };
-
+		2427F83828D894B6004EFC8A /* RnBugfender.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RnBugfender.mm; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RnBugfender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RnBugfender.h; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* RnBugfender.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RnBugfender.m; sourceTree = "<group>"; };
-
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,10 +46,8 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-
 				B3E7B5881CC2AC0600A0062D /* RnBugfender.h */,
-				B3E7B5891CC2AC0600A0062D /* RnBugfender.m */,
-
+				2427F83828D894B6004EFC8A /* RnBugfender.mm */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -119,9 +109,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-
-				B3E7B58A1CC2AC0600A0062D /* RnBugfender.m in Sources */,
-
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -156,6 +143,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -206,6 +194,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -234,7 +223,6 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = RnBugfender;
 				SKIP_INSTALL = YES;
-
 			};
 			name = Debug;
 		};
@@ -251,7 +239,6 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = RnBugfender;
 				SKIP_INSTALL = YES;
-
 			};
 			name = Release;
 		};

package/lib/commonjs/bugfender.js

@@ -7,15 +7,9 @@ exports.RnBugfender = exports.BugfenderClass = void 0;
 
 var _reactNative = require("react-native");
 
-var _userFeedback = require("./user-feedback");
-
-var _stringFormatter = require("./string-formatter");
-
-var _log = require("./types/log");
+var _common = require("@bugfender/common");
 
-var _overrideConsoleMethods = require("./override-console-methods");
-
-var _printToConsole = require("./print-to-console");
+var _userFeedback = require("./user-feedback");
 
 var _sdkOptions = require("./sdk-options");
 
@@ -35,11 +29,9 @@ exports.RnBugfender = RnBugfender;
 
 class BugfenderClass {
   constructor() {
-    _defineProperty(this, "stringFormatter", new _stringFormatter.StringFormatter());
-
-    _defineProperty(this, "overrideConsoleMethods", new _overrideConsoleMethods.OverrideConsoleMethods(window));
+    _defineProperty(this, "overrideConsoleMethods", new (require('./override-console-methods').OverrideConsoleMethods)(window));
 
-    _defineProperty(this, "printToConsole", new _printToConsole.PrintToConsole(global.console));
+    _defineProperty(this, "printToConsole", new _common.PrintToConsole(global.console));
 
     _defineProperty(this, "sdkOptions", new _sdkOptions.SDKOptions());
 
@@ -48,16 +40,11 @@ class BugfenderClass {
 
   async init(options) {
     if (!this.initialized) {
-      var _validatedOptions$pri;
-
-      const validatedOptions = this.sdkOptions.init(options); // Needs to be executed prior initialization
+      const validatedOptions = this.sdkOptions.init(options); // region before init
 
       if (typeof options.deviceName !== 'undefined') {
         RnBugfender.overrideDeviceName(options.deviceName);
-      } // Library initialization
-
-
-      _reactNative.Platform.OS === 'ios' ? RnBugfender.activateLogger(validatedOptions.appKey) : RnBugfender.init(validatedOptions.appKey, false);
+      }
 
       if (typeof validatedOptions.apiURL !== 'undefined') {
         RnBugfender.setApiUrl(validatedOptions.apiURL);
@@ -65,8 +52,19 @@ class BugfenderClass {
 
       if (typeof validatedOptions.baseURL !== 'undefined') {
         RnBugfender.setBaseUrl(validatedOptions.baseURL);
+      } // endregion before init
+      // region init
+
+
+      _reactNative.Platform.OS === 'ios' ? RnBugfender.activateLogger(validatedOptions.appKey) : RnBugfender.init(validatedOptions.appKey, validatedOptions.printToConsole ?? false);
+
+      if (validatedOptions.overrideConsoleMethods) {
+        this.overrideConsoleMethods.init();
       }
 
+      this.printToConsole.init(validatedOptions.printToConsole ?? true); // endregion init
+      // region after init
+
       if (validatedOptions.enableLogcatLogging) {
         RnBugfender.enableLogcatLogging();
       }
@@ -79,11 +77,8 @@ class BugfenderClass {
         RnBugfender.enableCrashReporting();
       }
 
-      if (validatedOptions.overrideConsoleMethods) {
-        this.overrideConsoleMethods.init(this.stringFormatter);
-      }
+      RnBugfender.setMaximumLocalStorageSize(validatedOptions.maximumLocalStorageSize); // endregion after init
 
-      this.printToConsole.init((_validatedOptions$pri = validatedOptions.printToConsole) !== null && _validatedOptions$pri !== void 0 ? _validatedOptions$pri : true);
       this.initialized = true;
     }
   }
@@ -125,10 +120,8 @@ class BugfenderClass {
 
   async getUserFeedback(options) {
     return new Promise(resolve => {
-      var _options;
-
       options = { ...new _userFeedback.DefaultUserFeedbackOptions(),
-        ...((_options = options) !== null && _options !== void 0 ? _options : {})
+        ...(options ?? {})
       };
       return RnBugfender.showUserFeedback(options.title, options.hint, options.subjectPlaceholder, options.feedbackPlaceholder, options.submitLabel, options.closeLabel).then(value => {
         resolve({
@@ -154,7 +147,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.log(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.debug('', message);
   }
   /**
@@ -169,7 +162,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.warn(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.warning('', message);
   }
   /**
@@ -184,7 +177,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.error(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.error('', message);
   }
   /**
@@ -199,7 +192,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.trace(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.trace('', message);
   }
   /**
@@ -214,7 +207,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.info(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.info('', message);
   }
   /**
@@ -229,7 +222,7 @@ class BugfenderClass {
     }
 
     this.printToConsole.error(...parameters);
-    let message = this.stringFormatter.format([...parameters]);
+    let message = (0, _common.format)([...parameters]);
     RnBugfender.fatal('', message);
   }
   /**
@@ -251,10 +244,8 @@ class BugfenderClass {
 
 
   sendLog(log) {
-    var _log$line, _log$method, _log$file, _log$level, _log$tag, _log$text;
-
     this.printToConsole.printLog(log);
-    RnBugfender.log((_log$line = log.line) !== null && _log$line !== void 0 ? _log$line : 0, (_log$method = log.method) !== null && _log$method !== void 0 ? _log$method : '', (_log$file = log.file) !== null && _log$file !== void 0 ? _log$file : '', (_log$level = log.level) !== null && _log$level !== void 0 ? _log$level : _log.LogLevel.Debug, (_log$tag = log.tag) !== null && _log$tag !== void 0 ? _log$tag : '', (_log$text = log.text) !== null && _log$text !== void 0 ? _log$text : '');
+    RnBugfender.log(log.line ?? 0, log.method ?? '', log.file ?? '', log.level ?? _common.LogLevel.Debug, log.tag ?? '', log.text ?? '');
   }
   /**
    * Send an issue.
@@ -332,6 +323,11 @@ class BugfenderClass {
     RnBugfender.forceSendOnce();
   }
 
+  setForceEnabled(enabled) {
+    this.printToConsole.info(`Set force enabled set to ${enabled}`);
+    RnBugfender.setForceEnabled(enabled);
+  }
+
 }
 
 exports.BugfenderClass = BugfenderClass;