expo-modules-core 1.11.13 → 1.12.1

package/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java

@@ -2,18 +2,13 @@ package expo.modules.adapters.react;
 
 import android.util.SparseArray;
 
-import com.facebook.react.bridge.Dynamic;
 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.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableType;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,9 +16,7 @@ import java.util.Objects;
 
 import javax.annotation.Nullable;
 
-import expo.modules.core.ExportedModule;
 import expo.modules.core.ModuleRegistry;
-import expo.modules.core.interfaces.ExpoMethod;
 import expo.modules.kotlin.CoreLoggerKt;
 import expo.modules.kotlin.ExpoModulesHelper;
 import expo.modules.kotlin.KPromiseWrapper;
@@ -31,7 +24,7 @@ import expo.modules.kotlin.KotlinInteropModuleRegistry;
 import expo.modules.kotlin.ModulesProvider;
 
 /**
- * A wrapper/proxy for all {@link ExportedModule}s, gets exposed as {@link com.facebook.react.bridge.NativeModule},
+ * A wrapper/proxy for all {@link expo.modules.kotlin.modules.Module}s, gets exposed as {@link com.facebook.react.bridge.NativeModule},
  * so that JS code can call methods of the internal modules.
  */
 public class NativeModulesProxy extends ReactContextBaseJavaModule {
@@ -42,11 +35,9 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
 
   private final static String METHOD_INFO_KEY = "key";
   private final static String METHOD_INFO_NAME = "name";
-  private final static String METHOD_INFO_ARGUMENTS_COUNT = "argumentsCount";
 
   private final static String UNEXPECTED_ERROR = "E_UNEXPECTED_ERROR";
   private final static String UNDEFINED_METHOD_ERROR = "E_UNDEFINED_METHOD";
-  private final static String ARGS_TYPES_MISMATCH_ERROR = "E_ARGS_TYPES_MISMATCH";
 
   private ModuleRegistry mModuleRegistry;
   private Map<String, Map<String, Integer>> mExportedMethodsKeys;
@@ -102,30 +93,9 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
     kotlinModuleRegistry.emitOnCreate();
     kotlinModuleRegistry.installJSIInterop();
 
-    Collection<ExportedModule> exportedModules = mModuleRegistry.getAllExportedModules();
-
-    Map<String, Object> modulesConstants = new HashMap<>(exportedModules.size());
-    Map<String, Object> exportedMethodsMap = new HashMap<>(exportedModules.size());
-
-    for (ExportedModule exportedModule : exportedModules) {
-      String moduleName = exportedModule.getName();
-      modulesConstants.put(moduleName, exportedModule.getConstants());
-
-      List<Map<String, Object>> exportedMethods = transformExportedMethodsMap(exportedModule.getExportedMethods());
-      assignExportedMethodsKeys(moduleName, exportedMethods);
-
-      exportedMethodsMap.put(moduleName, exportedMethods);
-    }
-
-    modulesConstants.putAll(mKotlinInteropModuleRegistry.exportedModulesConstants());
-    exportedMethodsMap.putAll(mKotlinInteropModuleRegistry.exportMethods((name, info) -> {
-      assignExportedMethodsKeys(name, (List<Map<String, Object>>) info);
-      return null;
-    }));
-
     Map<String, Object> constants = new HashMap<>(3);
-    constants.put(MODULES_CONSTANTS_KEY, modulesConstants);
-    constants.put(EXPORTED_METHODS_KEY, exportedMethodsMap);
+    constants.put(MODULES_CONSTANTS_KEY, new HashMap<>());
+    constants.put(EXPORTED_METHODS_KEY, new HashMap<>());
     constants.put(VIEW_MANAGERS_METADATA_KEY, mKotlinInteropModuleRegistry.viewManagersMetadata());
 
     CoreLoggerKt.getLogger().info("✅ Constants were exported");
@@ -136,26 +106,16 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
   }
 
   /**
-   * The only exported {@link ReactMethod}.
+   * The only exported {@link ReactMethod} for legacy NativeUnimoduleProxy.
+   * This is used only when JSI is not available. i.e. the legacy remote debugging.
    * JavaScript can call native modules' exported methods ({@link ExpoMethod}) using this method as a proxy.
    * For native {@link ExpoMethod} `void put(String key, int value)` in `NativeDictionary` module
-   * JavaScript could call `NativeModulesProxy.callMethod("NativeDictionary", "put", ["key", 42])`
-   * or `NativeModulesProxy.callMethod("NativeDictionary", 2, ["key", 42])`, where the second argument
+   * JavaScript could call `NativeModulesProxy.callMethod("NativeDictionary", 2, ["key", 42])`, where the second argument
    * is a method's constant key.
    */
   @ReactMethod
