expo-modules-core 1.11.0 → 1.11.2

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 1.11.2 — 2023-12-15
+
+### 💡 Others
+
+- [Android] Bump Kotlin version from `1.8.10` to `1.8.22`. ([#25945](https://github.com/expo/expo/pull/25945) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.11.1 — 2023-12-12
+
+### 🐛 Bug fixes
+
+- [Android] Fixed `OnCreate` was called before the `React` instance was ready. ([#25866](https://github.com/expo/expo/pull/25866) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.11.0 — 2023-12-12
 
 ### 🎉 New features

package/android/ExpoModulesCorePlugin.gradle

@@ -23,14 +23,15 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
           "1.6.21": "1.6.21-1.0.6",
           "1.7.22": "1.7.22-1.0.8",
           "1.8.0": "1.8.0-1.0.9",
-          "1.8.10": "1.8.10-1.0.9"
+          "1.8.10": "1.8.10-1.0.9",
+          "1.8.22": "1.8.22-1.0.11"
         ]
 
         project.rootProject.ext.has("kspVersion")
           ? project.rootProject.ext.get("kspVersion")
           : kspVersionsMap.containsKey(project.ext.kotlinVersion())
           ? kspVersionsMap.get(project.ext.kotlinVersion())
-          : "1.8.10-1.0.9"
+          : "1.8.22-1.0.11"
       }
     }
 

package/android/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '1.11.0'
+version = '1.11.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -143,7 +143,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.11.0"
+    versionName "1.11.2"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -223,46 +223,34 @@ android {
   }
 }
 
-
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "org.jetbrains.kotlin:kotlin-reflect:${getKotlinVersion()}"
-  implementation 'androidx.annotation:annotation:1.3.0'
+  implementation 'androidx.annotation:annotation:1.7.1'
 
   api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
-  api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
-  api "androidx.core:core-ktx:1.6.0"
+  api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+  api "androidx.core:core-ktx:1.12.0"
   api project(':expo-modules-core$android-annotation')
 
-  /**
-   * ReactActivity (the base activity for every React Native application) is subclassing AndroidX classes.
-   * Unfortunately until https://github.com/facebook/react-native/pull/33072 is released React Native uses "androidx.appcompat:appcompat:1.0.2".
-   * Gradle is picking the highest version of the dependency so we enforce higher version here.
-   * see https://docs.gradle.org/current/userguide/dependency_resolution.html#sec:version-conflict
-   * We're enforcing the most up-to-date versions of the dependencies here that are used in subclassing chain for ReactActivity.
-   */
-  implementation "androidx.appcompat:appcompat:1.4.1"
-  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")
+  implementation("androidx.tracing:tracing-ktx:1.2.0")
 
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 
-  compileOnly 'com.facebook.fbjni:fbjni:0.3.0'
+  compileOnly 'com.facebook.fbjni:fbjni:0.5.1'
 
-  testImplementation 'androidx.test:core:1.4.0'
+  testImplementation 'androidx.test:core:1.5.0'
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'io.mockk:mockk:1.12.3'
+  testImplementation 'io.mockk:mockk:1.13.5'
   testImplementation "com.google.truth:truth:1.1.2"
-  testImplementation "org.robolectric:robolectric:4.10"
+  testImplementation "org.robolectric:robolectric:4.11.1"
   testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
   testImplementation "org.json:json:20230227"
 
-  androidTestImplementation 'androidx.test:runner:1.4.0'
-  androidTestImplementation 'androidx.test:core:1.4.0'
-  androidTestImplementation 'androidx.test:rules:1.4.0'
+  androidTestImplementation 'androidx.test:runner:1.5.2'
+  androidTestImplementation 'androidx.test:core:1.5.0'
+  androidTestImplementation 'androidx.test:rules:1.5.0'
   androidTestImplementation "io.mockk:mockk-android:1.12.3"
   androidTestImplementation "com.google.truth:truth:1.1.2"
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"

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

@@ -97,7 +97,10 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
     }
 
     mModuleRegistry.ensureIsInitialized();
-    getKotlinInteropModuleRegistry().installJSIInterop();
+
+    KotlinInteropModuleRegistry kotlinModuleRegistry = getKotlinInteropModuleRegistry();
+    kotlinModuleRegistry.emitOnCreate();
+    kotlinModuleRegistry.installJSIInterop();
 
     Collection<ExportedModule> exportedModules = mModuleRegistry.getAllExportedModules();
 

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

