From a4263327ef63d37a972c1f4f24119a2645a5c1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= Date: Sat, 9 May 2026 19:28:24 +0200 Subject: [PATCH] [core][Android] Cleanup headers (#45593) --- .../android/src/main/cpp/Exceptions.cpp | 3 --- .../android/src/main/cpp/Exceptions.h | 5 +---- .../android/src/main/cpp/ExpoHeader.pch | 2 -- .../android/src/main/cpp/ExpoModulesHostObject.cpp | 3 +-- .../android/src/main/cpp/ExpoModulesHostObject.h | 4 +--- .../android/src/main/cpp/JNIDeallocator.h | 2 +- .../android/src/main/cpp/JNIFunctionBody.cpp | 1 - .../android/src/main/cpp/JNIFunctionBody.h | 3 +-- .../android/src/main/cpp/JNIInjector.cpp | 2 +- .../android/src/main/cpp/JNIUtils.cpp | 2 +- .../android/src/main/cpp/JNIUtils.h | 7 +------ .../android/src/main/cpp/JSIContext.cpp | 6 +----- .../android/src/main/cpp/JSIContext.h | 7 +------ .../android/src/main/cpp/JSITypeConverter.h | 6 +----- .../android/src/main/cpp/JSharedObject.h | 2 +- .../android/src/main/cpp/JavaCallback.cpp | 12 +----------- .../android/src/main/cpp/JavaCallback.h | 8 +------- .../android/src/main/cpp/JavaReferencesCache.cpp | 3 +-- .../android/src/main/cpp/JavaReferencesCache.h | 5 +---- .../android/src/main/cpp/JavaScriptArrayBuffer.h | 5 +---- .../android/src/main/cpp/JavaScriptFunction.h | 5 +---- .../android/src/main/cpp/JavaScriptModuleObject.h | 6 +----- .../android/src/main/cpp/JavaScriptObject.h | 6 +----- .../android/src/main/cpp/JavaScriptRuntime.cpp | 1 - .../android/src/main/cpp/JavaScriptRuntime.h | 3 +-- .../android/src/main/cpp/JavaScriptTypedArray.h | 5 +---- .../android/src/main/cpp/JavaScriptValue.h | 6 +----- .../android/src/main/cpp/JavaScriptWeakObject.h | 6 +----- .../android/src/main/cpp/MethodMetadata.cpp | 7 +------ .../android/src/main/cpp/MethodMetadata.h | 10 +--------- .../android/src/main/cpp/NativeArrayBuffer.h | 5 +---- .../android/src/main/cpp/RuntimeHolder.h | 3 +-- .../android/src/main/cpp/ThreadSafeJNIGlobalRef.h | 2 +- .../android/src/main/cpp/concepts/jni.h | 2 +- .../android/src/main/cpp/concepts/jni_deref.h | 2 +- .../android/src/main/cpp/concepts/jsi.h | 2 +- .../src/main/cpp/decorators/JSClassesDecorator.h | 4 +--- .../src/main/cpp/decorators/JSConstantsDecorator.cpp | 5 +---- .../src/main/cpp/decorators/JSConstantsDecorator.h | 4 +--- .../android/src/main/cpp/decorators/JSDecorator.h | 3 +-- .../main/cpp/decorators/JSDecoratorsBridgingObject.h | 5 +---- .../src/main/cpp/decorators/JSFunctionsDecorator.cpp | 3 +-- .../src/main/cpp/decorators/JSFunctionsDecorator.h | 6 +----- .../src/main/cpp/decorators/JSObjectDecorator.h | 2 +- .../main/cpp/decorators/JSPropertiesDecorator.cpp | 3 +-- .../src/main/cpp/decorators/JSPropertiesDecorator.h | 4 +--- .../src/main/cpp/fabric/AndroidExpoViewProps.h | 2 +- .../src/main/cpp/fabric/AndroidExpoViewState.h | 4 +--- .../src/main/cpp/fabric/FabricComponentsRegistry.h | 2 +- .../src/main/cpp/fabric/NativeStatePropsGetter.h | 3 +-- .../src/main/cpp/installers/MainRuntimeInstaller.h | 3 +-- .../main/cpp/installers/WorkletRuntimeInstaller.h | 3 +-- .../android/src/main/cpp/javaclasses/Collections.h | 2 +- .../android/src/main/cpp/javaclasses/JSRunnable.h | 2 +- .../android/src/main/cpp/types/AnyType.cpp | 1 - .../android/src/main/cpp/types/AnyType.h | 3 +-- .../android/src/main/cpp/types/ExpectedType.h | 2 +- .../android/src/main/cpp/types/FrontendConverter.cpp | 2 +- .../android/src/main/cpp/types/FrontendConverter.h | 4 +--- .../src/main/cpp/types/FrontendConverterProvider.h | 6 +----- .../android/src/main/cpp/types/JNIToJSIConverter.h | 11 +---------- .../android/src/main/cpp/worklets/Serializable.h | 4 ++-- .../android/src/main/cpp/worklets/Worklet.h | 7 ++----- .../src/main/cpp/worklets/WorkletJSCallInvoker.h | 6 ++---- .../src/main/cpp/worklets/WorkletNativeRuntime.h | 4 ++-- 65 files changed, 64 insertions(+), 205 deletions(-) diff --git a/packages/expo-modules-core/android/src/main/cpp/Exceptions.cpp b/packages/expo-modules-core/android/src/main/cpp/Exceptions.cpp index 0d7f8d9c03c354..db75d032d9b2e3 100644 --- a/packages/expo-modules-core/android/src/main/cpp/Exceptions.cpp +++ b/packages/expo-modules-core/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 { diff --git a/packages/expo-modules-core/android/src/main/cpp/Exceptions.h b/packages/expo-modules-core/android/src/main/cpp/Exceptions.h index 962ba07149c8fc..f856ab48377bae 100644 --- a/packages/expo-modules-core/android/src/main/cpp/Exceptions.h +++ b/packages/expo-modules-core/android/src/main/cpp/Exceptions.h @@ -2,10 +2,7 @@ #pragma once -#include -#include - -#include +#include "ExpoHeader.pch" namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch b/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch index 143d4226d33ec1..10a71166192032 100644 --- a/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch +++ b/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch @@ -1,11 +1,9 @@ #pragma once #include -#include #include #include #include -#include #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.cpp b/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.cpp index 3ab6a49e6cf2e6..f047bf5da964a6 100644 --- a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.cpp +++ b/packages/expo-modules-core/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 -#include #include namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h b/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h index a3ebc0cb9fd655..32de3652a40108 100644 --- a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h +++ b/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h @@ -2,11 +2,9 @@ #pragma once +#include "ExpoHeader.pch" #include "JSIContext.h" -#include - -#include #import namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h b/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h index e38ce089a0506a..c946ad5c8a47d4 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h +++ b/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "ExpoHeader.pch" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.cpp index 54a3e39cf18826..77fc9cba96fa9b 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.cpp +++ b/packages/expo-modules-core/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; diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h b/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h index 5c193f6c3446a1..0195593775ace3 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h +++ b/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h @@ -2,8 +2,7 @@ #pragma once -#include -#include +#include "ExpoHeader.pch" namespace jni = facebook::jni; namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIInjector.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIInjector.cpp index 805070d6f7afec..cdf3440af4963b 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIInjector.cpp +++ b/packages/expo-modules-core/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 -#include // Install all jni bindings JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIUtils.cpp index 6be044cc2b3a75..349376744edf54 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.cpp +++ b/packages/expo-modules-core/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 #include "JSIContext.h" #include "Exceptions.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h b/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h index 6b4ece16479b8b..1fcf82285ed167 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h +++ b/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h @@ -2,12 +2,7 @@ #pragma once -#include -#include - -#include -#include -#include +#include "ExpoHeader.pch" #include "JSIContext.h" #include "JavaScriptObject.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/JSIContext.cpp b/packages/expo-modules-core/android/src/main/cpp/JSIContext.cpp index 99a707251577d0..79def47e0071b9 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JSIContext.cpp +++ b/packages/expo-modules-core/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 -#include -#include #include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/JSIContext.h b/packages/expo-modules-core/android/src/main/cpp/JSIContext.h index 81bfeb50beb824..1976430500602a 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JSIContext.h +++ b/packages/expo-modules-core/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 -#include #include #include @@ -24,10 +23,6 @@ #endif -#include - -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h b/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h index 554071b8085047..4a479cbfbe45eb 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h +++ b/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h @@ -2,13 +2,9 @@ #pragma once +#include "ExpoHeader.pch" #include "JSIObjectWrapper.h" -#include -#include - -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h b/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h index 21ba4c7655b3fc..7a1a10553f868a 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h +++ b/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "ExpoHeader.pch" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaCallback.cpp index 94060715194686..a74ebd13cea2b0 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.cpp +++ b/packages/expo-modules-core/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 -#include -#include -#include - -#include - namespace expo { JavaCallback::CallbackContext::CallbackContext( @@ -60,7 +51,6 @@ void JavaCallback::registerNatives() { }); } - jni::local_ref JavaCallback::newInstance( JSIContext *jsiContext, std::shared_ptr callbackContext diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.h b/packages/expo-modules-core/android/src/main/cpp/JavaCallback.h index 1e70d9f4514ee4..483145fe9065dc 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.h +++ b/packages/expo-modules-core/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 -#include -#include -#include - -#include -#include #include #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.cpp index f4c839fe991e67..a668cec5eaffb0 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.cpp +++ b/packages/expo-modules-core/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 - namespace expo { JCache::JCache(JNIEnv *env) { diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h b/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h index 327a40a32120e1..390c0965204886 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h @@ -2,10 +2,7 @@ #pragma once -#include - -#include -#include +#include "ExpoHeader.pch" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h index 8ca7a1db5a8a47..0a3c3a6e133634 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h @@ -1,13 +1,10 @@ #pragma once +#include "ExpoHeader.pch" #include "JNIDeallocator.h" #include "JavaScriptRuntime.h" #include -#include -#include - -#include namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptFunction.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptFunction.h index 928ecf1303ad0a..8e8c44940e95f7 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptFunction.h +++ b/packages/expo-modules-core/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 -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; @@ -40,7 +38,6 @@ class JavaScriptFunction : public jni::HybridClass get() override; - private: friend HybridBase; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h index 3618b5d8327968..0686bbbba0349e 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h @@ -2,11 +2,7 @@ #pragma once -#include -#include - -#include -#include +#include "ExpoHeader.pch" #include "decorators/JSDecorator.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptObject.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptObject.h index bdf183d6c35093..3ebc77e2307938 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptObject.h +++ b/packages/expo-modules-core/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 -#include - -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.cpp index 9e196c46e904f1..fe53c9f6c1e593 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.cpp +++ b/packages/expo-modules-core/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; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h index f770b087f409e0..94140df0869aa9 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h @@ -2,10 +2,9 @@ #pragma once +#include "ExpoHeader.pch" #include "JNIDeallocator.h" -#include -#include #include namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h index a1e357606ff51c..f149fc67145326 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h @@ -1,13 +1,10 @@ #pragma once +#include "ExpoHeader.pch" #include "TypedArray.h" #include "JavaScriptObject.h" -#include #include -#include - -#include namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptValue.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptValue.h index bde3528e46cf5c..37995c23b77692 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptValue.h +++ b/packages/expo-modules-core/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 -#include - -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptWeakObject.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptWeakObject.h index 191f6ae501c835..3d54d151a38f4d 100644 --- a/packages/expo-modules-core/android/src/main/cpp/JavaScriptWeakObject.h +++ b/packages/expo-modules-core/android/src/main/cpp/JavaScriptWeakObject.h @@ -2,14 +2,10 @@ #pragma once +#include "ExpoHeader.pch" #include "JNIDeallocator.h" #include "JavaScriptObject.h" -#include -#include - -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.cpp b/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.cpp index d6c9a830f36940..d2f9fc804dd257 100644 --- a/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.cpp +++ b/packages/expo-modules-core/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 -#include -#include -#include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.h b/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.h index 56e9b2cd2a1309..a2727dcfd24b3b 100644 --- a/packages/expo-modules-core/android/src/main/cpp/MethodMetadata.h +++ b/packages/expo-modules-core/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 -#include -#include -#include -#include -#include -#include -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/NativeArrayBuffer.h b/packages/expo-modules-core/android/src/main/cpp/NativeArrayBuffer.h index d2239831decb8c..506cc01d6bafae 100644 --- a/packages/expo-modules-core/android/src/main/cpp/NativeArrayBuffer.h +++ b/packages/expo-modules-core/android/src/main/cpp/NativeArrayBuffer.h @@ -1,16 +1,13 @@ #pragma once +#include "ExpoHeader.pch" #include "JNIDeallocator.h" #include "JSIContext.h" #include -#include -#include #include "TypedArray.h" -#include - namespace expo { class JavaScriptRuntime; diff --git a/packages/expo-modules-core/android/src/main/cpp/RuntimeHolder.h b/packages/expo-modules-core/android/src/main/cpp/RuntimeHolder.h index c2d02a06208f0f..830c8bb7a7cac8 100644 --- a/packages/expo-modules-core/android/src/main/cpp/RuntimeHolder.h +++ b/packages/expo-modules-core/android/src/main/cpp/RuntimeHolder.h @@ -2,8 +2,7 @@ #pragma once -#include -#include +#include "ExpoHeader.pch" #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/ThreadSafeJNIGlobalRef.h b/packages/expo-modules-core/android/src/main/cpp/ThreadSafeJNIGlobalRef.h index 2fb979f7fd92d1..12ab493115c284 100644 --- a/packages/expo-modules-core/android/src/main/cpp/ThreadSafeJNIGlobalRef.h +++ b/packages/expo-modules-core/android/src/main/cpp/ThreadSafeJNIGlobalRef.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "ExpoHeader.pch" #include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/concepts/jni.h b/packages/expo-modules-core/android/src/main/cpp/concepts/jni.h index 9259ca53ef5c95..e304c07d32e414 100644 --- a/packages/expo-modules-core/android/src/main/cpp/concepts/jni.h +++ b/packages/expo-modules-core/android/src/main/cpp/concepts/jni.h @@ -2,8 +2,8 @@ #pragma once +#include "../ExpoHeader.pch" #include -#include #include "jni_deref.h" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/concepts/jni_deref.h b/packages/expo-modules-core/android/src/main/cpp/concepts/jni_deref.h index 3e99e3d1b25f22..d565f1518e1c5c 100644 --- a/packages/expo-modules-core/android/src/main/cpp/concepts/jni_deref.h +++ b/packages/expo-modules-core/android/src/main/cpp/concepts/jni_deref.h @@ -2,8 +2,8 @@ #pragma once +#include "../ExpoHeader.pch" #include -#include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/concepts/jsi.h b/packages/expo-modules-core/android/src/main/cpp/concepts/jsi.h index 30a3a9f5b690f6..e9b1d1bc05bf5c 100644 --- a/packages/expo-modules-core/android/src/main/cpp/concepts/jsi.h +++ b/packages/expo-modules-core/android/src/main/cpp/concepts/jsi.h @@ -2,8 +2,8 @@ #pragma once +#include "../ExpoHeader.pch" #include -#include namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSClassesDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSClassesDecorator.h index 2eb5ffda2cb87c..311fa530c1f962 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSClassesDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSClassesDecorator.h @@ -2,9 +2,7 @@ #pragma once -#include - -#include +#include "../ExpoHeader.pch" #include "JSDecorator.h" #include "../MethodMetadata.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.cpp b/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.cpp index fe8e8d5a090b99..4068a298d8f3cc 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.cpp +++ b/packages/expo-modules-core/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 -#include - namespace jsi = facebook::jsi; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.h index d4a8b6f8edebd0..df5fdba9b483f2 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSConstantsDecorator.h @@ -2,9 +2,7 @@ #pragma once -#include -#include -#include +#include "../ExpoHeader.pch" #include "JSDecorator.h" #include "../JNIFunctionBody.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecorator.h index 84cd214d095961..dd365505eed658 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecorator.h @@ -2,8 +2,7 @@ #pragma once -#include -#include +#include "../ExpoHeader.pch" namespace jni = facebook::jni; namespace jsi = facebook::jsi; diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h index ffe8f4d67d5ff2..987772e5b2676d 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h @@ -2,12 +2,9 @@ #pragma once -#include - -#include +#include "../ExpoHeader.pch" #include "JSDecorator.h" -#include "../MethodMetadata.h" #include "../JNIFunctionBody.h" #include "../types/ExpectedType.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp b/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp index 91402fa242a864..5e9ca6613c88d4 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp +++ b/packages/expo-modules-core/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 - namespace jsi = facebook::jsi; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.h index 1249d3dab85f45..d27dae9904de84 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSFunctionsDecorator.h @@ -2,11 +2,7 @@ #pragma once -#include -#include - -#include -#include +#include "../ExpoHeader.pch" #include "JSDecorator.h" #include "../MethodMetadata.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSObjectDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSObjectDecorator.h index 18be879ba12de0..f73398722b30c7 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSObjectDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSObjectDecorator.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "../ExpoHeader.pch" #include "JSDecorator.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.cpp b/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.cpp index 6c99599b893446..7c516a85f9dd54 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.cpp +++ b/packages/expo-modules-core/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 - namespace jsi = facebook::jsi; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.h b/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.h index 4cb23af947340f..4f08d480fdd87c 100644 --- a/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.h +++ b/packages/expo-modules-core/android/src/main/cpp/decorators/JSPropertiesDecorator.h @@ -1,8 +1,6 @@ // Copyright © 2021-present 650 Industries, Inc. (aka Expo) -#include - -#include +#include "../ExpoHeader.pch" #include "../MethodMetadata.h" #include "../JNIFunctionBody.h" diff --git a/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewProps.h b/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewProps.h index cef2eaf46c4260..82683b59549c5b 100644 --- a/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewProps.h +++ b/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewProps.h @@ -1,8 +1,8 @@ #pragma once +#include "../ExpoHeader.pch" #include "ExpoViewProps.h" -#include #include namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewState.h b/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewState.h index 231ec49f33c8d8..983697ae99cff3 100644 --- a/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewState.h +++ b/packages/expo-modules-core/android/src/main/cpp/fabric/AndroidExpoViewState.h @@ -1,8 +1,6 @@ +#include "../ExpoHeader.pch" #include "ExpoViewState.h" -#include "AndroidExpoViewProps.h" -#include -#include #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/fabric/FabricComponentsRegistry.h b/packages/expo-modules-core/android/src/main/cpp/fabric/FabricComponentsRegistry.h index e7ff0180409583..2595d039d60fbd 100644 --- a/packages/expo-modules-core/android/src/main/cpp/fabric/FabricComponentsRegistry.h +++ b/packages/expo-modules-core/android/src/main/cpp/fabric/FabricComponentsRegistry.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "../ExpoHeader.pch" #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/fabric/NativeStatePropsGetter.h b/packages/expo-modules-core/android/src/main/cpp/fabric/NativeStatePropsGetter.h index e4ab489fea050b..a3b6c2befe3d21 100644 --- a/packages/expo-modules-core/android/src/main/cpp/fabric/NativeStatePropsGetter.h +++ b/packages/expo-modules-core/android/src/main/cpp/fabric/NativeStatePropsGetter.h @@ -1,7 +1,6 @@ #pragma once -#include -#include +#include "../ExpoHeader.pch" #include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/installers/MainRuntimeInstaller.h b/packages/expo-modules-core/android/src/main/cpp/installers/MainRuntimeInstaller.h index 2650f352bbf061..79981908190c96 100644 --- a/packages/expo-modules-core/android/src/main/cpp/installers/MainRuntimeInstaller.h +++ b/packages/expo-modules-core/android/src/main/cpp/installers/MainRuntimeInstaller.h @@ -1,10 +1,9 @@ #pragma once +#include "../ExpoHeader.pch" #include "../JSIContext.h" -#include #include #include -#include "SharedObject.h" #if IS_NEW_ARCHITECTURE_ENABLED diff --git a/packages/expo-modules-core/android/src/main/cpp/installers/WorkletRuntimeInstaller.h b/packages/expo-modules-core/android/src/main/cpp/installers/WorkletRuntimeInstaller.h index 01ddd943b505fe..626953fc171faa 100644 --- a/packages/expo-modules-core/android/src/main/cpp/installers/WorkletRuntimeInstaller.h +++ b/packages/expo-modules-core/android/src/main/cpp/installers/WorkletRuntimeInstaller.h @@ -1,9 +1,8 @@ #pragma once +#include "../ExpoHeader.pch" #include "MainRuntimeInstaller.h" -#include - namespace jni = facebook::jni; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/javaclasses/Collections.h b/packages/expo-modules-core/android/src/main/cpp/javaclasses/Collections.h index e2d08cda929c67..387d0b78142852 100644 --- a/packages/expo-modules-core/android/src/main/cpp/javaclasses/Collections.h +++ b/packages/expo-modules-core/android/src/main/cpp/javaclasses/Collections.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "../ExpoHeader.pch" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/javaclasses/JSRunnable.h b/packages/expo-modules-core/android/src/main/cpp/javaclasses/JSRunnable.h index aa2b2858a785b9..d95e65729c4968 100644 --- a/packages/expo-modules-core/android/src/main/cpp/javaclasses/JSRunnable.h +++ b/packages/expo-modules-core/android/src/main/cpp/javaclasses/JSRunnable.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "../ExpoHeader.pch" namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/types/AnyType.cpp b/packages/expo-modules-core/android/src/main/cpp/types/AnyType.cpp index add473d3d87ead..3017d0afecd556 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/AnyType.cpp +++ b/packages/expo-modules-core/android/src/main/cpp/types/AnyType.cpp @@ -2,7 +2,6 @@ #include "AnyType.h" #include "FrontendConverterProvider.h" -#include "../JSIContext.h" namespace expo { AnyType::AnyType( diff --git a/packages/expo-modules-core/android/src/main/cpp/types/AnyType.h b/packages/expo-modules-core/android/src/main/cpp/types/AnyType.h index ce1b015b23ee9f..3fbeb2018024a5 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/AnyType.h +++ b/packages/expo-modules-core/android/src/main/cpp/types/AnyType.h @@ -2,11 +2,10 @@ #pragma once +#include "../ExpoHeader.pch" #include "ExpectedType.h" #include "FrontendConverter.h" -#include - namespace jni = facebook::jni; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/types/ExpectedType.h b/packages/expo-modules-core/android/src/main/cpp/types/ExpectedType.h index 149e854c6c0886..847ca9304f829b 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/ExpectedType.h +++ b/packages/expo-modules-core/android/src/main/cpp/types/ExpectedType.h @@ -2,8 +2,8 @@ #pragma once +#include "../ExpoHeader.pch" #include "CppType.h" -#include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.cpp b/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.cpp index df13962fce77e7..e89d07f6b13691 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.cpp +++ b/packages/expo-modules-core/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 #include #include diff --git a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.h b/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.h index 95cead3c19ce65..8a01f148411d36 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.h +++ b/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverter.h @@ -2,11 +2,9 @@ #pragma once +#include "../ExpoHeader.pch" #include "CppType.h" -#include -#include - #if WORKLETS_ENABLED #include diff --git a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverterProvider.h b/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverterProvider.h index a036b5487cf66f..e2b7891b15bb38 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/FrontendConverterProvider.h +++ b/packages/expo-modules-core/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 - -#include -#include - namespace jni = facebook::jni; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/types/JNIToJSIConverter.h b/packages/expo-modules-core/android/src/main/cpp/types/JNIToJSIConverter.h index 73c4c7b6123ff9..4539d458ef3a00 100644 --- a/packages/expo-modules-core/android/src/main/cpp/types/JNIToJSIConverter.h +++ b/packages/expo-modules-core/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 -#include -#include #include -#include -#include -#include -#include -#include - namespace jni = facebook::jni; namespace jsi = facebook::jsi; namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/worklets/Serializable.h b/packages/expo-modules-core/android/src/main/cpp/worklets/Serializable.h index ee9e533a2c2ee2..0e85451b97f0c5 100644 --- a/packages/expo-modules-core/android/src/main/cpp/worklets/Serializable.h +++ b/packages/expo-modules-core/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 #include namespace jni = facebook::jni; diff --git a/packages/expo-modules-core/android/src/main/cpp/worklets/Worklet.h b/packages/expo-modules-core/android/src/main/cpp/worklets/Worklet.h index 26a486532b5e04..4d8a6b83df001a 100644 --- a/packages/expo-modules-core/android/src/main/cpp/worklets/Worklet.h +++ b/packages/expo-modules-core/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 -#include - namespace jni = facebook::jni; namespace expo { diff --git a/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletJSCallInvoker.h b/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletJSCallInvoker.h index a24ea2ad2bf10f..93dc5204c2292f 100644 --- a/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletJSCallInvoker.h +++ b/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletJSCallInvoker.h @@ -1,15 +1,13 @@ #pragma once +#include "../ExpoHeader.pch" + #if WORKLETS_ENABLED #include -#include #include -#include - - namespace jsi = facebook::jsi; namespace react = facebook::react; diff --git a/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletNativeRuntime.h b/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletNativeRuntime.h index 1c25fea504154c..babdee2eb8bacd 100644 --- a/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletNativeRuntime.h +++ b/packages/expo-modules-core/android/src/main/cpp/worklets/WorkletNativeRuntime.h @@ -1,13 +1,13 @@ #pragma once +#include "../ExpoHeader.pch" + #if WORKLETS_ENABLED #include #endif -#include - namespace jni = facebook::jni; namespace expo {