Update apps to use React Native 0.22

React is now a peer dependency, which means we need to add it to our package.json for npm v3 to work properly.

examples/ReactExample/package.json

@@ -6,7 +6,8 @@
     "start": "react-native start"
   },
   "dependencies": {
-    "react-native": "^0.21.0",
+    "react": "^0.14.5",
+    "react-native": "^0.22.0",
     "realm": "file:../.."
   }
 }

examples/ReactNativeBenchmarks/package.json

@@ -6,7 +6,8 @@
     "start": "react-native start"
   },
   "dependencies": {
-    "react-native": "^0.21.0",
+    "react": "^0.14.5",
+    "react-native": "^0.22.0",
     "react-native-sqlite-storage": "^2.1.3",
     "react-native-store": "^0.4.1",
     "realm": "file:../.."

react-native/android/build.gradle

@@ -12,6 +12,10 @@ allprojects {
     repositories {
         mavenLocal()
         jcenter()
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "$projectDir/../../tests/react-test-app/node_modules/react-native/android"
+        }
     }
 }
 
@@ -287,9 +291,8 @@ afterEvaluate { project ->
     }
 }
 
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'org.nanohttpd:nanohttpd:2.2.0'
-    compile 'com.facebook.react:react-native:0.20.+'
+    compile 'com.facebook.react:react-native:+'  // From node_modules
 }

react-native/android/publish_android_template

@@ -11,6 +11,10 @@ allprojects {
     repositories {
         mavenLocal()
         jcenter()
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "$projectDir/../../react-native/android"
+        }
     }
 }
 
@@ -51,5 +55,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'org.nanohttpd:nanohttpd:2.2.0'
-    compile 'com.facebook.react:react-native:0.20.+'
+    compile 'com.facebook.react:react-native:+'  // From node_modules
 }

tests/react-test-app/android/build.gradle

@@ -6,7 +6,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.1'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,8 +16,9 @@ allprojects {
     repositories {
         mavenLocal()
         jcenter()
-        jcenter {
-            url "http://dl.bintray.com/mkonicek/maven"
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "$projectDir/../../node_modules/react-native/android"
         }
     }
 }

tests/react-test-app/package.json

@@ -6,7 +6,8 @@
     "start": "react-native start"
   },
   "dependencies": {
-    "react-native": "^0.21.0",
+    "react": "^0.14.5",
+    "react-native": "^0.22.0",
     "react-native-fs": "^1.1.0",
     "xmlbuilder": "^4.2.1",
     "realm": "file:../..",