-  public void callMethod(String moduleName, Dynamic methodKeyOrName, ReadableArray arguments, final Promise promise) {
-    String methodName;
-    if (methodKeyOrName.getType() == ReadableType.String) {
-      methodName = methodKeyOrName.asString();
-    } else if (methodKeyOrName.getType() == ReadableType.Number) {
-      methodName = mExportedMethodsReverseKeys.get(moduleName).get(methodKeyOrName.asInt());
-    } else {
-      promise.reject(UNEXPECTED_ERROR, "Method key is neither a String nor an Integer -- don't know how to map it to method name.");
-      return;
-    }
-
-    callMethod(moduleName, methodName, arguments, promise);
+  public void callMethod(String moduleName, int methodKey, ReadableArray arguments, final Promise promise) {
+    callMethod(moduleName, mExportedMethodsReverseKeys.get(moduleName).get(methodKey), arguments, promise);
   }
 
   public void callMethod(String moduleName, String methodName, ReadableArray arguments, final Promise promise) {
@@ -164,57 +124,10 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
       return;
     }
 
-    try {
-      List<Object> nativeArguments = getNativeArgumentsForMethod(arguments, mModuleRegistry.getExportedModule(moduleName).getExportedMethodInfos().get(methodName));
-      nativeArguments.add(new PromiseWrapper(promise));
-
-      mModuleRegistry.getExportedModule(moduleName).invokeExportedMethod(methodName, nativeArguments);
-    } catch (IllegalArgumentException e) {
-      promise.reject(ARGS_TYPES_MISMATCH_ERROR, e.getMessage(), e);
-    } catch (RuntimeException e) {
-      promise.reject(UNEXPECTED_ERROR, "Encountered an exception while calling native method: " + e.getMessage(), e);
-    } catch (NoSuchMethodException e) {
-      promise.reject(
-        UNDEFINED_METHOD_ERROR,
-        "Method " + methodName + " of Java module " + moduleName + " is undefined.",
-        e
-      );
-    }
-  }
-
-  /**
-   * Converts {@link ReadableArray} of arguments into a list of Java Objects.
-   * Throws {@link RuntimeException} if it can't convert some {@link ReadableType} to Object.
-   * Method is used when converting Double to proper argument.
-   */
-  private static List<Object> getNativeArgumentsForMethod(ReadableArray arguments, ExportedModule.MethodInfo methodInfo) {
-    List<Object> nativeArguments = new ArrayList<>();
-
-    for (int i = 0; i < arguments.size(); i++) {
-      nativeArguments.add(ArgumentsHelper.getNativeArgumentForExpectedClass(arguments.getDynamic(i), methodInfo.getParameterTypes()[i]));
-    }
-    return nativeArguments;
-  }
-
-  /**
-   * Transforms exportedMethodsMap to a map of methodInfos
-   */
-  private List<Map<String, Object>> transformExportedMethodsMap(Map<String, Method> exportedMethods) {
-    List<Map<String, Object>> methods = new ArrayList<>(exportedMethods.size());
-    for (Map.Entry<String, Method> entry : exportedMethods.entrySet()) {
-      methods.add(getMethodInfo(entry.getKey(), entry.getValue()));
-    }
-    return methods;
-  }
-
-  /**
-   * Returns methodInfo Map (a Map containing a value for key argumentsCount).
-   */
-  private Map<String, Object> getMethodInfo(String name, Method method) {
-    Map<String, Object> info = new HashMap<>(2);
-    info.put(METHOD_INFO_NAME, name);
-    info.put(METHOD_INFO_ARGUMENTS_COUNT, method.getParameterTypes().length - 1); // - 1 is for the Promise
-    return info;
+    promise.reject(
+      UNDEFINED_METHOD_ERROR,
+      "Method " + methodName + " of Java module " + moduleName + " is undefined."
+    );
   }
 
   /**
@@ -252,7 +165,8 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
+    super.invalidate();
     mModuleRegistry.onDestroy();
     mKotlinInteropModuleRegistry.onDestroy();
   }

package/android/src/main/java/expo/modules/adapters/react/ReactAdapterPackage.java

@@ -4,8 +4,10 @@ import android.content.Context;
 
 import com.facebook.react.bridge.ReactContext;
 
+import java.util.Arrays;
+import java.util.List;
+
 import expo.modules.adapters.react.permissions.PermissionsService;
-import expo.modules.adapters.react.services.CookieManagerModule;
 import expo.modules.adapters.react.services.EventEmitterModule;
 import expo.modules.adapters.react.services.FontManagerModule;
 import expo.modules.adapters.react.services.RuntimeEnvironmentModule;
@@ -14,9 +16,6 @@ import expo.modules.core.BasePackage;
 import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.Package;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * A {@link Package} creating modules provided with the @unimodules/react-native-adapter package.
  */
