Upgrade to RN 0.60.5 (#16)

Author: petterh

.gitignore

@@ -23,6 +23,9 @@ DerivedData
 *.ipa
 *.xcuserstate
 
+# CocoaPods
+ios/Pods/
+
 # Android/IntelliJ
 #
 build/
@@ -52,3 +55,6 @@ buck-out/
 fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
+
+# Visual Studio Code
+.vscode/

README.md

@@ -43,7 +43,7 @@ The `TextInput` box appears only in the Android version. Since both platforms us
   `git clone https://github.com/petterh/react-native-android-activity.git`\
   (Alternatively, create your own fork and clone that instead.)
 * `cd react-native-android-activity`
-* Run `yarn` to download dependencies
+* Run `yarn` to download dependencies (or, if you wish, `npm install`)
 * For Android development (using Windows, Mac or Linux), install [Android Studio](https://developer.android.com/studio/install.html) (follow instructions [on this page](https://facebook.github.io/react-native/docs/getting-started.html)).
 * For iOS development (Mac only), install [Xcode](https://developer.apple.com/xcode/).
 * By default, the debug build of the app loads the JS bundle from your dev box, so start a bundler:
@@ -63,7 +63,8 @@ The `TextInput` box appears only in the Android version. Since both platforms us
 
 ### iOS
 
-* Open the xOS project in Xcode and run it. This automatically starts a bundler.
+* Open the iOS project in Xcode: `open Activity.xcworkspace`.
+* Run the Activity application.
 
 <!-- markdownlint-enable MD031 -->
 

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'

ios.yaml

@@ -20,12 +20,16 @@ steps:
     command: 'install'
   displayName: 'npm install'
 
+- task: CocoaPods@0
+  inputs:
+    workingDirectory: 'ios'
+    forceRepoUpdate: false
 - task: Xcode@5
   inputs:
     actions: 'build'
     args: '-UseModernBuildSystem=NO'
     configuration: 'Debug'
     scheme: 'Activity'
     sdk: 'iphoneos'
-    xcWorkspacePath: '**/Activity.xcodeproj/project.xcworkspace'
+    xcWorkspacePath: '**/Activity.xcworkspace'
     xcodeVersion: 'default' # Options: 8, 9, 10, default, specifyPath