expo-modules-core 2.0.0-preview.1 → 2.0.0-preview.10

package/CHANGELOG.md

@@ -10,6 +10,67 @@
 
 ### 💡 Others
 
+## 2.0.0-preview.10 — 2024-11-07
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed broken self-signed connections from network inspector. ([#32670](https://github.com/expo/expo/pull/32670) by [@kudo](https://github.com/kudo))
+
+## 2.0.0-preview.9 — 2024-10-31
+
+### 💡 Others
+
+- [Android] Fix `ClassCastException` in headless app loader under the old architecture. ([#32390](https://github.com/expo/expo/pull/32390) by [@robertying](https://github.com/robertying))
+
+## 2.0.0-preview.8 — 2024-10-31
+
+### 🛠 Breaking changes
+
+- Remove expo barcode scanner interface. ([#32198](https://github.com/expo/expo/pull/32198) by [@aleqsio](https://github.com/aleqsio))
+
+### 💡 Others
+
+- [android] Added helper for looking up TaskService instance used by expo-task-manager ([#32300](https://github.com/expo/expo/pull/32300) by [@chrfalch](https://github.com/chrfalch))
+- Made TypeScript declaration for `process` an interface. ([#32464](https://github.com/expo/expo/pull/32464) by [@tsapeta](https://github.com/tsapeta))
+
+## 2.0.0-preview.7 — 2024-10-29
+
+### 💡 Others
+
+- [Android] Added `shouldUseAndroidLayout` flag to `ExpoView`. ([#32446](https://github.com/expo/expo/pull/32446) by [@lukmccall](https://github.com/lukmccall))
+
+## 2.0.0-preview.6 — 2024-10-29
+
+_This version does not introduce any user-facing changes._
+
+## 2.0.0-preview.5 — 2024-10-28
+
+### 🐛 Bug fixes
+
+- Fixed updating props on SwiftUI views on the New Architecture. ([#32381](https://github.com/expo/expo/pull/32381) by [@tsapeta](https://github.com/tsapeta))
+- Fixed build error when `use_frameworks!`. ([#32358](https://github.com/expo/expo/pull/32358) by [@kudo](https://github.com/kudo))
+
+## 2.0.0-preview.4 — 2024-10-25
+
+### 💡 Others
+
+- Added a new dynamic type dedicated for Either types. ([#32328](https://github.com/expo/expo/pull/32328) by [@tsapeta](https://github.com/tsapeta))
+
+## 2.0.0-preview.3 — 2024-10-24
+
+_This version does not introduce any user-facing changes._
+
+## 2.0.0-preview.2 — 2024-10-24
+
+### 🐛 Bug fixes
+
+- [iOS] Fix optionals conversion. ([#32239](https://github.com/expo/expo/pull/32239) by [@aleqsio](https://github.com/aleqsio))
+- Fixed retain cycle for `ExpoRequestCdpInterceptor`. ([#32289](https://github.com/expo/expo/pull/32289) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- [android] Add enum event support to OnStartObserving and OnStopObserving. ([#32251](https://github.com/expo/expo/pull/32251), [#32287](https://github.com/expo/expo/pull/32287) by [@wschurman](https://github.com/wschurman))
+
 ## 2.0.0-preview.1 — 2024-10-22
 
 ### 🐛 Bug fixes
@@ -56,6 +117,7 @@
 
 ### 🐛 Bug fixes
 
+- [Android] Fixed `RNHeadlessAppLoader` class for New Architecture support. ([#32146](https://github.com/expo/expo/pull/32146) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Fix using enums as optional arguments. ([#32147](https://github.com/expo/expo/pull/32147) by [@aleqsio](https://github.com/aleqsio))
 - [Android] Change JS return type for kotlin `null` to be `null` instead of `undefined`. ([#31301](https://github.com/expo/expo/pull/31301) by [@aleqsio](https://github.com/aleqsio))
 - [iOS] Swift `Enumerable`s did not correctly convert to JS values. ([#30191](https://github.com/expo/expo/pull/30191) by [@vonovak](https://github.com/vonovak))

package/ExpoModulesCore.podspec

@@ -47,19 +47,32 @@ Pod::Spec.new do |s|
   s.static_framework = true
   s.header_dir     = 'ExpoModulesCore'
 
+  header_search_paths = []
+  if ENV['USE_FRAMEWORKS']
+    header_search_paths.concat([
+      # [begin] transitive dependencies of React-RCTAppDelegate that are not defined modules
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeApple/React_RuntimeApple.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeCore/React_RuntimeCore.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-jserrorhandler/React_jserrorhandler.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimescheduler/React_runtimescheduler.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-performancetimeline/React_performancetimeline.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers"',
+      # [end] transitive dependencies of React-RCTAppDelegate that are not defined modules
+    ])
+  end
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
     'USE_HEADERMAP' => 'YES',
     'DEFINES_MODULE' => 'YES',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'OTHER_SWIFT_FLAGS' => "$(inherited) #{new_arch_enabled ? new_arch_compiler_flags : ''}"
+    'OTHER_SWIFT_FLAGS' => "$(inherited) #{new_arch_enabled ? new_arch_compiler_flags : ''}",
+    'HEADER_SEARCH_PATHS' => header_search_paths.join(' '),
   }
   s.user_target_xcconfig = {
     "HEADER_SEARCH_PATHS" => [
       '"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header"',
       '"$(PODS_ROOT)/Headers/Private/Yoga"', # Expo.h -> ExpoModulesCore-umbrella.h -> Fabric ViewProps.h -> Private Yoga headers
-
     ],
   }
 

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.0.0-preview.1'
+version = '2.0.0-preview.10'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.0.0-preview.1"
+    versionName "2.0.0-preview.10"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -198,7 +198,7 @@ dependencies {
 
 if (shouldTurnWarningsIntoErrors) {
   tasks.withType(JavaCompile) configureEach {
-    options.compilerArgs << "-Werror" << "-Xlint:all"
+    options.compilerArgs << "-Werror" << "-Xlint:all" << '-Xlint:-serial' << '-Xlint:-rawtypes'
   }
   tasks.withType(KotlinCompile) configureEach {
     compilerOptions.allWarningsAsErrors = true

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

@@ -1,16 +1,18 @@
 package expo.modules.adapters.react.apploader
 
+import android.annotation.SuppressLint
 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.BuildConfig
 import expo.modules.apploader.HeadlessAppLoader
 import expo.modules.core.interfaces.Consumer
 import expo.modules.core.interfaces.DoNotStrip
 
-private val appRecords: MutableMap<String, ReactInstanceManager> = mutableMapOf()
+private val appRecords: MutableMap<String, ReactContext> = mutableMapOf()
 
 class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context) : HeadlessAppLoader {
 
@@ -22,16 +24,35 @@ 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(object : ReactInstanceEventListener {
-          override fun onReactContextInitialized(context: ReactContext) {
-            HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
-            callback?.apply(true)
-          }
-        })
-        appRecords[params.appScopeKey] = reactInstanceManager
-        if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
+        // In old arch reactHost will be null
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+          // New architecture
+          val reactHost = (context.applicationContext as ReactApplication).reactHost ?: throw IllegalStateException("Your application does not have a valid reactHost")
+          reactHost.addReactInstanceEventListener(
+            object : ReactInstanceEventListener {
+              override fun onReactContextInitialized(context: ReactContext) {
+                reactHost.removeReactInstanceEventListener(this)
+                HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
+                appRecords[params.appScopeKey] = context
+                callback?.apply(true)
+              }
+            }
+          )
+          reactHost.start()
+        } else {
+          // Old architecture
+          val reactInstanceManager = (context.applicationContext as ReactApplication).reactNativeHost.reactInstanceManager
+          reactInstanceManager.addReactInstanceEventListener(
+            object : ReactInstanceEventListener {
+              override fun onReactContextInitialized(context: ReactContext) {
+                HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
+                reactInstanceManager.removeReactInstanceEventListener(this)
+                appRecords[params.appScopeKey] = context
+                callback?.apply(true)
+              }
+            }
+          )
           reactInstanceManager.createReactContextInBackground()
         }
       } else {
@@ -42,18 +63,34 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     }
   }
 
+  @SuppressLint("VisibleForTests")
   override fun invalidateApp(appScopeKey: String?): Boolean {
     return if (appRecords.containsKey(appScopeKey) && appRecords[appScopeKey] != null) {
-      val appRecord: ReactInstanceManager = appRecords[appScopeKey]!!
-      android.os.Handler(context.mainLooper).post {
-        // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
-        // And The Activity would take over the ownership of `ReactInstanceManager`.
-        // This case happens when a user clicks a background task triggered notification immediately.
-        if (appRecord.lifecycleState == LifecycleState.BEFORE_CREATE) {
-          appRecord.destroy()
+      val reactContext = appRecords[appScopeKey] ?: return false
+      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        // New architecture
+        val reactHost = (reactContext.applicationContext as ReactApplication).reactHost ?: throw IllegalStateException("Your application does not have a valid reactHost")
+        android.os.Handler(reactContext.mainLooper).post {
+          reactHost.destroy("Closing headless task app", null)
+          HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
+          appRecords.remove(appScopeKey)
+        }
+      } else {
+        // Old architecture
+        val reactNativeHost = (reactContext.applicationContext as ReactApplication).reactNativeHost
+        if (reactNativeHost.hasInstance()) {
+          val reactInstanceManager: ReactInstanceManager = reactNativeHost.reactInstanceManager
+          android.os.Handler(reactContext.mainLooper).post {
+            // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
+            // And The Activity would take over the ownership of `ReactInstanceManager`.
+            // This case happens when a user clicks a background task triggered notification immediately.
+            if (reactInstanceManager.lifecycleState == LifecycleState.BEFORE_CREATE) {
+              reactInstanceManager.destroy()
+            }
+            HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
+            appRecords.remove(appScopeKey)
+          }
         }
-        HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
-        appRecords.remove(appScopeKey)
       }
       true
     } else {
@@ -61,8 +98,18 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     }
   }
 
-  override fun isRunning(appScopeKey: String?): Boolean =
-    appRecords.contains(appScopeKey) && appRecords[appScopeKey]!!.hasStartedCreatingInitialContext()
+  override fun isRunning(appScopeKey: String?): Boolean {
+    val reactContext = appRecords[appScopeKey] ?: return false
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      // New architecture - We can return true since the fact that we have a reactContext
+      // means that we've already called start on the reactHost
+      return true
+    } else {
+      // Old architecture
+      val reactNativeHost = (reactContext.applicationContext as ReactApplication).reactNativeHost
+      return reactNativeHost.reactInstanceManager.hasStartedCreatingInitialContext()
+    }
+  }
 
   //endregion HeadlessAppLoader
 }

package/android/src/main/java/expo/modules/adapters/react/permissions/PermissionsService.kt

@@ -13,7 +13,6 @@ import androidx.core.content.ContextCompat
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 import expo.modules.core.ModuleRegistry
-import expo.modules.core.Promise
 import expo.modules.core.interfaces.ActivityProvider
 import expo.modules.core.interfaces.InternalModule
 import expo.modules.core.interfaces.LifecycleEventListener
@@ -59,7 +58,12 @@ open class PermissionsService(val context: Context) : InternalModule, Permission
     mAskedPermissionsCache = context.applicationContext.getSharedPreferences(PREFERENCE_FILENAME, Context.MODE_PRIVATE)
   }
 
-  override fun getPermissionsWithPromise(promise: Promise, vararg permissions: String) {
+  override fun getPermissionsWithPromise(
+    promise:
+    @Suppress("DEPRECATION")
+    expo.modules.core.Promise,
+    vararg permissions: String
+  ) {
     getPermissions(
       PermissionsResponseListener { permissionsMap: MutableMap<String, PermissionsResponse> ->
         val areAllGranted = permissionsMap.all { (_, response) -> response.status == PermissionsStatus.GRANTED }
@@ -86,7 +90,12 @@ open class PermissionsService(val context: Context) : InternalModule, Permission
     )
   }
 
-  override fun askForPermissionsWithPromise(promise: Promise, vararg permissions: String) {
+  override fun askForPermissionsWithPromise(
+    promise:
+    @Suppress("DEPRECATION")
+    expo.modules.core.Promise,
+    vararg permissions: String
+  ) {
     askForPermissions(
       PermissionsResponseListener {
         getPermissionsWithPromise(promise, *permissions)
@@ -165,7 +174,7 @@ open class PermissionsService(val context: Context) : InternalModule, Permission
         return requestedPermissions!!.contains(permission)
       }
       return false
-    } catch (e: PackageManager.NameNotFoundException) {
+    } catch (_: PackageManager.NameNotFoundException) {
       return false
     }
   }
@@ -206,7 +215,7 @@ open class PermissionsService(val context: Context) : InternalModule, Permission
   private fun canAskAgain(permission: String): Boolean {
     return mActivityProvider?.currentActivity?.let {
       ActivityCompat.shouldShowRequestPermissionRationale(it, permission)
-    } ?: false
+    } == true
   }
 
   private fun parseNativeResult(permissionsString: Array<out String>, grantResults: IntArray): Map<String, PermissionsResponse> {

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

@@ -35,6 +35,7 @@ public class EventEmitterModule implements EventEmitter, InternalModule {
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void emit(final int viewId, final String eventName, final Bundle eventBody) {
     final EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag(mReactContext, viewId);
     dispatcher.dispatchEvent(new com.facebook.react.uimanager.events.Event(viewId) {
@@ -65,6 +66,7 @@ public class EventEmitterModule implements EventEmitter, InternalModule {
     return Collections.singletonList((Class) EventEmitter.class);
   }
 
+  @SuppressWarnings("deprecation")
   private static com.facebook.react.uimanager.events.Event getReactEventFromEvent(final int viewId, final Event event) {
     return new com.facebook.react.uimanager.events.Event(viewId) {
       @Override

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

@@ -70,6 +70,7 @@ public class UIManagerModuleWrapper implements
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public <T> void addUIBlock(final int tag, final UIBlock<T> block, final Class<T> tClass) {
     UIBlockInterface uiBlock = new UIBlockInterface() {
       @Override
@@ -105,6 +106,7 @@ public class UIManagerModuleWrapper implements
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void addUIBlock(final GroupUIBlock block) {
     UIBlockInterface uiBlock = new UIBlockInterface() {
       @Override
@@ -141,6 +143,7 @@ public class UIManagerModuleWrapper implements
 
   @Nullable
   @Override
+  @SuppressWarnings("deprecation")
   public View resolveView(int viewTag) {
     final com.facebook.react.bridge.UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getContext(), viewTag);
     if (uiManager == null) {
@@ -263,6 +266,7 @@ public class UIManagerModuleWrapper implements
   }
 
   @androidx.annotation.OptIn(markerClass = FrameworkAPI.class)
+  @SuppressWarnings("deprecation")
   public CallInvokerHolderImpl getJSCallInvokerHolder() {
     return (CallInvokerHolderImpl) mReactContext.getCatalystInstance().getJSCallInvokerHolder();
   }
@@ -273,5 +277,6 @@ public class UIManagerModuleWrapper implements
   }
 }
 
+@SuppressWarnings("deprecation")
 interface UIBlockInterface extends com.facebook.react.uimanager.UIBlock, com.facebook.react.fabric.interop.UIBlock {
 }

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

@@ -20,7 +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,
+    "host.exp.exponent.experience.splashscreen.legacy.SplashScreenPackage" to 11,
     "expo.modules.updates.UpdatesPackage" to 10
   )
 }

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

@@ -40,6 +40,7 @@ public class ModuleRegistry {
     return (T) mInternalModulesMap.get(interfaceClass);
   }
 
+  @SuppressWarnings("unchecked")
   public <T> T getSingletonModule(String singletonName, Class<T> singletonClass) {
     return (T) mSingletonModulesMap.get(singletonName);
   }

package/android/src/main/java/expo/modules/core/arguments/ReadableArguments.java

@@ -63,6 +63,7 @@ public interface ReadableArguments {
 
   int size();
 
+  @SuppressWarnings("unchecked")
   default Bundle toBundle() {
     Bundle bundle = new Bundle();
     for (String key : keys()) {

package/android/src/main/java/expo/modules/interfaces/taskManager/TaskServiceProviderHelper.kt

@@ -0,0 +1,41 @@
+package expo.modules.interfaces.taskManager
+
+import android.content.Context
+import expo.modules.core.ModulePriorities
+import expo.modules.core.interfaces.DoNotStrip
+import expo.modules.core.interfaces.Package
+
+@DoNotStrip
+object TaskServiceProviderHelper {
+  /**
+   Uses reflection to look through the current list of packages and attempts to find
+   one that provides a TaskServiceInterface implementation.
+   @param context Provide the application context (context.getApplicationContext())
+   @return A implementation of the TaskServiceInterface it a package offers it
+   */
+  @DoNotStrip
+  fun getTaskServiceImpl(context: Context): TaskServiceInterface? {
+    // Use reflection to get the packages list from ExpoModulesPackageList without
+    // creating the reactInstanceManager. ExpoModulesPackageList is generated by
+    // autolinking and should safely be callable in this way - we already have a
+    // few other places in our code where it is called like this.
+    val expoModules: Class<*>? = try {
+      Class.forName("expo.modules.ExpoModulesPackageList")
+    } catch (e: ClassNotFoundException) {
+      // Handle the exception, e.g., log it or fallback to a default behavior
+      return null
+    }
+    val getPackageList = expoModules?.getMethod("getPackageList") ?: return null
+
+    // Invoke and get the list of packages
+    val result = getPackageList.invoke(null) as? List<*> ?: return null
+    val packages = result.filterIsInstance<Package>()
+      .sortedByDescending { ModulePriorities.get(it::class.qualifiedName) }
+
+    // Check if any of the packages are providing a task manager implementation
+    return packages
+      .filterIsInstance<TaskServiceProviderInterface>()
+      .firstOrNull()
+      ?.getTaskServiceImpl(context)
+  }
+}

package/android/src/main/java/expo/modules/interfaces/taskManager/TaskServiceProviderInterface.java

@@ -0,0 +1,18 @@
+package expo.modules.interfaces.taskManager;
+
+import android.content.Context;
+
+import expo.modules.core.interfaces.Package;
+
+/**
+ * Interface defining a package that provides a TaskServiceInterface implementation.
+ * This is utilized when an app is launched in the background without an activity.
+ * It enables running expo-task-manager JavaScript tasks in the background via the HeadlessAppLoader.
+ */
+public interface TaskServiceProviderInterface extends Package {
+  /**
+   * @param context Current application context
+   * @return A task service implementation that can be provided without having setup the whole app
+   */
+  TaskServiceInterface getTaskServiceImpl(Context context);
+}

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

@@ -46,15 +46,15 @@ fun Promise.toBridgePromise(): com.facebook.react.bridge.Promise {
     }
 
     override fun reject(code: String, message: String?) {
-      expoPromise.reject(code ?: unknownCode, message, null)
+      expoPromise.reject(code, message, null)
     }
 
     override fun reject(code: String, throwable: Throwable?) {
-      expoPromise.reject(code ?: unknownCode, null, throwable)
+      expoPromise.reject(code, null, throwable)
     }
 
     override fun reject(code: String, message: String?, throwable: Throwable?) {
-      expoPromise.reject(code ?: unknownCode, message, throwable)
+      expoPromise.reject(code, message, throwable)
     }
 
     override fun reject(throwable: Throwable) {
@@ -66,15 +66,15 @@ fun Promise.toBridgePromise(): com.facebook.react.bridge.Promise {
     }
 
     override fun reject(code: String, userInfo: WritableMap) {
-      expoPromise.reject(code ?: unknownCode, null, null)
+      expoPromise.reject(code, null, null)
     }
 
     override fun reject(code: String, throwable: Throwable?, userInfo: WritableMap) {
-      expoPromise.reject(code ?: unknownCode, null, throwable)
+      expoPromise.reject(code, null, throwable)
     }
 
     override fun reject(code: String, message: String?, userInfo: WritableMap) {
-      expoPromise.reject(code ?: unknownCode, message, null)
+      expoPromise.reject(code, message, null)
     }
 
     override fun reject(code: String?, message: String?, throwable: Throwable?, userInfo: WritableMap?) {

package/android/src/main/java/expo/modules/kotlin/classcomponent/ClassComponentBuilder.kt

@@ -32,10 +32,10 @@ class ClassComponentBuilder<SharedObjectType : Any>(
 
     if (eventsDefinition != null && isSharedObject) {
       listOf("__expo_onStartListeningToEvent" to SharedObject::onStartListeningToEvent, "__expo_onStopListeningToEvent" to SharedObject::onStopListeningToEvent)
-        .forEach { (name, function) ->
+        .forEach { (name, listener) ->
           SyncFunctionComponent(name, arrayOf(ownerType, toAnyType<String>()), toReturnType<Unit>()) { (self, eventName) ->
             enforceType<SharedObject, String>(self, eventName)
-            function.invoke(self, eventName)
+            listener.invoke(self, eventName)
           }.also { function ->
             function.enumerable(false)
             syncFunctions[name] = function

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoRequestCdpInterceptor.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.ResponseBody
+import java.lang.ref.WeakReference
 import java.math.BigDecimal
 import java.math.RoundingMode
 
@@ -22,18 +23,18 @@ import java.math.RoundingMode
  * dispatch CDP (Chrome DevTools Protocol: https://chromedevtools.github.io/devtools-protocol/) events.
  */
 object ExpoRequestCdpInterceptor : ExpoNetworkInspectOkHttpInterceptorsDelegate {
-  private var delegate: Delegate? = null
+  private var delegate: WeakReference<Delegate?> = WeakReference(null)
   internal var coroutineScope = CoroutineScope(Dispatchers.Default)
 
   fun setDelegate(delegate: Delegate?) {
     coroutineScope.launch {
-      this@ExpoRequestCdpInterceptor.delegate = delegate
+      this@ExpoRequestCdpInterceptor.delegate = WeakReference(delegate)
     }
   }
 
   private fun dispatchEvent(event: Event) {
     coroutineScope.launch {
-      this@ExpoRequestCdpInterceptor.delegate?.dispatch(event.toJson())
+      this@ExpoRequestCdpInterceptor.delegate.get()?.dispatch(event.toJson())
     }
   }
 

package/android/src/main/java/expo/modules/kotlin/exception/CommonExceptions.kt

@@ -70,4 +70,20 @@ class Exceptions {
    * An exception to throw when the root view is missing.
    */
   class MissingRootView : CodedException(message = "The root view is missing")
+
+  /**
+   * An exception to throw to indicate that a method has been passed an illegal or inappropriate argument.
+   */
+  class IllegalArgument(
+    message: String,
+    cause: Throwable? = null
+  ) : CodedException(message, cause)
+
+  /**
+   * An exception to signal that a method has been invoked at an illegal or inappropriate time.
+   */
+  class IllegalStateException(
+    message: String,
+    cause: Throwable? = null
+  ) : CodedException(message, cause)
 }

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

@@ -7,9 +7,6 @@ import expo.modules.kotlin.providers.AppContextProvider
 import expo.modules.kotlin.tracing.trace
 import expo.modules.kotlin.types.Enumerable
 import kotlinx.coroutines.CoroutineScope
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.primaryConstructor
 
 abstract class Module : AppContextProvider {
 
@@ -54,25 +51,6 @@ abstract class Module : AppContextProvider {
   }
 
   abstract fun definition(): ModuleDefinitionData
-
-  private fun <T> convertEnumToString(enumValue: T): String where T : Enumerable, T : Enum<T> {
-    val enumClass = enumValue::class
-    val primaryConstructor = enumClass.primaryConstructor
-    if (primaryConstructor?.parameters?.size == 1) {
-      val parameterName = primaryConstructor.parameters.first().name
-      val parameterProperty = enumClass
-        .declaredMemberProperties
-        .find { it.name == parameterName }
-
-      requireNotNull(parameterProperty) { "Cannot find a property for $parameterName parameter" }
-      require(parameterProperty.returnType.classifier == String::class) { "The enum parameter has to be a string." }
-
-      @Suppress("UNCHECKED_CAST")
-      return (parameterProperty as KProperty1<T, String>).get(enumValue)
-    }
-
-    return enumValue.name
-  }
 }
 
 @Suppress("FunctionName")

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

@@ -0,0 +1,25 @@
+package expo.modules.kotlin.modules
+
+import expo.modules.kotlin.types.Enumerable
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.primaryConstructor
+
+internal fun <T> convertEnumToString(enumValue: T): String where T : Enumerable, T : Enum<T> {
+  val enumClass = enumValue::class
+  val primaryConstructor = enumClass.primaryConstructor
+  if (primaryConstructor?.parameters?.size == 1) {
+    val parameterName = primaryConstructor.parameters.first().name
+    val parameterProperty = enumClass
+      .declaredMemberProperties
+      .find { it.name == parameterName }
+
+    requireNotNull(parameterProperty) { "Cannot find a property for $parameterName parameter" }
+    require(parameterProperty.returnType.classifier == String::class) { "The enum parameter has to be a string." }
+
+    @Suppress("UNCHECKED_CAST")
+    return (parameterProperty as KProperty1<T, String>).get(enumValue)
+  }
+
+  return enumValue.name
+}