Merge pull request #33 from a7urag/upgrade_rn_0.61

Upgrade React Native to 0.61.5

Author: AmitM30

README.md

@@ -14,6 +14,8 @@ This repo supports the latest version of React Native (v0.57.8+) supported by RN
 
 **UPDATE** (2nd November '19): RNN upgraded to v2.26.2 | RN to 0.59.10
 
+**UPDATE** (27th April '20): RNN upgraded to v3.7.0 | RN to 0.61.5 | React to 16.9.0
+
 ### Who is this for?
 
 Someone looking to jumpstart building apps using RN and prefers TS. The base setup has been taken care of, just `yarn install` and get going from respective IDEs.

android/app/build.gradle

@@ -73,7 +73,7 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js"
+        entryFile: "index.js"
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -93,6 +93,10 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+def enableHermes = project.ext.react.get("enableHermes", false);
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -110,6 +114,7 @@ android {
         packagingOptions {
             exclude "lib/arm64-v8a/libgnustl_shared.so"
         }
+        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -134,7 +139,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
+            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -147,12 +152,20 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "com.facebook.react:react-native:0.61.5"  // From node_modules
     implementation project(':react-native-navigation')
 
     implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+
+    if (enableHermes) {
+        def hermesPath = "../../node_modules/hermes-engine/android/";
+        debugImplementation files(hermesPath + "hermes-debug.aar")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
+    } else {
+        implementation jscFlavor
+    }
 }
 
 // Run this once to be able to run the application with BUCK

android/app/src/main/java/com/fridayapp/MainActivity.java

@@ -1,16 +1,7 @@
 package com.fridayapp;
 
-//import com.facebook.react.ReactActivity;
 import com.reactnativenavigation.NavigationActivity;
 
 public class MainActivity extends NavigationActivity {
 
-    /**
-     * Returns the name of the main component registered from JavaScript.
-     * This is used to schedule rendering of the component.
-     */
-//    @Override
-//    protected String getMainComponentName() {
-//        return "FridayApp";
-//    }
 }

android/app/src/main/java/com/fridayapp/MainApplication.java

@@ -1,12 +1,8 @@
 package com.fridayapp;
 
-import android.app.Application;
 
-import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-import com.facebook.soloader.SoLoader;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
@@ -20,63 +16,28 @@ public class MainApplication extends NavigationApplication {
     @Override
     protected ReactGateway createReactGateway() {
         ReactNativeHost host = new NavigationReactNativeHost(this, isDebug(), createAdditionalReactPackages()) {
-        @Override
-        protected String getJSMainModuleName() {
-          return "index";
-        }
-      };
+            @Override
+            protected String getJSMainModuleName() {
+                return "index";
+            }
+        };
 
-      return new ReactGateway(this, isDebug(), host);
+        return new ReactGateway(this, isDebug(), host);
     }
 
     @Override
     public boolean isDebug() {
-      return BuildConfig.DEBUG;
+        return BuildConfig.DEBUG;
     }
 
     protected List<ReactPackage> getPackages() {
-      // Add additional packages you require here
-      // No need to add RnnPackage and MainReactPackage
-      return Arrays.<ReactPackage>asList(
-      // eg. new VectorIconsPackage()
-      );
+        return Arrays.<ReactPackage>asList(
+                // eg. new VectorIconsPackage()
+        );
     }
 
     @Override
     public List<ReactPackage> createAdditionalReactPackages() {
-      return getPackages();
+        return getPackages();
     }
-}
-
-//public class MainApplication extends Application implements ReactApplication {
-//
-//  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-//    @Override
-//    public boolean getUseDeveloperSupport() {
-//      return BuildConfig.DEBUG;
-//    }
-//
-//    @Override
-//    protected List<ReactPackage> getPackages() {
-//      return Arrays.<ReactPackage>asList(
-//          new MainReactPackage()
-//      );
-//    }
-//
-//    @Override
-//    protected String getJSMainModuleName() {
-//      return "index";
-//    }
-//  };
-//
-//  @Override
-//  public ReactNativeHost getReactNativeHost() {
-//    return mReactNativeHost;
-//  }
-//
-//  @Override
-//  public void onCreate() {
-//    super.onCreate();
-//    SoLoader.init(this, /* native exopackage */ false);
-//  }
-//}
+}

android/build.gradle

@@ -30,29 +30,34 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
+            url("$rootDir/../node_modules/react-native/android")
+        }
+        maven {
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
         }
         maven { url 'https://jitpack.io' }
+
     }
 }
 
 subprojects { subproject ->
-        afterEvaluate {
-                if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
-                        android {
-                                variantFilter { variant ->
-                                        def names = variant.flavors*.name
-                                        if (names.contains("reactNative51") || names.contains("reactNative55")) {
-                                                setIgnore(true)
-                                            }
-                                    }
-                            }
+    afterEvaluate {
+        if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                variantFilter { variant ->
+                    def names = variant.flavors*.name
+                    if (names.contains("reactNative51") ||
+                            names.contains("reactNative55") ||
+                            names.contains("reactNative56") ||
+                            names.contains("reactNative57") ||
+                            names.contains("reactNative57_5")
+                    ) {
+                        setIgnore(true)
                     }
+                }
             }
+        }
     }
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.7'
-    distributionUrl = distributionUrl.replace("bin", "all")
 }
+

android/gradle.properties

@@ -16,3 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

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

android/settings.gradle

@@ -1,4 +1,5 @@
 rootProject.name = 'FridayApp'
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':react-native-navigation'
-project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/')
+project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app')
 include ':app'