@@ -27,7 +26,6 @@ public class ReactAdapterPackage extends BasePackage {
     // We can force-cast here, because this package will only be used in React Native context.
     ReactContext reactContext = (ReactContext) context;
     return Arrays.asList(
-        new CookieManagerModule(reactContext),
         new UIManagerModuleWrapper(reactContext),
         new EventEmitterModule(reactContext),
         new FontManagerModule(),

package/android/src/main/java/expo/modules/adapters/react/ReactModuleRegistryProvider.java

@@ -5,19 +5,17 @@ import android.content.Context;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactApplicationContext;
 
-import expo.modules.core.ExportedModule;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
 import expo.modules.core.ModuleRegistry;
 import expo.modules.core.ModuleRegistryProvider;
-import expo.modules.core.ViewManager;
 import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.Package;
 import expo.modules.core.interfaces.SingletonModule;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
 /**
  * Since React Native v0.55, {@link com.facebook.react.ReactPackage#createViewManagers(ReactApplicationContext)}
  * gets called only once per lifetime of {@link com.facebook.react.ReactInstanceManager}.
@@ -27,7 +25,6 @@ import java.util.List;
  * only once (and managers returned this one time will persist "forever").
  */
 public class ReactModuleRegistryProvider extends ModuleRegistryProvider {
-  private Collection<ViewManager> mViewManagers;
   private Collection<com.facebook.react.uimanager.ViewManager> mReactViewManagers;
   private Collection<SingletonModule> mSingletonModules;
 
@@ -43,13 +40,11 @@ public class ReactModuleRegistryProvider extends ModuleRegistryProvider {
   @Override
   public ModuleRegistry get(Context context) {
     Collection<InternalModule> internalModules = new ArrayList<>();
-    Collection<ExportedModule> exportedModules = new ArrayList<>();
 
     ReactPackagesProvider reactPackagesProvider = new ReactPackagesProvider();
 
     for (Package pkg : getPackages()) {
       internalModules.addAll(pkg.createInternalModules(context));
-      exportedModules.addAll(pkg.createExportedModules(context));
 
       if (pkg instanceof ReactPackage) {
         reactPackagesProvider.addPackage((ReactPackage) pkg);
@@ -57,7 +52,7 @@ public class ReactModuleRegistryProvider extends ModuleRegistryProvider {
     }
     internalModules.add(reactPackagesProvider);
 
-    return new ModuleRegistry(internalModules, exportedModules, getViewManagers(context), getSingletonModules(context));
+    return new ModuleRegistry(internalModules, getSingletonModules(context));
   }
 
   private Collection<SingletonModule> getSingletonModules(Context context) {
@@ -74,17 +69,6 @@ public class ReactModuleRegistryProvider extends ModuleRegistryProvider {
     return singletonModules;
   }
 
-  // TODO: change access to package private when react-native-adapter was removed.
-  public Collection<ViewManager> getViewManagers(Context context) {
-    if (mViewManagers != null) {
-      return mViewManagers;
-    }
-
-    mViewManagers = new HashSet<>();
-    mViewManagers.addAll(createViewManagers(context));
-    return mViewManagers;
-  }
-
   // TODO: change access to package private when react-native-adapter was removed.
   public Collection<com.facebook.react.uimanager.ViewManager> getReactViewManagers(ReactApplicationContext context) {
     if (mReactViewManagers != null) {

package/android/src/main/java/expo/modules/adapters/react/apploader/RNHeadlessAppLoader.kt

@@ -2,7 +2,9 @@ package expo.modules.adapters.react.apploader
 
 import android.content.Context
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactInstanceManager
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.LifecycleState
 import expo.modules.apploader.HeadlessAppLoader
 import expo.modules.core.interfaces.Consumer
@@ -22,10 +24,12 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     if (context.applicationContext is ReactApplication) {
       val reactInstanceManager = (context.applicationContext as ReactApplication).reactNativeHost.reactInstanceManager
       if (!appRecords.containsKey(params.appScopeKey)) {
-        reactInstanceManager.addReactInstanceEventListener {
-          HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
-          callback?.apply(true)
-        }
+        reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
+          override fun onReactContextInitialized(context: ReactContext) {
+            HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
+            callback?.apply(true)
+          }
+        })
         appRecords[params.appScopeKey] = reactInstanceManager
         if (reactInstanceManager.hasStartedCreatingInitialContext()) {
           reactInstanceManager.recreateReactContextInBackground()

package/android/src/main/java/expo/modules/adapters/react/services/EventEmitterModule.java

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 

package/android/src/main/java/expo/modules/adapters/react/services/UIManagerModuleWrapper.java

@@ -15,6 +15,7 @@ import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -28,10 +29,10 @@ import expo.modules.core.interfaces.LifecycleEventListener;
 import expo.modules.core.interfaces.services.UIManager;
 
 public class UIManagerModuleWrapper implements
-    ActivityProvider,
-    InternalModule,
-    JavaScriptContextProvider,
-    UIManager {
+  ActivityProvider,
+  InternalModule,
+  JavaScriptContextProvider,
+  UIManager {
   private ReactContext mReactContext;
   private Map<LifecycleEventListener, com.facebook.react.bridge.LifecycleEventListener> mLifecycleListenersMap = new WeakHashMap<>();
   private Map<ActivityEventListener, com.facebook.react.bridge.ActivityEventListener> mActivityEventListenersMap = new WeakHashMap<>();
@@ -47,9 +48,9 @@ public class UIManagerModuleWrapper implements
   @Override
   public List<Class> getExportedInterfaces() {
     return Arrays.<Class>asList(
-        ActivityProvider.class,
-        JavaScriptContextProvider.class,
-        UIManager.class
+      ActivityProvider.class,
+      JavaScriptContextProvider.class,
+      UIManager.class
     );
   }
 
@@ -67,7 +68,7 @@ public class UIManagerModuleWrapper implements
               block.resolve(tClass.cast(view));
             } else {
               block.reject(new IllegalStateException(
-                  "Expected view to be of " + tClass + "; found " + view.getClass() + " instead"));
+                "Expected view to be of " + tClass + "; found " + view.getClass() + " instead"));
             }
           } catch (Exception e) {
             block.reject(e);
@@ -169,6 +170,20 @@ public class UIManagerModuleWrapper implements
     mReactContext.addLifecycleEventListener(mLifecycleListenersMap.get(listener));
   }
 
+  @Override
+  public void onDestroy() {
+    // We need to create a copy to avoid ConcurrentModificationException
+    ArrayList<com.facebook.react.bridge.LifecycleEventListener> tmpList = new ArrayList<>(mLifecycleListenersMap.values());
+    for (com.facebook.react.bridge.LifecycleEventListener listener : tmpList) {
+      listener.onHostDestroy();
+    }
+
+    for (com.facebook.react.bridge.LifecycleEventListener listener : mLifecycleListenersMap.values()) {
+      mReactContext.removeLifecycleEventListener(listener);
+    }
+    mLifecycleListenersMap.clear();
+  }
+
   @Override
   public void unregisterLifecycleEventListener(LifecycleEventListener listener) {
     getContext().removeLifecycleEventListener(mLifecycleListenersMap.get(listener));

package/android/src/main/java/expo/modules/core/BasePackage.java

@@ -21,16 +21,6 @@ public class BasePackage implements Package {
     return Collections.emptyList();
   }
 
-  @Override
-  public List<ExportedModule> createExportedModules(Context context) {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public List<ViewManager> createViewManagers(Context context) {
-    return Collections.emptyList();
-  }
-
   @Override
   public List<SingletonModule> createSingletonModules(Context context) {
     return Collections.emptyList();

package/android/src/main/java/expo/modules/core/ModulePriorities.kt

@@ -20,6 +20,7 @@ object ModulePriorities {
     // {key} to {value}
     // key: full qualified class name
     // value: priority value, the higher value takes precedence
+    "expo.modules.splashscreen.SplashScreenPackage" to 11,
     "expo.modules.updates.UpdatesPackage" to 10
   )
 }

package/android/src/main/java/expo/modules/core/ModuleRegistry.java

@@ -13,25 +13,17 @@ import java.util.Map;
 
 public class ModuleRegistry {
   private final Map<Class, InternalModule> mInternalModulesMap = new HashMap<>();
-  private final Map<String, ExportedModule> mExportedModulesMap = new HashMap<>();
-  private final Map<Class, ExportedModule> mExportedModulesByClassMap = new HashMap<>();
   private final Map<String, SingletonModule> mSingletonModulesMap = new HashMap<>();
   private final List<WeakReference<RegistryLifecycleListener>> mExtraRegistryLifecycleListeners = new ArrayList<>();
   private volatile boolean mIsInitialized = false;
 
   public ModuleRegistry(
     Collection<InternalModule> internalModules,
-    Collection<ExportedModule> exportedModules,
-    Collection<ViewManager> viewManagers,
     Collection<SingletonModule> singletonModules) {
     for (InternalModule internalModule : internalModules) {
       registerInternalModule(internalModule);
     }
 
-    for (ExportedModule module : exportedModules) {
-      registerExportedModule(module);
-    }
-
     for (SingletonModule singleton : singletonModules) {
       registerSingletonModule(singleton);
     }
@@ -48,18 +40,6 @@ public class ModuleRegistry {
     return (T) mInternalModulesMap.get(interfaceClass);
   }
 
-  public ExportedModule getExportedModule(String name) {
-    return mExportedModulesMap.get(name);
-  }
-
-  public ExportedModule getExportedModuleOfClass(Class moduleClass) {
-    return mExportedModulesByClassMap.get(moduleClass);
-  }
-
-  public Collection<ExportedModule> getAllExportedModules() {
-    return mExportedModulesMap.values();
-  }
-
   public <T> T getSingletonModule(String singletonName, Class<T> singletonClass) {
     return (T) mSingletonModulesMap.get(singletonName);
   }
@@ -80,12 +60,6 @@ public class ModuleRegistry {
     return mInternalModulesMap.remove(exportedInterface);
   }
 
-  public void registerExportedModule(ExportedModule module) {
-    String moduleName = module.getName();
-    mExportedModulesMap.put(moduleName, module);
-    mExportedModulesByClassMap.put(module.getClass(), module);
-  }
-
   public void registerSingletonModule(SingletonModule singleton) {
     String singletonName = singleton.getName();
     mSingletonModulesMap.put(singletonName, singleton);
@@ -120,9 +94,7 @@ public class ModuleRegistry {
   }
 
   public void initialize() {
-    List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>();
-    lifecycleListeners.addAll(mExportedModulesMap.values());
-    lifecycleListeners.addAll(mInternalModulesMap.values());
+    List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>(mInternalModulesMap.values());
 
     for (WeakReference<RegistryLifecycleListener> ref : mExtraRegistryLifecycleListeners) {
       if (ref.get() != null) {
@@ -136,9 +108,7 @@ public class ModuleRegistry {
   }
 
   public void onDestroy() {
-    List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>();
-    lifecycleListeners.addAll(mExportedModulesMap.values());
-    lifecycleListeners.addAll(mInternalModulesMap.values());
+    List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>(mInternalModulesMap.values());
 
     for (WeakReference<RegistryLifecycleListener> ref : mExtraRegistryLifecycleListeners) {
       if (ref.get() != null) {

package/android/src/main/java/expo/modules/core/ModuleRegistryProvider.java

@@ -28,8 +28,6 @@ public class ModuleRegistryProvider {
   public ModuleRegistry get(Context context) {
     return new ModuleRegistry(
             createInternalModules(context),
-            createExportedModules(context),
-            createViewManagers(context),
             createSingletonModules(context)
     );
   }
@@ -42,22 +40,6 @@ public class ModuleRegistryProvider {
     return internalModules;
   }
 
-  public Collection<ExportedModule> createExportedModules(Context context) {
-    Collection<ExportedModule> exportedModules = new ArrayList<>();
-    for (Package pkg : getPackages()) {
-      exportedModules.addAll(pkg.createExportedModules(context));
-    }
-    return exportedModules;
-  }
-
-  public Collection<ViewManager> createViewManagers(Context context) {
-    Collection<ViewManager> viewManagers = new ArrayList<>();
-    for (Package pkg : getPackages()) {
-      viewManagers.addAll(pkg.createViewManagers(context));
-    }
-    return viewManagers;
-  }
-
   public Collection<SingletonModule> createSingletonModules(Context context) {
     Collection<SingletonModule> singletonModules = new ArrayList<>();
     for (Package pkg : getPackages()) {

package/android/src/main/java/expo/modules/core/Promise.java

@@ -1,7 +1,9 @@
 package expo.modules.core;
 
 import expo.modules.core.interfaces.CodedThrowable;
+import kotlin.Deprecated;
 
+@Deprecated(message = "AsyncFunction will crash when called. Use expo.modules.kotlin.Promise instead")
 public interface Promise {
   String UNKNOWN_ERROR = "E_UNKNOWN_ERROR";
 

package/android/src/main/java/expo/modules/core/interfaces/Package.java

@@ -2,9 +2,6 @@ package expo.modules.core.interfaces;
 
 import android.content.Context;
 
-import expo.modules.core.ExportedModule;
-import expo.modules.core.ViewManager;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -14,20 +11,6 @@ public interface Package {
     return Collections.emptyList();
   }
 
-  default List<? extends ExportedModule> createExportedModules(Context context) {
-    return Collections.emptyList();
-  }
-
-  /**
-   * @param context A context which you can use when initializing view managers,
-   *                however remember NOT TO KEEP REFERENCES TO IT. View managers
-   *                are reused between refreshes of the application, so keeping
-   *                reference to the context in view managers makes it leak.
-   */
-  default List<? extends ViewManager> createViewManagers(Context context) {
-    return Collections.emptyList();
-  }
-
   default List<? extends expo.modules.core.interfaces.SingletonModule> createSingletonModules(Context context) {
     return Collections.emptyList();
   }

package/android/src/main/java/expo/modules/core/interfaces/ReactActivityHandler.java

@@ -16,15 +16,6 @@ import androidx.annotation.Nullable;
  * Used by {@link ReactActivityDelegateWrapper}
  */
 public interface ReactActivityHandler {
-  /**
-   * Given modules a chance to override the default {@link ReactRootView}
-   * @return the override ReactRootView instance or null if not to override
-   */
-  @Nullable
-  default ReactRootView createReactRootView(Activity activity) {
-    return null;
-  }
-
   /**
    * Gives modules a chance to create a ViewGroup that is used as a container for the ReactRootView,
    * which is added as a child to the container if non-null.