compile with RN 0.40.0

android/src/main/java/co/apptailor/Worker/JSWorker.java

@@ -39,25 +39,29 @@ public void runFromContext(ReactApplicationContext context, ReactContextBuilder
     }
 
     public void postMessage(String message) {
-        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        if(reactContext!=null){
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit("WorkerMessage", message);
+        }
     }
 
     public void onHostResume() {
-        reactContext.onHostResume(null);
+        if(reactContext!=null){
+            reactContext.onHostResume(null);
+        }
     }
 
     public void onHostPause() {
-        reactContext.onHostPause();
+        if(reactContext!=null){
+            reactContext.onHostPause();
+        }
     }
 
     public void terminate() {
-        if (reactContext == null) {
-            return;
+        if (reactContext != null) {
+            reactContext.onHostPause();
+            reactContext.destroy();
+            reactContext = null;
         }
-
-        reactContext.onHostPause();
-        reactContext.destroy();
-        reactContext = null;
     }
 }

android/src/main/java/co/apptailor/Worker/WorkerModule.java

@@ -7,7 +7,7 @@
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.cxxbridge.JSBundleLoader;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -149,7 +149,8 @@ public void onHostDestroy() {
             @Override
             public void run() {
                 for (int workerId : workers.keySet()) {
-                    workers.get(workerId).terminate();
+                    //workers.get(workerId).terminate();
+                    stopWorker(workerId);
                 }
             }
         });
