expo-modules-core 1.0.4 → 1.1.0

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.0.4'
+version = '1.1.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -35,7 +35,7 @@ buildscript {
 
   dependencies {
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-    classpath "de.undercouch:gradle-download-task:4.1.2"
+    classpath("de.undercouch:gradle-download-task:5.3.0")
   }
 }
 
@@ -59,19 +59,13 @@ def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
   : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
 def REACT_NATIVE_SO_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
   ? Paths.get(findProject(":ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
-  : "${buildDir}/react-native-0*/jni"
+  : "${buildDir}/react/jni"
 
 def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
-def FOLLY_VERSION = reactProperties.getProperty("FOLLY_VERSION")
 def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
-def DOUBLE_CONVERSION_VERSION = reactProperties.getProperty("DOUBLE_CONVERSION_VERSION")
-def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
-if (REACT_NATIVE_VERSION.startsWith("0.0.0-")) {
-  // react-native nightly build published as `0.0.0-20221002-2027-2319f75c8` form, but its semantic is latest
-  REACT_NATIVE_VERSION = "9999.9999.9999"
-}
+def REACT_NATIVE_VERSION = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_TARGET_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
 def reactNativeThirdParty = new File("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/third-party")
@@ -130,7 +124,6 @@ if (USE_HERMES) {
 }
 // END HERMES
 
-
 def isNewArchitectureEnabled = findProperty("newArchEnabled") == "true"
 
 // Creating sources with comments
@@ -191,7 +184,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.0.4"
+    versionName "1.1.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -217,7 +210,11 @@ android {
 
   externalNativeBuild {
     cmake {
-      path "CMakeLists.txt"
+      if (REACT_NATIVE_TARGET_VERSION >= 71) {
+        path "CMakeLists.txt"
+      } else {
+        path "legacy/CMakeLists.txt"
+      }
     }
   }
 
@@ -260,11 +257,6 @@ android {
     }
   }
 
-  configurations {
-    extractHeaders
-    extractJNI
-  }
-
   lintOptions {
     abortOnError false
   }
@@ -309,8 +301,6 @@ dependencies {
   implementation 'com.facebook.react:react-native:+'
 
   compileOnly 'com.facebook.fbjni:fbjni:0.2.2'
-  extractHeaders 'com.facebook.fbjni:fbjni:0.2.2:headers'
-  extractJNI 'com.facebook.fbjni:fbjni:0.2.2'
 
   testImplementation 'androidx.test:core:1.4.0'
   testImplementation 'junit:junit:4.13.1'
@@ -344,148 +334,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
   kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 
-// UTILS
-task createNativeDepsDirectories() {
+def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDirectories') ?: project.tasks.register('createNativeDepsDirectories') {
   downloadsDir.mkdirs()
   thirdPartyNdkDir.mkdirs()
 }
-// END UTILS
-
-// JNI
-def extractReactNativeAAR = { buildType ->
-  def suffix = buildType == 'Debug' ? '-debug' : '-release'
-  def rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*${suffix}.aar" }
-  if (rnAARs.isEmpty()) {
-    rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*.aar" }
-  }
-  if (rnAARs.any()) {
-    // node_modules/react-native has a .aar, extract headers
-    if (rnAARs.size() > 1) {
-      logger.error("More than one React Native AAR file has been found:")
-      rnAARs.each {println(it) }
-      throw new GradleException("Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
-          "\nRemove the old ones and try again")
-    }
-  }
-  def rnAAR = rnAARs.singleFile
-  def file = rnAAR.absoluteFile
-  def packageName = file.name.tokenize('-')[0]
-  copy {
-    from zipTree(file)
-    into "$buildDir/$file.name"
-    include "jni/**/*"
-  }
-}
-
-task extractReactNativeAARRelease {
-  doLast {
-    extractReactNativeAAR('Release')
-  }
-}
-
-task extractReactNativeAARDebug {
-  doLast {
-    extractReactNativeAAR('Debug')
-  }
-}
-
-
-task extractAARHeaders {
-  doLast {
-    configurations.extractHeaders.files.each {
-      def file = it.absoluteFile
-      copy {
-        from zipTree(file)
-        into "$buildDir/$file.name"
-        include "**/*.h"
-      }
-    }
-  }
-}
-
-task extractJNIFiles {
-  doLast {
-    configurations.extractJNI.files.each {
-      def file = it.absoluteFile
-      copy {
-        from zipTree(file)
-        into "$buildDir/$file.name"
-        include "jni/**/*"
-      }
-    }
-  }
-}
-// END JNI
-
-// BOOST
-task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-  def srcUrl = REACT_NATIVE_TARGET_VERSION >= 69
-    ? "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz"
-    : "https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz"
-  src(srcUrl)
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
-}
-
-task prepareBoost(dependsOn: [downloadBoost], type: Copy) {
-  from(tarTree(resources.gzip(downloadBoost.dest)))
-  from("$reactNativeThirdParty/boost/Android.mk")
-  include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp")
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir/boost")
-  doLast {
-    file("$thirdPartyNdkDir/boost/boost").renameTo("$thirdPartyNdkDir/boost/boost_${BOOST_VERSION}")
-  }
-}
-// END BOOST
-
-// DOUBLE CONVERSION
-task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(new File(downloadsDir, "double-conversion-${DOUBLE_CONVERSION_VERSION}.tar.gz"))
-}
-
-task prepareDoubleConversion(dependsOn: [downloadDoubleConversion], type: Copy) {
-  from(tarTree(downloadDoubleConversion.dest))
-  from("$reactNativeThirdParty/double-conversion/Android.mk")
-  include("double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", "Android.mk")
-  filesMatching("*/src/**/*", { fname -> fname.path = "double-conversion/${fname.name}" })
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir/double-conversion")
-}
-// END DOUBLE CONVERSION
-
-// FOLLY
-task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/facebook/folly/archive/v${FOLLY_VERSION}.tar.gz")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
-}
-
-task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
-  from(tarTree(downloadFolly.dest))
-  from("$reactNativeThirdParty/folly/Android.mk")
-  include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk")
-  eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
-  // Fixes problem with Folly failing to build on certain systems. See
-  // https://github.com/software-mansion/react-native-reanimated/issues/1024
-  def follyReplaceContent = '''
-  ssize_t r;
-  do {
-    r = open(name, flags, mode);
-  } while (r == -1 && errno == EINTR);
-    return r;
-  '''
-  filter { line -> line.replaceAll("return int\\(wrapNoInt\\(open, name, flags, mode\\)\\);", follyReplaceContent) }
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir/folly")
-}
-// END FOLLY
 
