Upgrade to RN 0.60.5

Author: Petter Hesselberg

android/app/build.gradle

@@ -33,6 +33,8 @@ project.ext.react = [
     // Whether to bundle JS and assets in release mode
     bundleInRelease: true,
 
+    enableHermes: false,
+
     // Whether to bundle JS and assets in another build variant (if configured).
     // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
     // The configuration property can be in the following formats
@@ -164,4 +166,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation("com.facebook.react:react-native:$rootProject.ext.reactNativeVersion")
+    //noinspection GradleDynamicVersion
+    implementation 'org.webkit:android-jsc:+'
 }

android/build.gradle

@@ -4,9 +4,10 @@ import groovy.json.JsonSlurper
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
 
@@ -15,22 +16,29 @@ buildscript {
     }
 }
 
+final reactNativePath = '/react-native/android'
+final jscAndroidPath = '/jsc-android/dist'
+
 allprojects {
     repositories {
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url findReactNative()
+            url findNodeModules() + reactNativePath
+        }
+
+        maven {
+            // Android JSC is installed from npm
+            url findNodeModules() + jscAndroidPath
         }
 
-        mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }
 
-final findReactNative() {
-    final reactNativePath = 'node_modules/react-native/android'
-    final notFoundMessage = 'Unable to find React Native. Have you run yarn from the root?'
+final findNodeModules() {
+    final reactNativePath = 'node_modules'
+    final notFoundMessage = 'Unable to find node_modules folder. Have you run yarn from the root?'
 
     def root = file("$rootDir")
     if (root == null) {
@@ -101,9 +109,5 @@ final getProjectVersion() {
 
     println "Project version: $version"
 
-    if (version.startsWith('^')) {
-        version = version.substring(1)
-    }
-
     return version
 }

android/settings.gradle

@@ -1,3 +1,7 @@
 rootProject.name = 'ReactNativeActivityDemo'
 
+// https://react-native-community.github.io/upgrade-helper/?from=0.59.10&to=0.60.0
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
+applyNativeModulesSettingsGradle(settings)
+
 include ':app'

package.json

@@ -4,14 +4,14 @@
         "type": "git",
         "url": "https://github.com/petterh/react-native-android-activity.git"
     },
-    "version": "5.0.3",
+    "version": "5.0.4",
     "private": true,
     "scripts": {
         "start": "node node_modules/react-native/local-cli/cli.js start"
     },
     "dependencies": {
-        "react": "16.8.3",
-        "react-native": "0.59.9"
+        "react": "16.8.6",
+        "react-native": "0.60.5"
     },
     "devDependencies": {
         "babel-loader": "8.0.6",