@@ -121,7 +121,7 @@ class AppContext(
       addActivityEventListener(reactLifecycleDelegate)
 
       // Registering modules has to happen at the very end of `AppContext` creation. Some modules need to access
-      // `AppContext` during their initialisation (or during `OnCreate` method), so we need to ensure all `AppContext`'s
+      // `AppContext` during their initialisation, so we need to ensure all `AppContext`'s
       // properties are initialized first. Not having that would trigger NPE.
       registry.register(ErrorManagerModule())
       registry.register(NativeModulesProxyModule())
@@ -131,6 +131,12 @@ class AppContext(
     }
   }
 
+  fun onCreate() = trace("AppContext.onCreate") {
+    registry.readyForPostingEvents()
+    registry.post(EventName.MODULE_CREATE)
+    registry.flushTheEventQueue()
+  }
+
   /**
    * Initializes a JSI part of the module registry.
    * It will be a NOOP if the remote debugging was activated.

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

@@ -128,6 +128,10 @@ class KotlinInteropModuleRegistry(
     appContext.installJSIInterop()
   }
 
+  fun emitOnCreate() {
+    appContext.onCreate()
+  }
+
   fun setLegacyModulesProxy(proxyModule: NativeModulesProxy) {
     appContext.legacyModulesProxyHolder = WeakReference(proxyModule)
   }

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

@@ -16,6 +16,10 @@ class ModuleRegistry(
   @PublishedApi
   internal val registry = mutableMapOf<String, ModuleHolder<*>>()
 
+  private val eventQueue = mutableListOf<PostponedEvent>()
+
+  private var isReadyForPostingEvents = false
+
   fun <T : Module> register(module: T) = trace("ModuleRegistry.register(${module.javaClass})") {
     module._appContext = requireNotNull(appContext.get()) { "Cannot create a module for invalid app context." }
 
@@ -30,7 +34,6 @@ class ModuleRegistry(
     }
 
     holder.apply {
-      post(EventName.MODULE_CREATE)
       registerContracts()
     }
 
@@ -73,20 +76,30 @@ class ModuleRegistry(
   }
 
   fun post(eventName: EventName) {
+    if (addToQueueIfNeeded(eventName)) {
+      return
+    }
+
     forEach {
       it.post(eventName)
     }
   }
 
-  @Suppress("UNCHECKED_CAST")
   fun <Sender> post(eventName: EventName, sender: Sender) {
+    if (addToQueueIfNeeded(eventName, sender)) {
+      return
+    }
+
     forEach {
       it.post(eventName, sender)
     }
   }
 
-  @Suppress("UNCHECKED_CAST")
   fun <Sender, Payload> post(eventName: EventName, sender: Sender, payload: Payload) {
+    if (addToQueueIfNeeded(eventName, sender, payload)) {
+      return
+    }
+
     forEach {
       it.post(eventName, sender, payload)
     }
@@ -98,4 +111,60 @@ class ModuleRegistry(
     registry.clear()
     logger.info("✅ ModuleRegistry was destroyed")
   }
+
+  /**
+   * Tell the modules registry it can handle events as they come, without adding them to the event queue.
+   */
+  fun readyForPostingEvents() = synchronized(this) {
+    isReadyForPostingEvents = true
+  }
+
+  fun flushTheEventQueue() = synchronized(this) {
+    eventQueue.forEach { event ->
+      forEach {
+        event.post(it)
+      }
+    }
+    eventQueue.clear()
+  }
+
+  /**
+   * It’s important that the [EventName.MODULE_CREATE] event is emitted first by the registry.
+   * However, some events like [EventName.ACTIVITY_ENTERS_FOREGROUND] are automatically emitted when the catalyst instance is created.
+   * To ensure the correct order of events, we capture all events that are emitted
+   * during the initialization phase and send them back to the modules later.
+   * This way, we can ensure that the order of events is correct.
+   */
+  private fun addToQueueIfNeeded(
+    eventName: EventName,
+    sender: Any? = null,
+    payload: Any? = null
+  ): Boolean = synchronized(this) {
+    if (isReadyForPostingEvents) {
+      return false
+    }
+
+    eventQueue.add(PostponedEvent(eventName, sender, payload))
+    return true
+  }
+
+  data class PostponedEvent(
+    val eventName: EventName,
+    val sender: Any? = null,
+    val payload: Any? = null
+  ) {
+    fun post(moduleHolder: ModuleHolder<*>) {
+      if (sender != null && payload != null) {
+        moduleHolder.post(eventName, sender, payload)
+        return
+      }
+
+      if (sender != null) {
+        moduleHolder.post(eventName, sender)
+        return
+      }
+
+      moduleHolder.post(eventName)
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "6aca7ce098ddc667776a3d7cf612adbb985e264a"
+  "gitHead": "1a7c4e8ffed182e00cf1cf654ca2401441a7377a"
 }