+// TODO: Remove all these hermes code when we update our repo to react-native 0.71 by using prefab
 task downloadHermes(type: Download) {
   def hermesVersion = currentHermesVersion ?: "main"
   src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
@@ -507,10 +361,11 @@ task unzipHermes(dependsOn: downloadHermes, type: Copy) {
   into(hermesDir)
 }
 
-task prepareHermes(dependsOn: createNativeDepsDirectories) {
+task prepareHermes() {
   if (!USE_HERMES) {
     return
   }
+  dependsOn(createNativeDepsDirectories)
   if (NEED_DOWNLOAD_HERMES) {
     dependsOn(unzipHermes)
   }
@@ -526,61 +381,43 @@ task prepareHermes(dependsOn: createNativeDepsDirectories) {
   }
 }
 
-task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly]) {}
-
-def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-  dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-  from("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/prebuilt/lib")
-  into("$buildDir/react-ndk/exported")
+def downloadBoost = tasks.create('downloadBoost', Download) {
+  dependsOn(createNativeDepsDirectories)
+  def srcUrl = REACT_NATIVE_TARGET_VERSION >= 69
+    ? "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz"
+    : "https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz"
+  src(srcUrl)
+  onlyIfNewer(true)
+  overwrite(false)
+  dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
 }
-def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-  dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-  from("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/prebuilt/lib")
-  into("$buildDir/react-ndk/exported")
+
+def prepareBoost = tasks.register('prepareBoost', Copy) {
+  dependsOn(downloadBoost)
+  from(tarTree(resources.gzip(downloadBoost.dest)))
+  from("$reactNativeThirdParty/boost/Android.mk")
+  include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp")
+  includeEmptyDirs = false
+  into("$thirdPartyNdkDir/boost")
+  doLast {
+    new File("$thirdPartyNdkDir/boost/boost").renameTo("$thirdPartyNdkDir/boost/boost_${BOOST_VERSION}")
+  }
 }
 
 afterEvaluate {
-  extractAARHeaders.dependsOn(prepareThirdPartyNdkHeaders)
-  extractJNIFiles.dependsOn(prepareThirdPartyNdkHeaders)
+  preBuild.dependsOn(prepareBoost)
   if (USE_HERMES) {
-    prepareThirdPartyNdkHeaders.dependsOn(prepareHermes)
+    preBuild.dependsOn(prepareHermes)
     if (hasHermesProject && !prebuiltHermesCacheHit) {
       prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
     }
   }
-
-  if (isNewArchitectureEnabled) {
-    preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-    preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-
-    // Due to a bug inside AGP, we have to explicitly set a dependency
-    // between configureCMake* tasks and the preBuild tasks.
-    // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-    configureCMakeDebug.dependsOn(preDebugBuild)
-    configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
-    reactNativeArchitectures().each { architecture ->
-      tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
-        dependsOn("preDebugBuild")
-      }
-      tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
-        dependsOn("preReleaseBuild")
-      }
-    }
-  }
 }
 
