Commit 0924cf69 authored by Travis Nuttall's avatar Travis Nuttall

fix naming for react-native link

turns out react-native link takes the first file that implements
ReactPackage, so RNThreadPackage must come before BaseReactPackage
alphabetically.  Prefixed it with Thread so RNThreadPackage comes first.
parent ecb4030d
...@@ -69,4 +69,4 @@ public class JSThread { ...@@ -69,4 +69,4 @@ public class JSThread {
reactContext.destroy(); reactContext.destroy();
reactContext = null; reactContext = null;
} }
} }
\ No newline at end of file
...@@ -63,7 +63,7 @@ public class RNThreadModule extends ReactContextBaseJavaModule implements Lifecy ...@@ -63,7 +63,7 @@ public class RNThreadModule extends ReactContextBaseJavaModule implements Lifecy
try { try {
ArrayList<ReactPackage> threadPackages = new ArrayList<ReactPackage>(Arrays.asList(additionalThreadPackages)); ArrayList<ReactPackage> threadPackages = new ArrayList<ReactPackage>(Arrays.asList(additionalThreadPackages));
threadPackages.add(0, new BaseReactPackage(getReactInstanceManager())); threadPackages.add(0, new ThreadBaseReactPackage(getReactInstanceManager()));
ReactContextBuilder threadContextBuilder = new ReactContextBuilder(getReactApplicationContext()) ReactContextBuilder threadContextBuilder = new ReactContextBuilder(getReactApplicationContext())
.setJSBundleLoader(bundleLoader) .setJSBundleLoader(bundleLoader)
...@@ -213,4 +213,4 @@ public class RNThreadModule extends ReactContextBaseJavaModule implements Lifecy ...@@ -213,4 +213,4 @@ public class RNThreadModule extends ReactContextBaseJavaModule implements Lifecy
throw new RuntimeException("Exception downloading thread script to file", e); throw new RuntimeException("Exception downloading thread script to file", e);
} }
} }
} }
\ No newline at end of file
...@@ -133,4 +133,4 @@ public class ReactContextBuilder { ...@@ -133,4 +133,4 @@ public class ReactContextBuilder {
} }
} }
} }
} }
\ No newline at end of file
...@@ -23,11 +23,11 @@ import java.util.ArrayList; ...@@ -23,11 +23,11 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class BaseReactPackage implements ReactPackage { public class ThreadBaseReactPackage implements ReactPackage {
private final ReactInstanceManager reactInstanceManager; private final ReactInstanceManager reactInstanceManager;
public BaseReactPackage(ReactInstanceManager reactInstanceManager) { public ThreadBaseReactPackage(ReactInstanceManager reactInstanceManager) {
this.reactInstanceManager = reactInstanceManager; this.reactInstanceManager = reactInstanceManager;
} }
...@@ -59,4 +59,4 @@ public class BaseReactPackage implements ReactPackage { ...@@ -59,4 +59,4 @@ public class BaseReactPackage implements ReactPackage {
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) { public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
return new ArrayList<>(0); return new ArrayList<>(0);
} }
} }
\ No newline at end of file
...@@ -31,4 +31,4 @@ public class ThreadSelfModule extends ReactContextBaseJavaModule { ...@@ -31,4 +31,4 @@ public class ThreadSelfModule extends ReactContextBaseJavaModule {
parentContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) parentContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
.emit("Thread" + String.valueOf(threadId), data); .emit("Thread" + String.valueOf(threadId), data);
} }
} }
\ No newline at end of file
...@@ -13,4 +13,4 @@ public class UIManagerStubModule extends ReactContextBaseJavaModule { ...@@ -13,4 +13,4 @@ public class UIManagerStubModule extends ReactContextBaseJavaModule {
public String getName() { public String getName() {
return "UIManager"; return "UIManager";
} }
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment