Compile with new react-native version from 0.40

.gitignore

@@ -4,7 +4,7 @@
 
 # Xcode
 #
-build/
+# build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -31,7 +31,7 @@ local.properties
 local.properties
 .idea/workspace.xml
 .idea/libraries
-build
+# build
 captures
 
 # Built application files

.npmignore

@@ -8,7 +8,7 @@ example
 
 # Xcode
 #
-build/
+# build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -35,7 +35,7 @@ local.properties
 local.properties
 .idea/workspace.xml
 .idea/libraries
-build
+# build
 captures
 
 # node.js

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

@@ -7,13 +7,13 @@
 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;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.devsupport.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -66,6 +66,7 @@ public void startWorker(final String jsFileName, final Promise promise) {
             ReactContextBuilder workerContextBuilder = new ReactContextBuilder(getReactApplicationContext())
                     .setJSBundleLoader(bundleLoader)
                     .setDevSupportManager(getDevSupportManager())
+                    .setReactInstanceManager(getReactInstanceManager())
                     .setReactPackages(workerPackages);
 
             JSWorker worker = new JSWorker(jsFileSlug);
@@ -134,9 +135,9 @@ public void onHostPause() {
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {
-                for (int workerId : workers.keySet()) {
-                    workers.get(workerId).onHostPause();
-                }
+                // for (int workerId : workers.keySet()) {
+                //     workers.get(workerId).onHostPause();
+                // }
             }
         });
     }
@@ -177,7 +178,7 @@ 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("assets://workers/" + jsFileSlug + ".bundle");
     }
 
     private ReactInstanceManager getReactInstanceManager() {

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

@@ -43,7 +43,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext catalystAp
                 new ExceptionsManagerModule(reactInstanceManager.getDevSupportManager()),
                 new Timing(catalystApplicationContext, reactInstanceManager.getDevSupportManager()),
                 new UIManagerStubModule(catalystApplicationContext),
-                new SourceCodeModule(reactInstanceManager.getSourceUrl()),
+                new SourceCodeModule(catalystApplicationContext),
                 new JSCHeapCapture(catalystApplicationContext),
 
                 // Main list

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

@@ -2,21 +2,23 @@
 
 import android.content.Context;
 
+import com.facebook.react.NativeModuleRegistryBuilder;
 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.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.ReactInstanceManager;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
-import com.facebook.react.devsupport.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.soloader.SoLoader;
 
 import java.util.ArrayList;
@@ -27,6 +29,7 @@ public class ReactContextBuilder {
     private Context parentContext;
     private JSBundleLoader jsBundleLoader;
     private DevSupportManager devSupportManager;
+    private ReactInstanceManager instanceManager;
     private ArrayList<ReactPackage> reactPackages;
 
     public ReactContextBuilder(Context context) {
@@ -44,13 +47,18 @@ public ReactContextBuilder setDevSupportManager(DevSupportManager devSupportMana
         return this;
     }
 
+    public ReactContextBuilder setReactInstanceManager(ReactInstanceManager manager) {
+        this.instanceManager = manager;
+        return this;
+    }
+
     public ReactContextBuilder setReactPackages(ArrayList<ReactPackage> reactPackages) {
         this.reactPackages = reactPackages;
         return this;
     }
 
     public ReactApplicationContext build() throws Exception {
-        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,7 +67,7 @@ public ReactApplicationContext build() throws Exception {
         }
 
         // load native modules
-        NativeModuleRegistry.Builder nativeRegistryBuilder = new NativeModuleRegistry.Builder();
+        NativeModuleRegistryBuilder nativeRegistryBuilder = new NativeModuleRegistryBuilder(reactContext, this.instanceManager, false);
         addNativeModules(reactContext, nativeRegistryBuilder);
 
         // load js modules
@@ -134,12 +142,12 @@ private void addJSModules(JavaScriptModuleRegistry.Builder jsModulesBuilder) {
         }
     }
 
-    private void addNativeModules(ReactApplicationContext reactContext, NativeModuleRegistry.Builder nativeRegistryBuilder) {
+    private void addNativeModules(ReactApplicationContext reactContext, NativeModuleRegistryBuilder nativeRegistryBuilder) {
         for (int i = 0; i < reactPackages.size(); i++) {
             ReactPackage reactPackage = reactPackages.get(i);
             for (NativeModule nativeModule : reactPackage.createNativeModules(reactContext)) {
-                nativeRegistryBuilder.add(nativeModule);
+                nativeRegistryBuilder.addNativeModule(nativeModule);
             }
         }
     }
-}
+}

ios/Workers/WorkerManager.m

@@ -1,7 +1,7 @@
 #import "WorkerManager.h"
 #import "WorkerSelfManager.h"
 #include <stdlib.h>
-#import "RCTBridge.h"
+#import "React/RCTBridge.h"
 #import "RCTBridge+Private.h"
 #import "RCTEventDispatcher.h"
 #import "RCTBundleURLProvider.h"

ios/Workers/WorkerSelfManager.m

@@ -1,6 +1,6 @@
 #import "WorkerSelfManager.h"
 #include <stdlib.h>
-#import "RCTBridge.h"
+#import "React/RCTBridge.h"
 #import "RCTBridge+Private.h"
 #import "RCTEventDispatcher.h"
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-workers",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "react native web workers",
   "main": "index.js",
   "scripts": {