Merge pull request #698 from rsksmart/rn_v0.61

.flowconfig

@@ -5,22 +5,14 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
-
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
-node_modules/react-native/Libraries/react-native/React.js
-
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
 ; These should not be required directly
 ; require from fbjs/lib instead: require('fbjs/lib/warning')
 node_modules/warning/.*
 ; Flow doesn't support platforms
-.*/Libraries/Utilities/HMRLoadingView.js
+.*/Libraries/Utilities/LoadingView.js
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 
@@ -40,28 +32,11 @@ module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
 
-module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip .ios suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-
 munge_underscores=true
 
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
+module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
@@ -94,4 +69,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.98.0
+^0.105.0

.gitignore

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 
 # Android/IntelliJ
 #
@@ -50,6 +49,7 @@ yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
+!debug.keystore
 
 # fastlane
 #

android/app/build.gradle

@@ -172,15 +172,7 @@ dependencies {
     implementation "androidx.multidex:multidex:2.0.1"
 
     if (enableHermes) {
-        // For RN 0.60.x
-        def hermesPath = "../../node_modules/hermesvm/android/"
-
-        // --- OR ----
-
-        // for RN 0.61+
-        //def hermesPath = "../../node_modules/hermes-engine/android/";
-
-
+        def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
         releaseImplementation files(hermesPath + "hermes-release.aar")
     } else {

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rsk.rwallet.v2"
     android:versionCode="7"
-    android:versionName="1.4.4">
+    android:versionName="1.4.5">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />

android/app/src/main/java/com/rsk/rwallet/v2/MainApplication.java

@@ -17,10 +17,7 @@
 public class MainApplication extends MultiDexApplication implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
+
 
     @Override
     protected List<ReactPackage> getPackages() {
@@ -34,6 +31,11 @@ protected List<ReactPackage> getPackages() {
     protected String getJSMainModuleName() {
       return "index";
     }
+
+    @Override
+    public boolean getUseDeveloperSupport() {
+      return BuildConfig.DEBUG;
+    }
   };
 
   @Override
@@ -49,7 +51,8 @@ public void onCreate() {
 
   @Override
   protected void attachBaseContext(Context newBase) {
-      super.attachBaseContext(newBase);
-      MultiDex.install(this);
+    super.attachBaseContext(newBase);
+    MultiDex.install(this);
   }
+
 }

android/build.gradle

@@ -40,6 +40,7 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
+        maven { url 'https://jitpack.io' }
 
     }
 }

ios/Podfile

@@ -3,10 +3,24 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 
 $FirebaseSDKVersion = '7.11.0'
 
+def find_and_replace(dir, findstr, replacestr)
+    Dir[dir].each do |name|
+        text = File.read(name)
+        replace = text.gsub(findstr,replacestr)
+        if text != replace
+            puts "Fix: " + name
+            File.open(name, "w") { |file| file.puts replace }
+            STDOUT.flush
+        end
+    end
+    Dir[dir + '*/'].each(&method(:find_and_replace))
+  end
+
 def pods()
     pod 'React', :path => '../node_modules/react-native/'
-    pod 'React-Core', :path => '../node_modules/react-native/React'
-    pod 'React-DevSupport', :path => '../node_modules/react-native/React'
+    pod 'React-Core', :path => '../node_modules/react-native/'
+    pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
+    pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
     pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
     pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
     pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
@@ -16,19 +30,34 @@ def pods()
     pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
     pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
     pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-    pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
+    pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
     pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
     pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
     pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
     pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-    pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+    pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
+    pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
+    pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
     pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
     pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
     pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
     pod 'FirebaseInstanceID', '~> 7.11'
+
+    #from RN 0.61
+    pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
+    pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
+    pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
+    pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
+
+    ## Fix for XCode 12.5
+    find_and_replace("../node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm",
+    "_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules", "_initializeModules:(NSArray<Class> *)modules")
+    find_and_replace("../node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm",
+        "RCTBridgeModuleNameForClass(module))", "RCTBridgeModuleNameForClass(Class(module)))")
 end
 
 target 'rwallet' do
     pods()
     use_native_modules!
 end
+