Merge pull request #50 from bugfender/feature/react-native-0.7

Feature/react native 0.7

Author: doup

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   default:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:16
     working_directory: ~/project
 
 commands:

.husky/.npmignore

@@ -1 +1 @@
-16.17
+16

.husky/commit-msg

@@ -0,0 +1 @@
+2.7.4

.husky/pre-commit

@@ -0,0 +1 @@
+{}

.nvmrc

@@ -0,0 +1,109 @@
+# Bugfender React Native Development
+
+## Setting up the environment
+
+Please follow the guide located in [React Native Environment Setup](https://reactnative.dev/docs/environment-setup) "React Native CLI Quickstart" tab. The following is an overview of the needed tooling.
+
+Basic tooling:
+
+- NodeJS and [Yarn](https://yarnpkg.com)
+- [Watchman](https://github.com/facebook/watchman)
+
+For Android, install:
+
+- Java Development Kit
+- Android Studio with Android SDK
+
+For iOS, install:
+
+- XCode with Command Line Tools
+- [Cocoapods](https://cocoapods.org)
+
+**Once all the tooling is ready**:
+
+- On the `example` folder:
+  - `bundle install`: install required Ruby gems
+- On the root folder:
+  - `yarn`: this will install dependencies for the library & `/example`
+- Add Bugfender app key in `example` project:
+  - `cd example/src`
+  - `cp bugfenderKey.json.example bugfenderKey.json`
+  - Edit `bugfenderKey.json` & add the key
+
+## Running the example
+
+On a terminal window:
+
+- `cd example`: enter the `example` folder
+- `yarn start`: start React Native "server"
+- Open a new terminal to run the specific example
+
+For Android:
+
+- Open Android Studio and run an emulator
+- `cd example`: enter the `example` folder
+- `yarn android`: run in Android
+
+For iOS:
+
+- `cd example`: enter the `example` folder
+- `yarn ios`: run in iOS
+
+For Web:
+
+- Please use [this private project](https://bitbucket.org/bugfender/rn-bugfender-development) and execute `yarn web`
+
+## Upgrade React Native version
+
+Try with the official react native upgrade command:
+
+```bash
+npx react-native upgrade
+```
+
+If it does not work you can create a new updated library from scratch:
+
+1. Using [create-react-native-library tool](https://reactnative.dev/docs/native-modules-setup)
+2. Be sure to select a Native library using Java & Objective-C
+3. Add the following lines to the `package.json` of the newly created library (be sure to use the latest version):
+
+    ```json
+    "dependencies": {
+      "@bugfender/common": "1.0.0-alpha.5",
+      "@bugfender/sdk": "^2.1.0"
+    }
+    ```
+
+4. Add "dom" into the "lib" object on `tsconfig.json`:
+
+    ```json
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    ```
+
+5. On **android/src/build.gradle** add the following to the dependencies:
+
+    ```gradle
+    implementation 'com.bugfender.sdk:android:3.+'
+    ```
+
+6. Copy `RnBugfenderModule.java` and `RnBufgenerPackage.java` to **android/src/main/java/com.bugfender.react**.
+7. Add the Bugfender dependency to the podspec on the **root** folder
+
+    ```ruby
+    s.dependency 'BugfenderSDK', '~> 1.10.5'
+    ```
+
+8. Copy `RnBugefnder.h` && `RnBugefnder.mm` to **ios/**
+9. Copy `App.tsx` & add `bugfenderKey.json` into **example/src/**, see `bugfenderKey.json` format below:
+
+    ```json
+    {
+    "bugfenderKey": "<your Bugfdender key>"
+    }
+    ```
+
+10. Run `pod install` under **example/ios/**
+11. You should be ready to run the example using `yarn android` & `yarn ios`

.ruby-version

@@ -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

.watchmanconfig

@@ -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"
+  }
 }