@@ -177,7 +178,8 @@ private JSBundleLoader createDevBundleLoader(String jsFileName, String jsFileSlu
 
     private JSBundleLoader createReleaseBundleLoader(String jsFileName, String jsFileSlug) {
         Log.d(TAG, "createReleaseBundleLoader - reading file from assets");
-        return JSBundleLoader.createFileLoader(getReactApplicationContext(), "assets://workers/" + jsFileSlug + ".bundle");
+        //return JSBundleLoader.createFileLoader(getReactApplicationContext(), "assets://workers/" + jsFileSlug + ".bundle");
+        return JSBundleLoader.createFileLoader("assets://workers/" + jsFileSlug + ".bundle");
     }
 
     private ReactInstanceManager getReactInstanceManager() {

android/src/main/java/co/apptailor/Worker/core/ReactContextBuilder.java

@@ -2,23 +2,28 @@
 
 import android.content.Context;
 
+import com.facebook.react.EagerModuleProvider;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.CatalystInstanceImpl;
-import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSCJavaScriptExecutor;
-import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.cxxbridge.CatalystInstanceImpl;
+import com.facebook.react.cxxbridge.JSBundleLoader;
+import com.facebook.react.cxxbridge.JSCJavaScriptExecutor;
+import com.facebook.react.cxxbridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.JavaScriptModuleRegistry;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
-import com.facebook.react.bridge.NativeModuleRegistry;
+import com.facebook.react.cxxbridge.NativeModuleRegistry;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.devsupport.DevSupportManager;
 import com.facebook.soloader.SoLoader;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
 
@@ -50,7 +55,8 @@ public ReactContextBuilder setReactPackages(ArrayList<ReactPackage> reactPackage
     }
 
     public ReactApplicationContext build() throws Exception {
-        JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutor.Factory().create(new WritableNativeMap());
+        //JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutor.Factory().create(new WritableNativeMap());
+        JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutor.Factory(new WritableNativeMap()).create();
 
         // fresh new react context
         final ReactApplicationContext reactContext = new ReactApplicationContext(parentContext);
@@ -59,8 +65,9 @@ public ReactApplicationContext build() throws Exception {
         }
 
         // load native modules
-        NativeModuleRegistry.Builder nativeRegistryBuilder = new NativeModuleRegistry.Builder();
-        addNativeModules(reactContext, nativeRegistryBuilder);
+        final List<ModuleSpec> mModuleSpecList = new ArrayList<>();
+        //NativeModuleRegistry.Builder nativeRegistryBuilder = new NativeModuleRegistry.Builder();
+        addNativeModules(reactContext,mModuleSpecList); //, nativeRegistryBuilder);
 
         // load js modules
         JavaScriptModuleRegistry.Builder jsModulesBuilder = new JavaScriptModuleRegistry.Builder();
@@ -69,7 +76,10 @@ public ReactApplicationContext build() throws Exception {
         CatalystInstanceImpl.Builder catalystInstanceBuilder = new CatalystInstanceImpl.Builder()
                 .setReactQueueConfigurationSpec(ReactQueueConfigurationSpec.createDefault())
                 .setJSExecutor(jsExecutor)
-                .setRegistry(nativeRegistryBuilder.build())
+                //.setRegistry(nativeRegistryBuilder.build())
+                .setRegistry(new NativeModuleRegistry(
+                  mModuleSpecList,
+                  Collections.<Class, ReactModuleInfo>emptyMap()))
                 .setJSModuleRegistry(jsModulesBuilder.build())
                 .setJSBundleLoader(jsBundleLoader)
                 .setNativeModuleCallExceptionHandler(devSupportManager != null
@@ -134,11 +144,13 @@ private void addJSModules(JavaScriptModuleRegistry.Builder jsModulesBuilder) {
         }
     }
 
-    private void addNativeModules(ReactApplicationContext reactContext, NativeModuleRegistry.Builder nativeRegistryBuilder) {
+    private void addNativeModules(ReactApplicationContext reactContext,List<ModuleSpec> mModuleSpecList) { //, NativeModuleRegistry.Builder nativeRegistryBuilder) {
         for (int i = 0; i < reactPackages.size(); i++) {
             ReactPackage reactPackage = reactPackages.get(i);
             for (NativeModule nativeModule : reactPackage.createNativeModules(reactContext)) {
-                nativeRegistryBuilder.add(nativeModule);
+                //nativeRegistryBuilder.add(nativeModule);
+                ModuleSpec ms = new ModuleSpec(nativeModule.getClass(), new EagerModuleProvider(nativeModule));
+                mModuleSpecList.add(ms);
             }
         }
     }

android/src/main/java/co/apptailor/Worker/core/UIManagerStubModule.java

@@ -1,5 +1,6 @@
 package co.apptailor.Worker.core;
 
+import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 
@@ -8,7 +9,7 @@ public class UIManagerStubModule extends ReactContextBaseJavaModule {
     public UIManagerStubModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
-
+    @ReactMethod
     @Override
     public String getName() {
         return "UIManager";

ios/Workers/WorkerManager.h

@@ -2,7 +2,7 @@
 #ifndef WorkerManager_h
 #define WorkerManager_h
 
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 
 @interface WorkerManager : NSObject <RCTBridgeModule>
 @end

ios/Workers/WorkerManager.m

@@ -1,10 +1,10 @@
 #import "WorkerManager.h"
 #import "WorkerSelfManager.h"
 #include <stdlib.h>
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTEventDispatcher.h"
-#import "RCTBundleURLProvider.h"
+#import <React/RCTBridge.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTBundleURLProvider.h>
 
 @implementation WorkerManager
 
@@ -25,11 +25,10 @@ @implementation WorkerManager
 
   int workerId = abs(arc4random());
 
-  NSURL *workerURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:name fallbackResource:nil];
-  NSLog(@"starting Worker %@", [workerURL absoluteString]);
-
-
-   RCTBridge *workerBridge = [[RCTBridge alloc] initWithBundleURL:workerURL
+  //NSURL *workerURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:name fallbackResource:nil];
+  NSURL *workerURL = [[NSBundle mainBundle] URLForResource:name withExtension:@"js"];
+  //NSLog(@"starting Worker %@", [workerURL absoluteString]);
+  RCTBridge *workerBridge = [[RCTBridge alloc] initWithBundleURL:workerURL
                                             moduleProvider:nil
                                              launchOptions:nil];
 

ios/Workers/WorkerSelfManager.h

@@ -2,7 +2,7 @@
 #ifndef WorkerSelfManager_h
 #define WorkerSelfManager_h
 
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 
 @interface WorkerSelfManager : NSObject <RCTBridgeModule>
 @property int workerId;

ios/Workers/WorkerSelfManager.m

@@ -1,8 +1,8 @@
 #import "WorkerSelfManager.h"
 #include <stdlib.h>
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTEventDispatcher.h"
+#import <React/RCTBridge.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTEventDispatcher.h>
 
 @implementation WorkerSelfManager
 
@@ -21,8 +21,7 @@ @implementation WorkerSelfManager
 
   NSString *eventName = [NSString stringWithFormat:@"Worker%i", self.workerId];
 
-  [self.parentBridge.eventDispatcher sendAppEventWithName:eventName
-                                               body:message];
+  [self.parentBridge.eventDispatcher sendAppEventWithName:eventName body:message];
 }
 
-@end
+@end