-tasks.whenTaskAdded { task ->
-  if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake') || task.name.startsWith('buildCMake'))) {
-    def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
-    task.dependsOn(extractAARHeaders)
-    task.dependsOn(extractJNIFiles)
-    if (REACT_NATIVE_BUILD_FROM_SOURCE) {
-      task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
-    } else {
-      task.dependsOn("extractReactNativeAAR${buildType}")
-    }
-  } else if (task.name.startsWith('generateJsonModel') && REACT_NATIVE_BUILD_FROM_SOURCE) {
-    def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
-    task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
-  }
+if (REACT_NATIVE_TARGET_VERSION < 71) {
+  project.ext.extraLegacyReactNativeLibs = [
+    'prepareDoubleConversion',
+    'prepareFolly',
+  ]
+  applyLegacyReactNativeLibsExtractionPlugin()
 }

package/android/legacy/CMakeLists.txt

@@ -0,0 +1,194 @@
+# Remove this legacy folder when we drop SDK 47
+cmake_minimum_required(VERSION 3.4.1)
+
+project(expo-modules-core)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 17)
+set(PACKAGE_NAME "expo-modules-core")
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/../build)
+set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR}")
+
+if (${NATIVE_DEBUG})
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+endif ()
+
+set(SRC_DIR ${CMAKE_SOURCE_DIR}/../src)
+set(COMMON_DIR ${CMAKE_SOURCE_DIR}/../../common/cpp)
+file(GLOB sources_android "${SRC_DIR}/main/cpp/*.cpp")
+file(GLOB sources_android_types "${SRC_DIR}/main/cpp/types/*.cpp")
+file(GLOB sources_android_javaclasses "${SRC_DIR}/main/cpp/javaclasses/*.cpp")
+file(GLOB common_sources "${COMMON_DIR}/*.cpp")
+
+# shared
+
+macro(createVarAsBoolToInt name value)
+  if(${value})
+    set(${name} "1")
+  else()
+    set(${name} "0")
+  endif()
+endmacro()
+
+add_library(CommonSettings INTERFACE)
+
+add_library(
+        ${PACKAGE_NAME}
+        SHARED
+        ${common_sources}
+        ${sources_android}
+        ${sources_android_types}
+        ${sources_android_javaclasses}
+)
+
+if(IS_NEW_ARCHITECTURE_ENABLED)
+  add_subdirectory("fabric")
+  set(NEW_ARCHITECTURE_DEPENDENCIES "fabric")
+  set(NEW_ARCHITECTURE_COMPILE_OPTIONS -DIS_NEW_ARCHITECTURE_ENABLED=1 -DRN_FABRIC_ENABLED=1)
+else()
+  set(NEW_ARCHITECTURE_DEPENDENCIES "")
+  set(NEW_ARCHITECTURE_COMPILE_OPTIONS "")
+endif()
+
+createVarAsBoolToInt("USE_HERMES_INT" ${USE_HERMES})
+createVarAsBoolToInt("UNIT_TEST_INT" ${UNIT_TEST})
+
+target_compile_options(CommonSettings INTERFACE
+  -O2
+  -frtti
+  -fexceptions
+  -Wall
+  -fstack-protector-all
+  -DUSE_HERMES=${USE_HERMES_INT}
+  -DUNIT_TEST=${UNIT_TEST_INT}
+  ${NEW_ARCHITECTURE_COMPILE_OPTIONS}
+)
+
+# Extracted AAR: ${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}
+file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
+if (NOT LIBRN_DIR)
+    # If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
+    # ReactAndroid/build/react-ndk/exported
+    file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
+endif ()
+
+# tests
+
+if(${UNIT_TEST})
+  if(${USE_HERMES})
+    file(GLOB HERMES_SO_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
+    find_library(
+        JSEXECUTOR_LIB
+        hermes
+        PATHS ${HERMES_SO_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+    set(JSEXECUTOR_INCLUDE ${HERMES_HEADER_DIR} ${HERMES_HEADER_DIR}/API ${HERMES_HEADER_DIR}/public)
+  else()
+    find_library(
+        JSEXECUTOR_LIB
+        jscexecutor
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+    set(JSEXECUTOR_INCLUDE "")
+  endif()
+else()
+  set(JSEXECUTOR_LIB "")
+  set(JSEXECUTOR_INCLUDE "")
+endif()
+
+
+# includes
+
+target_include_directories(
+        ${PACKAGE_NAME}
+        PRIVATE
+        "${REACT_NATIVE_DIR}/React"
+        "${REACT_NATIVE_DIR}/React/Base"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${REACT_NATIVE_DIR}/ReactCommon"
+        "${REACT_NATIVE_DIR}/ReactCommon/react/nativemodule/core"
+        "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+        "${REACT_NATIVE_DIR}/ReactCommon/jsi"
+        "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
+        "${BUILD_DIR}/third-party-ndk/double-conversion"
+        "${BUILD_DIR}/third-party-ndk/folly"
+        "${COMMON_DIR}"
+        "${JSEXECUTOR_INCLUDE}"
+        "${SRC_DIR}/fabric"
+)
+
+# find libraries
+
+find_library(LOG_LIB log)
+
+if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+    find_library(
+        FOLLY_LIB
+        folly_json
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+else()
+    find_library(
+        FOLLY_LIB
+        folly_runtime
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
+
+find_package(fbjni REQUIRED CONFIG)
+
+find_library(
+        JSI_LIB
+        jsi
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
+
+find_library(
+        REACT_NATIVE_JNI_LIB
+        reactnativejni
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
+
+find_library(
+        REACT_NATIVE_MODULES_CORE
+        react_nativemodule_core
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
+
+#reactnativejni
+
+# linking
+
+target_compile_options(
+        ${PACKAGE_NAME}
+        PRIVATE -DFOLLY_NO_CONFIG=1
+        -DFOLLY_HAVE_CLOCK_GETTIME=1
+        -DFOLLY_HAVE_MEMRCHR=1
+        -DFOLLY_USE_LIBCPP=1
+        -DFOLLY_MOBILE=1
+)
+
+target_link_libraries(
+        ${PACKAGE_NAME}
+        CommonSettings
+        ${LOG_LIB}
+        fbjni::fbjni
+        ${JSI_LIB}
+        ${JSEXECUTOR_LIB}
+        ${REACT_NATIVE_JNI_LIB}
+        ${FOLLY_LIB}
+        ${REACT_NATIVE_MODULES_CORE}
+        android
+        ${NEW_ARCHITECTURE_DEPENDENCIES}
+)

package/android/{src → legacy}/fabric/Android-prebuilt.cmake

@@ -1,3 +1,5 @@
+# Remove this legacy folder when we drop SDK 47
+
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the

package/android/legacy/fabric/CMakeLists.txt

@@ -0,0 +1,40 @@
+# Copyright 2018-present 650 Industries. All rights reserved.
+
+include(Android-prebuilt.cmake)
+
+set(FABRIC_SRC_DIR ${CMAKE_SOURCE_DIR}/../src/fabric)
+set(COMMON_FABRIC_DIR ${COMMON_DIR}/fabric)
+file(GLOB SOURCES "${FABRIC_SRC_DIR}/*.cpp")
+file(GLOB COMMON_FABRIC_SOURCES "${COMMON_FABRIC_DIR}/*.cpp")
+
+add_library(fabric STATIC
+  ${COMMON_FABRIC_SOURCES}
+  ${SOURCES}
+)
+
+target_compile_options(fabric PRIVATE
+  "-std=c++17"
+)
+
+target_include_directories(fabric PRIVATE
+  "${REACT_NATIVE_DIR}/ReactCommon"
+  "${COMMON_FABRIC_DIR}"
+)
+
+target_link_libraries(fabric
+  CommonSettings
+  fabricjni
+  fbjni
+  folly_runtime
+  glog
+  jsi
+  react_debug
+  react_render_componentregistry
+  react_render_core
+  react_render_debug
+  react_render_graphics
+  react_render_mapbuffer
+  rrc_view
+  runtimeexecutor
+  yoga
+)

package/android/proguard-rules.pro

@@ -18,3 +18,16 @@
 -keepclassmembers enum * implements expo.modules.kotlin.types.Enumerable {
   *; 
 }
+
+-keepclassmembers class * implements expo.modules.kotlin.views.ExpoView {
+  public <init>(android.content.Context);
+  public <init>(android.content.Context, expo.modules.kotlin.AppContext);
+}
+
+-keepclassmembers class * {
+  expo.modules.kotlin.viewevent.ViewEventCallback *;
+}
+
+-keepclassmembers class * {
+  expo.modules.kotlin.viewevent.ViewEventDelegate *;
+}

package/android/src/fabric/CMakeLists.txt

@@ -1,7 +1,5 @@
 # Copyright 2018-present 650 Industries. All rights reserved.
 
-include(Android-prebuilt.cmake)
-
 set(COMMON_FABRIC_DIR ${COMMON_DIR}/fabric)
 file(GLOB SOURCES "*.cpp")
 file(GLOB COMMON_FABRIC_SOURCES "${COMMON_FABRIC_DIR}/*.cpp")
@@ -13,6 +11,11 @@ add_library(fabric STATIC
 
 target_compile_options(fabric PRIVATE
   "-std=c++17"
+  -DFOLLY_NO_CONFIG=1
+  -DFOLLY_HAVE_CLOCK_GETTIME=1
+  -DFOLLY_HAVE_MEMRCHR=1
+  -DFOLLY_USE_LIBCPP=1
+  -DFOLLY_MOBILE=1
 )
 
 target_include_directories(fabric PRIVATE
@@ -20,20 +23,24 @@ target_include_directories(fabric PRIVATE
   "${COMMON_FABRIC_DIR}"
 )
 
+find_package(ReactAndroid REQUIRED CONFIG)
+
+find_package(fbjni REQUIRED CONFIG)
+
 target_link_libraries(fabric
   CommonSettings
-  fabricjni
-  fbjni
-  folly_runtime
-  glog
-  jsi
-  react_debug
-  react_render_componentregistry
-  react_render_core
-  react_render_debug
-  react_render_graphics
-  react_render_mapbuffer
-  rrc_view
-  runtimeexecutor
-  yoga
+  fbjni::fbjni
+  ReactAndroid::fabricjni
+  ReactAndroid::folly_runtime
+  ReactAndroid::glog
+  ReactAndroid::jsi
+  ReactAndroid::react_debug
+  ReactAndroid::react_render_componentregistry
+  ReactAndroid::react_render_core
+  ReactAndroid::react_render_debug
+  ReactAndroid::react_render_graphics
+  ReactAndroid::react_render_mapbuffer
+  ReactAndroid::rrc_view
+  ReactAndroid::runtimeexecutor
+  ReactAndroid::yoga
 )

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

@@ -320,6 +320,13 @@ class AppContext(
     return UIManagerHelper.getUIManagerForReactTag(reactContext, viewTag)?.resolveView(viewTag) as? T
   }
 
+  /**
+   * Runs a code block on the JavaScript thread.
+   */
+  fun executeOnJavaScriptThread(runnable: Runnable) {
+    reactContextHolder.get()?.runOnJSQueueThread(runnable)
+  }
+
 // region CurrentActivityProvider
 
   override val currentActivity: Activity?

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

@@ -38,4 +38,9 @@ class Exceptions {
    * An exception to throw when Android permissions haven't been granted.
    */
   class MissingPermissions(vararg permissions: String) : CodedException(message = "Missing permissions: ${permissions.joinToString(separator = ", ")}")
+
+  /**
+   * An exception to throw when the current Android activity is not longer available.
+   */
+  class MissingActivity : CodedException(message = "The current activity is no longer available")
 }