[tests][bridge][android] wip switch to npm version

tests-new/android/app/build.gradle

@@ -87,9 +87,7 @@ dependencies {
     transitive = false
   }
 
-  implementation(project(':react-native-restart')) {
+  implementation project(':bridge')
-    transitive = false
-  }
 
   compile fileTree(dir: "libs", include: ["*.jar"])
   compile "com.google.android.gms:play-services-base:$firebaseVersion"

tests-new/android/app/src/main/java/com/testing/MainApplication.java

@@ -8,8 +8,8 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 
+import io.invertase.bridge.RNBridgePackage;
 import io.invertase.firebase.RNFirebasePackage;
-import com.avishayil.rnrestart.ReactNativeRestartPackage;
 import io.invertase.firebase.admob.RNFirebaseAdMobPackage;
 import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage;
 import io.invertase.firebase.auth.RNFirebaseAuthPackage;
@@ -41,7 +41,7 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
         new MainReactPackage(),
-        new ReactNativeRestartPackage(),
+        new RNBridgePackage(),
         new RNFirebasePackage(),
         new RNFirebaseAdMobPackage(),
         new RNFirebaseAnalyticsPackage(),
@@ -70,7 +70,6 @@ public class MainApplication extends Application implements ReactApplication {
   @Override
   public void onCreate() {
     super.onCreate();
-    getReactNativeHost().getReactInstanceManager().getDevSupportManager().getDevSettings().setRemoteJSDebugEnabled(true);
     SoLoader.init(this, /* native exopackage */ false);
   }
 

tests-new/android/settings.gradle

@@ -3,8 +3,8 @@ rootProject.name = 'RNFTests'
 include ':react-native-firebase'
 project(':react-native-firebase').projectDir = new File(rootProject.projectDir, './../../android')
 
-include ':react-native-restart'
+include ':bridge'
-project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
+project(':bridge').projectDir = new File(rootProject.projectDir, '../node_modules/bridge/android')
 
 include ':app'
 

tests-new/app.js

@@ -9,7 +9,7 @@
 import React, { Component } from 'react';
 import { AppRegistry, Text, View } from 'react-native';
 
-import bridge from './bridge/env/rn';
+import bridge from 'bridge/platform/react-native';
 import firebase from './firebase';
 
 require('sinon');

tests-new/bridge/env/node/vm.js

@@ -26,9 +26,9 @@ function handleError(message) {
   throw new Error(message);
 }
 
-async function downloadUrl(url) {
+async function downloadUrl(fileUrl) {
   const res = await new Promise((resolve, reject) =>
-    http.get(url, resolve).on('error', reject)
+    http.get(fileUrl, resolve).on('error', reject)
   );
 
   let buffer = '';
@@ -60,11 +60,7 @@ async function downloadBundle(bundleUrl) {
 
 async function getBundle(request) {
   if (bundle) return bundle;
-  console.log(
+  console.log(`${chalk.blue('[bridge]')} debugger connected`);
-    `${chalk.blue(
-      '[bridge]'
-    )} debugger has connected! Downloading app JS bundle...`
-  );
 
   const parsedUrl = url.parse(request.url, true);
   invariant(parsedUrl.query);

tests-new/e2e/mocha.opts

@@ -3,4 +3,4 @@
 --slow 2200
 --bail
 --exit
---require ./bridge/env/node
+--require bridge/platform/node

tests-new/package.json

@@ -26,7 +26,6 @@
     "mocha": "^4.0.1",
     "react": "^16.2.0",
     "react-native": "^0.52.3",
-    "react-native-restart": "0.0.6",
     "should": "^13.2.1",
     "should-sinon": "0.0.6",
     "sinon": "^4.4.8",