expo-modules-core 1.5.7 → 1.6.0

package/CHANGELOG.md

@@ -10,13 +10,33 @@
 
 ### 💡 Others
 
+## 1.6.0 — 2023-07-28
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed custom fonts support on Fabric. ([#23666](https://github.com/expo/expo/pull/23666) by [@aleqsio](https://github.com/aleqsio))
+- [Android] Fixed splash screen is missing when using the `getDelayLoadAppHandler()` from expo-updates. ([#23747](https://github.com/expo/expo/pull/23747) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Fork `uuid@3.4.0` and move into `expo-modules-core`. Remove the original dependency. ([#23249](https://github.com/expo/expo/pull/23249) by [@alanhughes](https://github.com/alanjhughes))
+- Improved error handling when working with native promises on Android. ([#23571](https://github.com/expo/expo/pull/23571) by [@lukmccall](https://github.com/lukmccall))
+- Added tracing to avoid slow app startup on Android. ([#23653](https://github.com/expo/expo/pull/23653) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.5.8 - 2023-07-23
+
+### 🐛 Bug fixes
+
+- Fixed the `ErrorViewGroup` cannot be cast to module view class exception on Android. ([#23651](https://github.com/expo/expo/pull/23651) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Fix allowed orientations set in `Info.plist` being ignored when no delegates requested a different orientation. ([#23593](https://github.com/expo/expo/pull/23593) by [@behenate](https://github.com/behenate))
+
 ## 1.5.7 — 2023-07-12
 
 ### 🐛 Bug fixes
 
 - Fixed regressions and crashes in the dev client introduced by [#23405](https://github.com/expo/expo/pull/23405). ([#23491](https://github.com/expo/expo/pull/23491) by [@kudo](https://github.com/kudo))
 
-## 1.5.6 — 2023-07-10
+## 1.5.6 - 2023-07-10
 
 ### 🐛 Bug fixes
 
@@ -24,14 +44,14 @@
 - Fixed `SoLoader` does not work on Android. ([#23415](https://github.com/expo/expo/pull/23415) by [@kudo](https://github.com/kudo))
 - Fixed slower boot time on Android. ([#23345](https://github.com/expo/expo/pull/23345) by [@lukmccall](https://github.com/lukmccall))
 
-## 1.5.5 — 2023-07-07
+## 1.5.5 - 2023-07-07
 
 ### 🐛 Bug fixes
 
 - Improved the OkHttp network inspector stability on Android. ([#23350](https://github.com/expo/expo/pull/23350) by [@kudo](https://github.com/kudo))
-- [iOS] Fix conversion to `URL` type that failed despite receiving a string that contained a valid URL. ([#23331](https://github.com/expo/expo/pull/23331) by [@alanhughes](https://github.com/alanjhughes))
+- [iOS] Fix conversion to `URL` type that failed despite receiving a string that contained a valid URL. ([#23331](https://github.com/expo/expo/pull/23331) by [@alanhughes](https://github.com/alanjhughes)) ([#23331](https://github.com/expo/expo/pull/23331) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 1.5.4 — 2023-07-04
+## 1.5.4 - 2023-07-04
 
 ### 🐛 Bug fixes
 

package/android/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
 set(PACKAGE_NAME "expo-modules-core")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR} ${BOOST_VERSION}")
+set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${BOOST_VERSION}")
 
 string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}")
 

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.7'
+version = '1.6.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -76,20 +76,7 @@ def reactNativeArchitectures() {
 }
 
 // HERMES
-def prebuiltHermesDir = findProperty("expo.prebuiltHermesDir") ?: file("${rootDir}/prebuiltHermes")
-def prebuiltHermesVersion = file("${prebuiltHermesDir}/.hermesversion").exists() ? file("${prebuiltHermesDir}/.hermesversion").text : null
-def currentHermesVersion = file("${REACT_NATIVE_DIR}/sdks/.hermesversion").exists() ? file("${REACT_NATIVE_DIR}/sdks/.hermesversion").text : null
-def hasHermesProject = findProject(":packages:react-native:ReactAndroid:hermes-engine") != null
-def prebuiltHermesCacheHit = hasHermesProject && currentHermesVersion == prebuiltHermesVersion
-
-// By default we are going to download and unzip hermes inside the /sdks/hermes folder
-// but you can provide an override for where the hermes source code is located.
-def hermesDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR") ?: file("${REACT_NATIVE_DIR}/sdks/hermes")
-
 def USE_HERMES = true
-def NEED_DOWNLOAD_HERMES = false
-def HERMES_HEADER_DIR = null
-def HERMES_AAR = null
 if (findProject(":app")) {
   def appProject = project(":app")
   USE_HERMES = appProject?.hermesEnabled?.toBoolean() || appProject?.ext?.react?.enableHermes?.toBoolean()
@@ -97,25 +84,6 @@ if (findProject(":app")) {
 
 // Currently the needs for hermes/jsc are only for androidTest, so we turn on this flag only when `isExpoModulesCoreTests` is true
 USE_HERMES = USE_HERMES && isExpoModulesCoreTests
-
-if (USE_HERMES) {
-  if (prebuiltHermesCacheHit) {
-    HERMES_HEADER_DIR = file("${thirdPartyNdkDir}/hermes/prefab/modules/libhermes/include")
-    HERMES_AAR = file("${prebuiltHermesDir}/hermes-engine-debug.aar")
-  } else if (hasHermesProject) {
-    HERMES_HEADER_DIR = file("${thirdPartyNdkDir}/hermes/prefab/modules/libhermes/include")
-    HERMES_AAR = file("${REACT_NATIVE_DIR}/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-debug.aar")
-  } else {
-    def prebuiltAAR = fileTree(REACT_NATIVE_DIR).matching { include "**/hermes-engine/**/hermes-engine-*-debug.aar" }
-    if (prebuiltAAR.any()) {
-      HERMES_AAR = prebuiltAAR.singleFile
-    } else {
-      HERMES_AAR = file("${hermesEngineDir}/android/hermes-debug.aar")
-    }
-    HERMES_HEADER_DIR = file("${hermesDir}")
-    NEED_DOWNLOAD_HERMES = true
-  }
-}
 // END HERMES
 
 def isNewArchitectureEnabled = findProperty("newArchEnabled") == "true"
@@ -160,7 +128,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.7"
+    versionName "1.6.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -174,7 +142,6 @@ android {
           "-DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}",
           "-DBOOST_VERSION=${BOOST_VERSION}",
           "-DUSE_HERMES=${USE_HERMES}",
-          "-DHERMES_HEADER_DIR=${HERMES_HEADER_DIR}",
           "-DIS_NEW_ARCHITECTURE_ENABLED=${isNewArchitectureEnabled}",
           "-DPROJECT_BUILD_DIR=$buildDir",
           "-DREACT_ANDROID_DIR=${REACT_NATIVE_DIR}/ReactAndroid",
@@ -279,6 +246,8 @@ dependencies {
   implementation "androidx.activity:activity-ktx:1.7.1" // androidx.appcompat:appcompat:1.4.1 depends on version 1.2.3, so we enforce higher one here
   implementation "androidx.fragment:fragment-ktx:1.5.7" // androidx.appcomapt:appcompat:1.4.1 depends on version 1.3.4, so we enforce higher one here
 
+  implementation("androidx.tracing:tracing-ktx:1.1.0")
+
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 
@@ -299,11 +268,12 @@ dependencies {
   androidTestImplementation "com.google.truth:truth:1.1.2"
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
-  if (USE_HERMES) {
-    def hermesProject = findProject(":packages:react-native:ReactAndroid:hermes-engine")
-    compileOnly (hermesProject ?: files(HERMES_AAR))
-  } else {
-    compileOnly "org.webkit:android-jsc:+"
+  if (isExpoModulesCoreTests) {
+    if (USE_HERMES) {
+      compileOnly "com.facebook.react:hermes-android"
+    } else {
+      compileOnly "org.webkit:android-jsc:+"
+    }
   }
 }
 
@@ -322,48 +292,6 @@ def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDire
   thirdPartyNdkDir.mkdirs()
 }
 
-// TODO: Remove all these hermes code when we update our repo to react-native 0.71 by using prefab
-task downloadHermes(type: Download) {
-  def hermesVersion = currentHermesVersion ?: "main"
-  src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(new File(downloadsDir, "hermes-${hermesVersion}.tar.gz"))
-}
-
-task unzipHermes(dependsOn: downloadHermes, type: Copy) {
-  from(tarTree(downloadHermes.dest)) {
-    eachFile { file ->
-      // We flatten the unzip as the tarball contains a `facebook-hermes-<SHA>`
-      // folder at the top level.
-      if (file.relativePath.segments.size() > 1) {
-        file.relativePath = new org.gradle.api.file.RelativePath(!file.isDirectory(), file.relativePath.segments.drop(1))
-      }
-    }
-  }
-  into(hermesDir)
-}
-
-task prepareHermes() {
-  if (!USE_HERMES) {
-    return
-  }
-  dependsOn(createNativeDepsDirectories)
-  if (NEED_DOWNLOAD_HERMES) {
-    dependsOn(unzipHermes)
-  }
-
-  doLast {
-    def files = zipTree(HERMES_AAR).matching({ it.include "**/*.so", "prefab/modules/libhermes/include/**/*" })
-
-    copy {
-      from files
-      from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
-      into "$thirdPartyNdkDir/hermes"
-    }
-  }
-}
-
 def downloadBoost = tasks.create('downloadBoost', Download) {
   dependsOn(createNativeDepsDirectories)
   def srcUrl = REACT_NATIVE_TARGET_VERSION >= 69
@@ -406,12 +334,6 @@ afterEvaluate {
   if (REACT_NATIVE_TARGET_VERSION < 71) {
     nativeBuildDependsOn(project, prepareBoost, null)
   }
-  if (USE_HERMES) {
-    nativeBuildDependsOn(project, prepareHermes, null)
-    if (hasHermesProject && !prebuiltHermesCacheHit) {
-      prepareHermes.dependsOn(":packages:react-native:ReactAndroid:hermes-engine:assembleDebug")
-    }
-  }
 }
 
 if (REACT_NATIVE_TARGET_VERSION < 71) {

package/android/src/main/cpp/JSIInteropModuleRegistry.cpp

@@ -113,6 +113,16 @@ JSIInteropModuleRegistry::callGetJavaScriptModuleObjectMethod(const std::string
   return method(javaPart_, moduleName);
 }
 
+jni::local_ref<JavaScriptModuleObject::javaobject>
+JSIInteropModuleRegistry::callGetCoreModuleObject() const {
+  const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
+    ->getMethod<jni::local_ref<JavaScriptModuleObject::javaobject>()>(
+      "getCoreModuleObject"
+    );
+
+  return method(javaPart_);
+}
+
 jni::local_ref<jni::JArrayClass<jni::JString>>
 JSIInteropModuleRegistry::callGetJavaScriptModulesNames() const {
   const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
@@ -135,6 +145,10 @@ JSIInteropModuleRegistry::getModule(const std::string &moduleName) const {
   return callGetJavaScriptModuleObjectMethod(moduleName);
 }
 
+jni::local_ref<JavaScriptModuleObject::javaobject> JSIInteropModuleRegistry::getCoreModule() const {
+  return callGetCoreModuleObject();
+}
+
 bool JSIInteropModuleRegistry::hasModule(const std::string &moduleName) const {
   return callHasModule(moduleName);
 }

package/android/src/main/cpp/JSIInteropModuleRegistry.h

@@ -82,6 +82,11 @@ public:
    */
   jni::local_ref<JavaScriptObject::javaobject> createObject();
 
+  /**
+  * Gets a core module.
+  */
+  jni::local_ref<JavaScriptModuleObject::javaobject> getCoreModule() const;
+
   /**
    * Adds a shared object to the internal registry
    * @param native part of the shared object
@@ -113,6 +118,8 @@ private:
 
   inline jni::local_ref<jni::JArrayClass<jni::JString>> callGetJavaScriptModulesNames() const;
 
+  inline jni::local_ref<JavaScriptModuleObject::javaobject> callGetCoreModuleObject() const;
+
   inline bool callHasModule(const std::string &moduleName) const;
 };
 } // namespace expo

package/android/src/main/cpp/JavaScriptRuntime.cpp

@@ -162,7 +162,10 @@ void JavaScriptRuntime::drainJSEventLoop() {
 }
 
 void JavaScriptRuntime::installMainObject() {
-  mainObject = std::make_shared<jsi::Object>(*runtime);
+  auto coreModule = jsiInteropModuleRegistry->getCoreModule();
+  coreModule->cthis()->jsiInteropModuleRegistry = jsiInteropModuleRegistry;
+  mainObject = coreModule->cthis()->getJSIObject(*runtime);
+
   auto global = runtime->global();
   auto objectClass = global.getPropertyAsObject(*runtime, "Object");
   jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(

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

@@ -10,12 +10,15 @@ import java.util.List;
 import java.util.Objects;
 
 import androidx.annotation.Nullable;
+
 import expo.modules.BuildConfig;
 import expo.modules.adapters.react.views.SimpleViewManagerAdapter;
 import expo.modules.adapters.react.views.ViewGroupManagerAdapter;
 import expo.modules.core.ModuleRegistry;
+import expo.modules.core.interfaces.Consumer;
 import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.Package;
+import expo.modules.kotlin.AppContext;
 import expo.modules.kotlin.CoreLoggerKt;
 import expo.modules.kotlin.KotlinInteropModuleRegistry;
 import expo.modules.kotlin.ModulesProvider;
@@ -31,6 +34,14 @@ public class ModuleRegistryAdapter implements ReactPackage {
   protected ModulesProvider mModulesProvider;
   protected ReactAdapterPackage mReactAdapterPackage = new ReactAdapterPackage();
   private NativeModulesProxy mModulesProxy;
+
+  private void setModulesProxy(@Nullable NativeModulesProxy newProxy) {
+    mModulesProxy = newProxy;
+    if (mModulesProxy != null) {
+      mModulesProxy.getKotlinInteropModuleRegistry().setLegacyModulesProxy(mModulesProxy);
+    }
+  }
+
   // We need to save all view holders to update them when the new kotlin module registry will be created.
   private List<ViewWrapperDelegateHolder> mWrapperDelegateHolders = null;
   private FabricComponentsRegistry mFabricComponentsRegistry = null;
@@ -57,7 +68,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
       moduleRegistry.registerInternalModule(internalModule);
     }
 
-    List<NativeModule> nativeModules = getNativeModulesFromModuleRegistry(reactContext, moduleRegistry);
+    List<NativeModule> nativeModules = getNativeModulesFromModuleRegistry(reactContext, moduleRegistry, null);
     if (mWrapperDelegateHolders != null) {
       KotlinInteropModuleRegistry kotlinInteropModuleRegistry = proxy.getKotlinInteropModuleRegistry();
       kotlinInteropModuleRegistry.updateModuleHoldersInViewManagers(mWrapperDelegateHolders);
@@ -66,10 +77,17 @@ public class ModuleRegistryAdapter implements ReactPackage {
     return nativeModules;
   }
 
-  protected List<NativeModule> getNativeModulesFromModuleRegistry(ReactApplicationContext reactContext, ModuleRegistry moduleRegistry) {
+  protected List<NativeModule> getNativeModulesFromModuleRegistry(
+    ReactApplicationContext reactContext,
+    ModuleRegistry moduleRegistry,
+    @Nullable Consumer<AppContext> appContextConsumer
+  ) {
     List<NativeModule> nativeModulesList = new ArrayList<>(2);
-
-    nativeModulesList.add(getOrCreateNativeModulesProxy(reactContext, moduleRegistry));
+    NativeModulesProxy nativeModulesProxy = getOrCreateNativeModulesProxy(reactContext, moduleRegistry);
+    if (appContextConsumer != null) {
+      appContextConsumer.apply(nativeModulesProxy.getKotlinInteropModuleRegistry().getAppContext());
+    }
+    nativeModulesList.add(nativeModulesProxy);
 
     // Add listener that will notify expo.modules.core.ModuleRegistry when all modules are ready
     nativeModulesList.add(new ModuleRegistryReadyNotifier(moduleRegistry));
@@ -117,17 +135,15 @@ public class ModuleRegistryAdapter implements ReactPackage {
     @Nullable ModuleRegistry moduleRegistry
   ) {
     if (mModulesProxy != null && mModulesProxy.getReactContext() != reactContext) {
-      mModulesProxy = null;
+      setModulesProxy(mModulesProxy);
     }
     if (mModulesProxy == null) {
       ModuleRegistry registry = moduleRegistry != null ? moduleRegistry : mModuleRegistryProvider.get(reactContext);
       if (mModulesProvider != null) {
-        mModulesProxy = new NativeModulesProxy(reactContext, registry, mModulesProvider);
+        setModulesProxy(new NativeModulesProxy(reactContext, registry, mModulesProvider));
       } else {
-        mModulesProxy = new NativeModulesProxy(reactContext, registry);
+        setModulesProxy(new NativeModulesProxy(reactContext, registry));
       }
-
-      mModulesProxy.getKotlinInteropModuleRegistry().setLegacyModulesProxy(mModulesProxy);
     }
 
     if (moduleRegistry != null && moduleRegistry != mModulesProxy.getModuleRegistry()) {

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

@@ -34,4 +34,9 @@ public interface ReactActivityLifecycleListener {
   default boolean onBackPressed() {
     return false;
   }
+
+  /**
+   * This method is called when the {@link Activity#setContentView} method is invoked on an Activity.
+   */
+  default void onContentChanged(Activity activity) {}
 }

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -28,6 +28,7 @@ import expo.modules.interfaces.sensors.SensorServiceInterface
 import expo.modules.interfaces.taskManager.TaskManagerInterface
 import expo.modules.kotlin.activityresult.ActivityResultsManager
 import expo.modules.kotlin.activityresult.DefaultAppContextActivityResultCaller
+import expo.modules.kotlin.defaultmodules.CoreModule
 import expo.modules.kotlin.defaultmodules.ErrorManagerModule
 import expo.modules.kotlin.defaultmodules.NativeModulesProxyModule
 import expo.modules.kotlin.events.EventEmitter
@@ -40,6 +41,7 @@ import expo.modules.kotlin.jni.JSIInteropModuleRegistry
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.providers.CurrentActivityProvider
 import expo.modules.kotlin.sharedobjects.SharedObjectRegistry
+import expo.modules.kotlin.tracing.trace
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -58,7 +60,18 @@ class AppContext(
   private val reactLifecycleDelegate = ReactLifecycleDelegate(this)
 
   // We postpone creating the `JSIInteropModuleRegistry` to not load so files in unit tests.
-  private lateinit var jsiInterop: JSIInteropModuleRegistry
+  internal lateinit var jsiInterop: JSIInteropModuleRegistry
+
+  /**
+   * The core module that defines the `expo` object in the global scope of the JS runtime.
+   *
+   * Note: in current implementation this module won't receive any events.
+   */
+  internal val coreModule = run {
+    val module = CoreModule()
+    module._appContext = this
+    ModuleHolder(module)
+  }
 
   internal val sharedObjectRegistry = SharedObjectRegistry()
 
@@ -120,26 +133,28 @@ class AppContext(
    * Initializes a JSI part of the module registry.
    * It will be a NOOP if the remote debugging was activated.
    */
-  fun installJSIInterop() = synchronized<Unit>(this) {
-    try {
-      jsiInterop = JSIInteropModuleRegistry(this)
-      val reactContext = reactContextHolder.get() ?: return
-      val jsContextProvider = legacyModule<JavaScriptContextProvider>() ?: return
-      val jsContextHolder = jsContextProvider.javaScriptContextRef
-      val catalystInstance = reactContext.catalystInstance ?: return
-      jsContextHolder
-        .takeIf { it != 0L }
-        ?.let {
-          jsiInterop.installJSI(
-            it,
-            jniDeallocator,
-            jsContextProvider.jsCallInvokerHolder,
-            catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
-          )
-          logger.info("✅ JSI interop was installed")
-        }
-    } catch (e: Throwable) {
-      logger.error("❌ Cannot install JSI interop: $e", e)
+  fun installJSIInterop() = synchronized(this) {
+    trace("AppContext.installJSIInterop") {
+      try {
+        jsiInterop = JSIInteropModuleRegistry(this)
+        val reactContext = reactContextHolder.get() ?: return@trace
+        val jsContextProvider = legacyModule<JavaScriptContextProvider>() ?: return@trace
+        val jsContextHolder = jsContextProvider.javaScriptContextRef
+        val catalystInstance = reactContext.catalystInstance ?: return@trace
+        jsContextHolder
+          .takeIf { it != 0L }
+          ?.let {
+            jsiInterop.installJSI(
+              it,
+              jniDeallocator,
+              jsContextProvider.jsCallInvokerHolder,
+              catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
+            )
+            logger.info("✅ JSI interop was installed")
+          }
+      } catch (e: Throwable) {
+        logger.error("❌ Cannot install JSI interop: $e", e)
+      }
     }
   }
 
@@ -271,10 +286,11 @@ class AppContext(
   internal val errorManager: ErrorManagerModule?
     get() = registry.getModule()
 
-  internal fun onDestroy() {
+  internal fun onDestroy() = trace("AppContext.onDestroy") {
     reactContextHolder.get()?.removeLifecycleEventListener(reactLifecycleDelegate)
     registry.post(EventName.MODULE_DESTROY)
     registry.cleanUp()
+    coreModule.module._appContext = null
     modulesQueue.cancel(ContextDestroyedException())
     mainQueue.cancel(ContextDestroyedException())
     backgroundCoroutineScope.cancel(ContextDestroyedException())

package/android/src/main/java/expo/modules/kotlin/KotlinInteropModuleRegistry.kt

@@ -7,6 +7,7 @@ import expo.modules.adapters.react.NativeModulesProxy
 import expo.modules.kotlin.defaultmodules.NativeModulesProxyModuleName
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
+import expo.modules.kotlin.tracing.trace
 import expo.modules.kotlin.views.GroupViewManagerWrapper
 import expo.modules.kotlin.views.SimpleViewManagerWrapper
 import expo.modules.kotlin.views.ViewManagerWrapperDelegate
@@ -42,55 +43,61 @@ class KotlinInteropModuleRegistry(
     }
   }
 
-  fun exportedModulesConstants(): Map<ModuleName, ModuleConstants> {
-    return registry
-      // prevent infinite recursion - exclude NativeProxyModule constants
-      .filter { holder -> holder.name != NativeModulesProxyModuleName }
-      .associate { holder ->
-        holder.name to holder.definition.constantsProvider()
+  fun exportedModulesConstants(): Map<ModuleName, ModuleConstants> =
+    trace("KotlinInteropModuleRegistry.exportedModulesConstants") {
+      registry
+        // prevent infinite recursion - exclude NativeProxyModule constants
+        .filter { holder -> holder.name != NativeModulesProxyModuleName }
+        .associate { holder ->
+          holder.name to holder.definition.constantsProvider()
+        }
+    }
+
+  fun exportMethods(exportKey: (String, List<ModuleMethodInfo>) -> Unit = { _, _ -> }): Map<ModuleName, List<ModuleMethodInfo>> =
+    trace("KotlinInteropModuleRegistry.exportMethods") {
+      registry.associate { holder ->
+        val methodsInfo = holder
+          .definition
+          .asyncFunctions
+          .map { (name, method) ->
+            mapOf(
+              "name" to name,
+              "argumentsCount" to method.argsCount
+            )
+          }
+        exportKey(holder.name, methodsInfo)
+        holder.name to methodsInfo
       }
-  }
+    }
 
-  fun exportMethods(exportKey: (String, List<ModuleMethodInfo>) -> Unit = { _, _ -> }): Map<ModuleName, List<ModuleMethodInfo>> {
-    return registry.associate { holder ->
-      val methodsInfo = holder
-        .definition
-        .asyncFunctions
-        .map { (name, method) ->
-          mapOf(
-            "name" to name,
-            "argumentsCount" to method.argsCount
-          )
+  fun exportViewManagers(): List<ViewManager<*, *>> =
+    trace("KotlinInteropModuleRegistry.exportViewManagers") {
+      registry
+        .filter { it.definition.viewManagerDefinition != null }
+        .map {
+          val wrapperDelegate = ViewManagerWrapperDelegate(it)
+          when (it.definition.viewManagerDefinition!!.getViewManagerType()) {
+            expo.modules.core.ViewManager.ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
+            expo.modules.core.ViewManager.ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+          }
         }
-      exportKey(holder.name, methodsInfo)
-      holder.name to methodsInfo
     }
-  }
 
-  fun exportViewManagers(): List<ViewManager<*, *>> {
-    return registry
-      .filter { it.definition.viewManagerDefinition != null }
-      .map {
-        val wrapperDelegate = ViewManagerWrapperDelegate(it)
-        when (it.definition.viewManagerDefinition!!.getViewManagerType()) {
-          expo.modules.core.ViewManager.ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
-          expo.modules.core.ViewManager.ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+  fun viewManagersMetadata(): Map<String, Map<String, Any>> =
+    trace("KotlinInteropModuleRegistry.viewManagersMetadata") {
+      registry
+        .filter { it.definition.viewManagerDefinition != null }
+        .associate { holder ->
+          holder.name to mapOf(
+            "propsNames" to (holder.definition.viewManagerDefinition?.propsNames ?: emptyList())
+          )
         }
-      }
-  }
-
-  fun viewManagersMetadata(): Map<String, Map<String, Any>> {
-    return registry
-      .filter { it.definition.viewManagerDefinition != null }
-      .associate { holder ->
-        holder.name to mapOf(
-          "propsNames" to (holder.definition.viewManagerDefinition?.propsNames ?: emptyList())
-        )
-      }
-  }
+    }
 
   fun extractViewManagersDelegateHolders(viewManagers: List<ViewManager<*, *>>): List<ViewWrapperDelegateHolder> =
-    viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
+    trace("KotlinInteropModuleRegistry.extractViewManagersDelegateHolders") {
+      viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
+    }
 
   /**
    * Since React Native v0.55, {@link com.facebook.react.ReactPackage#createViewManagers(ReactApplicationContext)}
@@ -100,15 +107,16 @@ class KotlinInteropModuleRegistry(
    * the instance that was bound with the prop method won't be the same as the instance returned by module registry.
    * To fix that we need to update all modules holder in exported view managers.
    */
-  fun updateModuleHoldersInViewManagers(viewWrapperHolders: List<ViewWrapperDelegateHolder>) {
-    viewWrapperHolders
-      .map { it.viewWrapperDelegate }
-      .forEach { holderWrapper ->
-        holderWrapper.moduleHolder = requireNotNull(registry.getModuleHolder(holderWrapper.moduleHolder.name)) {
-          "Cannot update the module holder for ${holderWrapper.moduleHolder.name}."
+  fun updateModuleHoldersInViewManagers(viewWrapperHolders: List<ViewWrapperDelegateHolder>) =
+    trace("KotlinInteropModuleRegistry.updateModuleHoldersInViewManagers") {
+      viewWrapperHolders
+        .map { it.viewWrapperDelegate }
+        .forEach { holderWrapper ->
+          holderWrapper.moduleHolder = requireNotNull(registry.getModuleHolder(holderWrapper.moduleHolder.name)) {
+            "Cannot update the module holder for ${holderWrapper.moduleHolder.name}."
+          }
         }
-      }
-  }
+    }
 
   fun onDestroy() {
     appContext.onDestroy()