Update:

* support for new arch

Merge remote-tracking branch 'origin/develop'

Author: Ron Radtke

.eslintrc.js

@@ -1,10 +1,11 @@
 module.exports = {
     root: true,
+    extends: '@react-native-community',
     rules: {
         'prettier/prettier': 0,
         "eqeqeq": 2,
         "comma-dangle": 0,
-        "curly": 0,
+        curly: 0,
         "no-console": 1,
         "no-debugger": 1,
         "no-extra-semi": 2,
@@ -24,7 +25,32 @@ module.exports = {
                 "requireReturnDescription": false
             }
         ],
-        "radix": 0
+        "radix": 0,
+
+        "react/display-name": 2,
+        "react/forbid-prop-types": 1,
+        "react/jsx-boolean-value": 1,
+        "react/jsx-closing-bracket-location": 1,
+        "react/jsx-curly-spacing": 1,
+        "react/jsx-indent-props": 0,
+        "react/jsx-max-props-per-line": 0,
+        "react/jsx-no-duplicate-props": 1,
+        "react/jsx-no-literals": 0,
+        "react/jsx-no-undef": 1,
+        "react/jsx-sort-props": 0,
+        "react/jsx-uses-react": 1,
+        "react/jsx-uses-vars": 1,
+        "react/jsx-wrap-multilines": 1,
+        "react/no-danger": 1,
+        "react/no-did-mount-set-state": 1,
+        "react/no-did-update-set-state": 1,
+        "react/no-direct-mutation-state": 1,
+        "react/no-multi-comp": 1,
+        "react/no-set-state": 0,
+        "react/no-unknown-property": 1,
+        "react/prop-types": 0,
+        "react/react-in-jsx-scope": 0,
+        "react/self-closing-comp": 1,
+        "react/sort-comp": 1,
     },
-    "parser": "babel-eslint"
 };

.npmignore

@@ -27,6 +27,7 @@ codecov.yml
 # Example
 img/
 example/
+examples/
 app.json
 
 # Android

Migration.md

@@ -0,0 +1,41 @@
+# Migration to the New Architecture
+
+This file is a tracker for what has been done to work on the migration of this library and to keep also track of the various todo:
+
+## TODO
+
+- [] Write JS spec in Flow for the New Architecture
+- [] Implent the new Native Code on iOS
+- [] Implent the new Native Code on Android
+- [] Test on OldArch app (iOS)
+- [] Test on OldArch app (Android)
+- [] Test on NewArch app (iOS)
+- [] Test on NewArch app (Android)
+- [] Open PR
+
+## Done
+
+### Setup
+1. Forked and cloned the repo
+1. Checked the list of APIs to migrate.
+1. Created an `OldArch` app (0.70) configured for the Old Architecture.
+1. Run the app to make sure that it works properly.
+1. Created a `NewArch` app (0.70) configured for the New Architecture.
+1. Switched the flags for iOS and Android to have the new arch enabled by default
+1. Run the app to make sure that it works properly.
+1. Moved the apps in the `examples` folder
+
+### Installing blob-utils
+1. Move to `OldArch`
+1. Run `yarn add ../..` to install the blob utils.
+1. `cd ios`
+1. `bundle install && bundle exec pod install`
+1. `cd ..`
+1. `npx react-native run-ios`
+1. Copy the app JS code from `examples/ReactNativeBlobUtil/App.js` to `examples/OldArch/App.js`
+1. Fixed various JS issues
+1. The app depends on the `Picker`. *Note:* It does not support the New Arch, we need to figure out another way to choose.
+    1. run `yarn add @react-native-picker/picker`
+    1. run `bundle exec pod install` from the iOS folder
+    1. re-run the app
+1. Repeat the above steps for `NewArch`

android.js

@@ -2,9 +2,8 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import { NativeModules, Platform } from 'react-native';
-
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
+import { Platform } from 'react-native';
+import ReactNativeBlobUtil from './codegenSpecs/NativeBlobUtils';
 
 /**
  * Send an intent to open the file.

android/build.gradle

@@ -30,11 +30,19 @@ buildscript {
             mavenCentral()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.1.3'
+            classpath 'com.android.tools.build:gradle:7.2.1'
         }
     }
 }
 
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 30)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
@@ -43,6 +51,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 30)
         versionCode 1
         versionName "1.0"
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
     }
     buildTypes {
         release {
@@ -55,6 +64,15 @@ android {
     }
     productFlavors {
     }
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
+        }
+    }
 }
 
 dependencies {

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip