expo-modules-core 56.0.5 → 56.0.6

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 56.0.6 — 2026-05-11
+
+### 💡 Others
+
+- [iOS] `AppContext.setRuntime` now takes the native React `RuntimeScheduler` pointer and a dispatch trampoline alongside the runtime pointer. ([#45636](https://github.com/expo/expo/pull/45636) by [@tsapeta](https://github.com/tsapeta))
+
 ## 56.0.5 — 2026-05-08
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -27,7 +27,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '56.0.5'
+version = '56.0.6'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -94,7 +94,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "56.0.5"
+    versionName "56.0.6"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/src/main/cpp/Exceptions.cpp

@@ -2,9 +2,6 @@
 
 #include "Exceptions.h"
 
-#include "JSIContext.h"
-#include "JSReferencesCache.h"
-
 namespace jni = facebook::jni;
 
 namespace expo {

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

@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <optional>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;

package/android/src/main/cpp/ExpoHeader.pch

@@ -1,11 +1,9 @@
 #pragma once
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <optional>
 #include <type_traits>
-#include <unistd.h>
 #include <unordered_map>
 #include <vector>
 

package/android/src/main/cpp/ExpoModulesHostObject.cpp

@@ -1,10 +1,9 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "ExpoModulesHostObject.h"
 #include "LazyObject.h"
 
-#include <folly/dynamic.h>
-#include <jsi/JSIDynamic.h>
 #include <react/bridging/LongLivedObject.h>
 
 namespace jsi = facebook::jsi;

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

@@ -2,11 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIContext.h"
 
-#include <jsi/jsi.h>
-
-#include <vector>
 #import <unordered_map>
 
 namespace jsi = facebook::jsi;

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/JNIFunctionBody.cpp

@@ -2,7 +2,6 @@
 
 #include "JNIFunctionBody.h"
 #include "Exceptions.h"
-#include "JavaReferencesCache.h"
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;

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

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeArray.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;

package/android/src/main/cpp/JNIInjector.cpp

@@ -1,5 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "RuntimeHolder.h"
 #include "JSIContext.h"
 #include "JavaScriptModuleObject.h"
@@ -26,7 +27,6 @@
 #endif
 
 #include <jni.h>
-#include <fbjni/fbjni.h>
 
 // Install all jni bindings
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {

package/android/src/main/cpp/JNIUtils.cpp

@@ -1,10 +1,10 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JNIUtils.h"
 #include "EventEmitter.h"
 #include "JSIUtils.h"
 #include "types/JNIToJSIConverter.h"
-#include <jsi/JSIDynamic.h>
 #include "JSIContext.h"
 #include "Exceptions.h"
 

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

@@ -2,12 +2,7 @@
 
 #pragma once
 
-#include <vector>
-#include <functional>
-
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-#include <react/jni/ReadableNativeMap.h>
+#include "ExpoHeader.pch"
 
 #include "JSIContext.h"
 #include "JavaScriptObject.h"

package/android/src/main/cpp/JSIContext.cpp

@@ -1,21 +1,17 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JSIContext.h"
 #include "Exceptions.h"
-#include "ExpoModulesHostObject.h"
 #include "JavaReferencesCache.h"
 #include "JSReferencesCache.h"
 #include "JSIUtils.h"
 #include "SharedObject.h"
-#include "SharedRef.h"
-#include "NativeModule.h"
 #include "decorators/JSDecoratorsBridgingObject.h"
 #include "decorators/JSClassesDecorator.h"
 
 #include <fbjni/detail/Meta.h>
-#include <fbjni/fbjni.h>
 
-#include <memory>
 #include <shared_mutex>
 
 namespace jni = facebook::jni;

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

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JavaScriptRuntime.h"
 #include "JavaScriptModuleObject.h"
 #include "JavaScriptValue.h"
@@ -12,8 +13,6 @@
 #include "ThreadSafeJNIGlobalRef.h"
 #include "javaclasses/JSRunnable.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
 
@@ -24,10 +23,6 @@
 
 #endif
 
-#include <ReactCommon/NativeMethodCallInvokerHolder.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;

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

@@ -2,13 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <type_traits>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/JavaCallback.cpp

@@ -1,20 +1,11 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JavaCallback.h"
 #include "JSIContext.h"
 #include "types/JNIToJSIConverter.h"
 #include "Exceptions.h"
 
-#include "JSIUtils.h"
-#include "JNIUtils.h"
-
-#include <fbjni/fbjni.h>
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
-#include <jsi/JSIDynamic.h>
-
-#include <functional>
-
 namespace expo {
 
 JavaCallback::CallbackContext::CallbackContext(
@@ -60,7 +51,6 @@ void JavaCallback::registerNatives() {
                  });
 }
 
-
 jni::local_ref<JavaCallback::javaobject> JavaCallback::newInstance(
   JSIContext *jsiContext,
   std::shared_ptr<CallbackContext> callbackContext
@@ -170,7 +160,11 @@ void JavaCallback::invokeFloat(float result) {
 }
 
 void JavaCallback::invokeString(jni::alias_ref<jstring> result) {
-  invokeJSFunction(result->toStdString());
+  JNIEnv *env = jni::Environment::current();
+  const char *rawValue = env->GetStringUTFChars(result.get(), nullptr);
+  std::string parsedResult = rawValue;
+  env->ReleaseStringUTFChars(result.get(), rawValue);
+  invokeJSFunction(parsedResult);
 }
 
 void JavaCallback::invokeCollection(jni::alias_ref<jni::JCollection<jobject>> result) {
@@ -198,7 +192,8 @@ void JavaCallback::invokeSharedObject(jni::alias_ref<JSharedObject::javaobject>
   invokeJSFunction(jni::make_global(result));
 }
 
-void JavaCallback::invokeJavaScriptArrayBuffer(jni::alias_ref<JavaScriptArrayBuffer::javaobject> result) {
+void JavaCallback::invokeJavaScriptArrayBuffer(
+  jni::alias_ref<JavaScriptArrayBuffer::javaobject> result) {
   invokeJSFunction(jni::make_global(result));
 }
 

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

@@ -2,18 +2,12 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JSharedObject.h"
 #include "JavaScriptArrayBuffer.h"
 #include "NativeArrayBuffer.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
-#include <variant>
-
-#include <react/jni/WritableNativeArray.h>
-#include <react/jni/WritableNativeMap.h>
 #include <fbjni/detail/CoreClasses.h>
 #include <ReactCommon/CallInvoker.h>
 #include <react/bridging/LongLivedObject.h>

package/android/src/main/cpp/JavaReferencesCache.cpp

@@ -1,9 +1,8 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JavaReferencesCache.h"
 
-#include <vector>
-
 namespace expo {
 
 JCache::JCache(JNIEnv *env) {

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

@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <memory>
-#include <unordered_map>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

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

@@ -1,13 +1,10 @@
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JavaScriptRuntime.h"
 
 #include <fbjni/ByteBuffer.h>
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
 
 namespace expo {
 

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

@@ -2,13 +2,11 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JavaScriptRuntime.h"
 #include "types/ExpectedType.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 
@@ -40,7 +38,6 @@ public:
 
   std::shared_ptr<jsi::Function> get() override;
 
-
 private:
   friend HybridBase;
 

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

@@ -2,11 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <vector>
-#include <memory>
+#include "ExpoHeader.pch"
 
 #include "decorators/JSDecorator.h"
 

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

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JSITypeConverter.h"
 #include "JavaScriptRuntime.h"
@@ -9,11 +10,6 @@
 #include "JNIDeallocator.h"
 #include "JSIUtils.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

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

@@ -5,7 +5,6 @@
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
 #include "JSIContext.h"
-#include "JSIUtils.h"
 
 namespace jsi = facebook::jsi;
 

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

@@ -2,10 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvoker.h>
 
 namespace jsi = facebook::jsi;

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

@@ -1,13 +1,10 @@
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "TypedArray.h"
 #include "JavaScriptObject.h"
 
-#include <fbjni/fbjni.h>
 #include <fbjni/ByteBuffer.h>
-#include <jsi/jsi.h>
-
-#include <memory>
 
 namespace expo {
 

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

@@ -2,16 +2,12 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JavaScriptTypedArray.h"
 #include "JavaScriptArrayBuffer.h"
 #include "JNIDeallocator.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

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

@@ -2,14 +2,10 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JavaScriptObject.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

package/android/src/main/cpp/MethodMetadata.cpp

@@ -1,8 +1,6 @@
+#include "ExpoHeader.pch"
 #include "MethodMetadata.h"
 #include "JSIContext.h"
-#include "JavaScriptValue.h"
-#include "JavaScriptObject.h"
-#include "JavaScriptTypedArray.h"
 #include "JavaReferencesCache.h"
 #include "Exceptions.h"
 #include "JavaCallback.h"
@@ -10,9 +8,6 @@
 #include "JSReferencesCache.h"
 
 #include <utility>
-#include <functional>
-#include <unistd.h>
-#include <optional>
 
 #include <react/bridging/LongLivedObject.h>
 

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

@@ -2,20 +2,12 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "types/CppType.h"
 #include "types/ExpectedType.h"
 #include "types/AnyType.h"
 #include "types/ReturnType.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
-#include <ReactCommon/TurboModuleUtils.h>
-#include <react/jni/ReadableNativeArray.h>
-#include <memory>
-#include <vector>
-#include <folly/dynamic.h>
-#include <jsi/JSIDynamic.h>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;

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

@@ -1,16 +1,13 @@
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JSIContext.h"
 
 #include <fbjni/ByteBuffer.h>
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 
 #include "TypedArray.h"
 
-#include <memory>
-
 namespace expo {
 
 class JavaScriptRuntime;

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

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include "ExpoHeader.pch"
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 #include <android/log.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/concepts/jni.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <fbjni/fbjni.h>
 #include "jni_deref.h"
 
 namespace jni = facebook::jni;
@@ -13,9 +13,6 @@ namespace expo {
 template<typename T>
 concept HasCthis = requires(T &t) { t->cthis(); };
 
-template<typename T>
-concept HasToStdString = requires(T &t) { t->toStdString(); };
-
 template<typename T>
 concept HasValue = requires(T &t) { t->value(); };
 
@@ -25,6 +22,9 @@ concept HasGetRegion = requires(T &t, jsize s) { t->getRegion(s, s); };
 template<typename T>
 concept IsJBoolean = std::is_same_v<jni_deref_t<T>, jni::JBoolean>;
 
+template<typename T>
+concept IsJString = std::is_same_v<jni_deref_t<T>, jni::JString>;
+
 template<typename T>
 concept JniRef =
   std::is_same_v<T, jni::local_ref<jni_deref_t<T>>> ||

package/android/src/main/cpp/concepts/jni_deref.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <fbjni/fbjni.h>
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/concepts/jsi.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <jsi/jsi.h>
 
 namespace jsi = facebook::jsi;
 

package/android/src/main/cpp/decorators/JSClassesDecorator.h

@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <map>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../MethodMetadata.h"

package/android/src/main/cpp/decorators/JSConstantsDecorator.cpp

@@ -1,15 +1,12 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSConstantsDecorator.h"
 #include "../JavaScriptObject.h"
 #include "JSIUtils.h"
-#include "JSFunctionsDecorator.h"
 #include "../JSIContext.h"
 #include "../types/JNIToJSIConverter.h"
 
-#include <jsi/jsi.h>
-#include <jsi/JSIDynamic.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSConstantsDecorator.h

@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
-#include <folly/dynamic.h>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../JNIFunctionBody.h"

package/android/src/main/cpp/decorators/JSDecorator.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;

package/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h

@@ -2,12 +2,9 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <vector>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
-#include "../MethodMetadata.h"
 #include "../JNIFunctionBody.h"
 #include "../types/ExpectedType.h"
 

package/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp

@@ -1,10 +1,9 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSFunctionsDecorator.h"
 #include "JSIUtils.h"
 
-#include <jsi/jsi.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSFunctionsDecorator.h

@@ -2,11 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <unordered_map>
-#include <memory>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../MethodMetadata.h"

package/android/src/main/cpp/decorators/JSObjectDecorator.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 

package/android/src/main/cpp/decorators/JSPropertiesDecorator.cpp

@@ -1,12 +1,11 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSPropertiesDecorator.h"
 #include "../JavaScriptObject.h"
 #include "JSIUtils.h"
 #include "JSFunctionsDecorator.h"
 
-#include <jsi/jsi.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSPropertiesDecorator.h

@@ -1,8 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
-#include <fbjni/fbjni.h>
-
-#include <unordered_map>
+#include "../ExpoHeader.pch"
 
 #include "../MethodMetadata.h"
 #include "../JNIFunctionBody.h"

package/android/src/main/cpp/fabric/AndroidExpoViewProps.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "ExpoViewProps.h"
 
-#include <fbjni/fbjni.h>
 #include <react/renderer/core/RawValue.h>
 
 namespace react = facebook::react;

package/android/src/main/cpp/fabric/AndroidExpoViewState.h

@@ -1,8 +1,6 @@
+#include "../ExpoHeader.pch"
 #include "ExpoViewState.h"
 
-#include "AndroidExpoViewProps.h"
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 

package/android/src/main/cpp/fabric/FabricComponentsRegistry.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 #include <CoreComponentsRegistry.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 

package/android/src/main/cpp/fabric/NativeStatePropsGetter.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/fabric/CoreComponentsRegistry.h>
+#include "../ExpoHeader.pch"
 #include <react/fabric/StateWrapperImpl.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/installers/MainRuntimeInstaller.h

@@ -1,10 +1,9 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "../JSIContext.h"
-#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
-#include "SharedObject.h"
 
 #if IS_NEW_ARCHITECTURE_ENABLED
 

package/android/src/main/cpp/installers/WorkletRuntimeInstaller.h

@@ -1,9 +1,8 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "MainRuntimeInstaller.h"
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/javaclasses/Collections.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/javaclasses/JSRunnable.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/types/AnyType.cpp

@@ -2,7 +2,6 @@
 
 #include "AnyType.h"
 #include "FrontendConverterProvider.h"
-#include "../JSIContext.h"
 
 namespace expo {
 AnyType::AnyType(

package/android/src/main/cpp/types/AnyType.h

@@ -2,11 +2,10 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "ExpectedType.h"
 #include "FrontendConverter.h"
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/types/ExpectedType.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
-#include <fbjni/fbjni.h>
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/types/FrontendConverter.cpp

@@ -1,5 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "FrontendConverter.h"
 #include "ExpectedType.h"
 #include "FrontendConverterProvider.h"
@@ -17,7 +18,6 @@
 
 #include "react/jni/ReadableNativeMap.h"
 #include "react/jni/ReadableNativeArray.h"
-#include <jsi/JSIDynamic.h>
 
 #include <utility>
 #include <algorithm>

package/android/src/main/cpp/types/FrontendConverter.h

@@ -2,11 +2,9 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
-
 #if WORKLETS_ENABLED
 
 #include <worklets/SharedItems/Synchronizable.h>

package/android/src/main/cpp/types/FrontendConverterProvider.h

@@ -2,15 +2,11 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
 #include "FrontendConverter.h"
 #include "ExpectedType.h"
 
-#include <fbjni/fbjni.h>
-
-#include <memory>
-#include <unordered_map>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/types/JNIToJSIConverter.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "../JSIContext.h"
 #include "../JSharedObject.h"
 #include "../JNIUtils.h"
 #include "ObjectDeallocator.h"
-#include "../javaclasses/Collections.h"
 #include "../JavaScriptArrayBuffer.h"
 #include "../NativeArrayBuffer.h"
 #include "../concepts/jni_deref.h"
@@ -14,17 +14,8 @@
 #include "../concepts/jsi.h"
 #include "ReturnType.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-#include <optional>
 #include <concepts>
 
-#include <react/jni/ReadableNativeMap.h>
-#include <react/jni/ReadableNativeArray.h>
-#include <react/jni/WritableNativeArray.h>
-#include <react/jni/WritableNativeMap.h>
-#include <jsi/JSIDynamic.h>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
@@ -63,11 +54,17 @@ struct RawArray {
 };
 
 template<typename T>
-inline auto unwrapJNIRef(T &&value) {
+inline auto unwrapJNIRef(
+  JNIEnv *env,
+  T &&value
+) {
   if constexpr (HasCthis<T>) {
     return value->cthis();
-  } else if constexpr (HasToStdString<T>) {
-    return value->toStdString();
+  } else if constexpr (IsJString<T>) {
+    const char *rawValue = env->GetStringUTFChars(value.get(), nullptr);
+    std::string result = rawValue;
+    env->ReleaseStringUTFChars(value.get(), rawValue);
+    return result;
   } else if constexpr (IsJBoolean<T>) {
     return static_cast<bool>(value->value());
   } else if constexpr (HasValue<T>) {
@@ -287,13 +284,13 @@ concept SimpleConversion = requires(JNIEnv *env, jsi::Runtime &rt, T value) {
 
 template<typename T>
 jsi::Value convertToJS(JNIEnv *env, jsi::Runtime &rt, T &&value) {
-  using UnwrappedType = decltype(unwrapJNIRef(std::declval<T>()));
+  using UnwrappedType = decltype(unwrapJNIRef(env, std::declval<T>()));
   using Converter = JNIToJSIConverter<UnwrappedType>;
 
   if constexpr (SimpleConversion<Converter, UnwrappedType>) {
-    return Converter::convert(env, rt, unwrapJNIRef(std::forward<T>(value)));
+    return Converter::convert(env, rt, unwrapJNIRef(env, std::forward<T>(value)));
   } else {
-    return Converter::convert(env, rt, unwrapJNIRef(value), value);
+    return Converter::convert(env, rt, unwrapJNIRef(env, value), value);
   }
 }
 

package/android/src/main/cpp/worklets/Serializable.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include "../JSIContext.h"
 #include "../JNIDeallocator.h"
-#include "WorkletNativeRuntime.h"
 
-#include <fbjni/fbjni.h>
 #include <worklets/SharedItems/Serializable.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/worklets/Worklet.h

@@ -1,15 +1,12 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
-#include "../JSIContext.h"
-#include "../JNIDeallocator.h"
 #include "WorkletNativeRuntime.h"
 #include "Serializable.h"
 
-#include <fbjni/fbjni.h>
-#include <worklets/SharedItems/Serializable.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/worklets/WorkletJSCallInvoker.h

@@ -1,15 +1,13 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/RuntimeExecutor.h>
 
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
-#include <memory>
-
-
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 

package/android/src/main/cpp/worklets/WorkletNativeRuntime.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
 #endif
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/ios/Core/AppContext.swift

@@ -429,12 +429,34 @@ public final class AppContext: NSObject, EXAppContextProtocol, @unchecked Sendab
   // MARK: - Runtime
 
   /**
-   Sets the JavaScript runtime from a raw pointer to a `facebook::jsi::Runtime` instance.
-   Called from ObjC++ (e.g. `ExpoReactNativeFactory`) when React Native initializes the runtime.
+   Sets the JavaScript runtime from raw pointers. Called by `ExpoReactNativeFactory`
+   when React Native initializes the runtime. When `scheduler` and `dispatch`
+   are both provided, `JavaScriptRuntime.schedule(...)` / `.execute(...)` dispatch
+   onto the JS thread through them. When either is `nil`, the runtime falls back
+   to a synchronous no-op scheduler — callers can detect this via
+   `JavaScriptRuntime.supportsAsyncScheduling`.
+
+   `dispatch` is a raw pointer to a C function with signature
+   `void (*)(void *scheduler, int priority, void (^callback)())` — cast back
+   to the typed pointer inside `ExpoModulesJSI`. It's typed as `UnsafeRawPointer`
+   here rather than `@convention(c)` so the symbol can cross the Objective-C
+   bridge without needing a Swift-typed entry point.
    */
   @objc
-  public func setRuntime(_ runtimePointer: UnsafeMutableRawPointer) {
-    _runtime = ExpoRuntime(unsafePointer: runtimePointer)
+  public func setRuntime(
+    _ runtimePointer: UnsafeMutableRawPointer,
+    scheduler: UnsafeMutableRawPointer?,
+    dispatch: UnsafeRawPointer?
+  ) {
+    if let scheduler, let dispatch {
+      _runtime = ExpoRuntime(
+        unsafePointer: runtimePointer,
+        scheduler: scheduler,
+        dispatch: dispatch
+      )
+    } else {
+      _runtime = ExpoRuntime(unsafePointer: runtimePointer)
+    }
   }
 
   @JavaScriptActor

package/ios/JS/EXReactSchedulerDispatch.h

@@ -0,0 +1,28 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#ifdef __cplusplus
+
+namespace expo {
+
+/**
+ Trampoline that `ExpoModulesJSI` calls to dispatch work onto the JS thread.
+ Casts the `nativeScheduler` pointer back to a `react::RuntimeScheduler *` and
+ calls `scheduleTask` on it. The signature matches `expo::RuntimeScheduler::ScheduleFn`
+ declared in the xcframework's `RuntimeScheduler.h`.
+
+ Lives in ExpoModulesCore (rather than in the xcframework) so that
+ ExpoModulesJSI.framework's prebuilt binary doesn't need to link against
+ React-runtimescheduler — important for source-built RN, where those symbols
+ are hidden after link and unreachable via -undefined dynamic_lookup.
+
+ Hosts that initialize their own runtime (e.g. ExpoReactNativeFactory, Expo Go)
+ pass `&expo::dispatchOnReactScheduler` as the `dispatch` argument to
+ `AppContext.setRuntime`.
+ */
+void dispatchOnReactScheduler(void *nativeScheduler, int priority, void (^callback)()) noexcept;
+
+} // namespace expo
+
+#endif // __cplusplus

package/ios/JS/EXReactSchedulerDispatch.mm

@@ -0,0 +1,19 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import "EXReactSchedulerDispatch.h"
+
+#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace expo {
+
+void dispatchOnReactScheduler(void *nativeScheduler, int priority, void (^callback)()) noexcept
+{
+  auto *scheduler = static_cast<facebook::react::RuntimeScheduler *>(nativeScheduler);
+  scheduler->scheduleTask(
+    static_cast<facebook::react::SchedulerPriority>(priority),
+    [callback](facebook::jsi::Runtime &) {
+      callback();
+    });
+}
+
+} // namespace expo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "56.0.5",
+  "version": "56.0.6",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@expo/expo-modules-macros-plugin": "~0.0.8",
-    "expo-modules-jsi": "~56.0.2",
+    "expo-modules-jsi": "~56.0.3",
     "invariant": "^2.2.4"
   },
   "peerDependencies": {
@@ -66,7 +66,7 @@
     "@types/invariant": "^2.2.33",
     "expo-module-scripts": "56.0.2"
   },
-  "gitHead": "a30353e69ca0d72b9fac5830abc631feda1ba3ae",
+  "gitHead": "42013232893cb2aa71ab218e9b422d4a8476b3f0",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",