Merge pull request joltup#98 from jacobp100/master

Autolinking & 0.62 support
AtomicFinance · May 4, 2020 · 4bfb000 · 4bfb000
2 parents 5e57764 + ebff1b3
commit 4bfb000
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/android/src/main/java/com/reactlibrary/ThreadBaseReactPackage.java b/android/src/main/java/com/reactlibrary/ThreadBaseReactPackage.java
@@ -7,7 +7,7 @@
 import com.facebook.react.devsupport.JSCHeapCapture;
 import com.facebook.react.modules.appstate.AppStateModule;
 import com.facebook.react.modules.core.ExceptionsManagerModule;
-import com.facebook.react.modules.core.Timing;
+import com.facebook.react.modules.core.TimingModule;
 import com.facebook.react.modules.debug.SourceCodeModule;
 import com.facebook.react.modules.intent.IntentModule;
 import com.facebook.react.modules.network.NetworkingModule;
@@ -37,7 +37,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext catalystAp
                 new AndroidInfoModule(catalystApplicationContext),
                 new ExceptionsManagerModule(reactInstanceManager.getDevSupportManager()),
                 new AppStateModule(catalystApplicationContext),
-                new Timing(catalystApplicationContext, reactInstanceManager.getDevSupportManager()),
+                new TimingModule(catalystApplicationContext, reactInstanceManager.getDevSupportManager()),
                 new UIManagerStubModule(catalystApplicationContext),
                 new SourceCodeModule(catalystApplicationContext),
                 new JSCHeapCapture(catalystApplicationContext),
@@ -49,7 +49,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext catalystAp
                 new VibrationModule(catalystApplicationContext),
                 new WebSocketModule(catalystApplicationContext),
                 new ThreadSelfModule(catalystApplicationContext),
-                new DevSettingsModule(reactInstanceManager.getDevSupportManager())
+                new DevSettingsModule(catalystApplicationContext, reactInstanceManager.getDevSupportManager())
         );
     }
 

diff --git a/react-native.config.js b/react-native.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        packageInstance: 'new RNThreadPackage(reactNativeHost)',
+      },
+    },
+  },
+};