expo-modules-core 1.0.3 → 1.1.0

package/CHANGELOG.md

@@ -10,13 +10,40 @@
 
 ### 💡 Others
 
-## 1.0.3 — 2022-11-14
+## 1.1.0 — 2022-12-30
+
+### 🎉 New features
+
+- Added TS definitions for `TypedArray` and additional union types for Int, Uint and Float TypedArrays. ([#20257](https://github.com/expo/expo/pull/20257) by [@aleqsio](https://github.com/aleqsio))
+- Added a new `executeOnJavaScriptThread` method to `appContext` to allow for running code blocks on the JS thread. ([#20161](https://github.com/expo/expo/pull/20161) by [@aleqsio](https://github.com/aleqsio))
+- Added the `Exceptions.MissingActivity` on Android. ([#20174](https://github.com/expo/expo/pull/20174) by [@lukmccall](https://github.com/lukmccall))
+- Trailing optional arguments can be skipped when calling native functions from JavaScript on iOS. ([#20234](https://github.com/expo/expo/pull/20234) by [@tsapeta](https://github.com/tsapeta))
+- `Events` component can now be initialized with an array of event names (not only variadic arguments). ([#20590](https://github.com/expo/expo/pull/20590) by [@tsapeta](https://github.com/tsapeta))
+- `Property` component can now take the native shared object instance as the first argument. ([#20608](https://github.com/expo/expo/pull/20608) by [@tsapeta](https://github.com/tsapeta))
+- Added support for referencing to `Property`'s owner properties using Swift key paths. ([#20610](https://github.com/expo/expo/pull/20610) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed build errors when testing on React Native nightly builds. ([#19805](https://github.com/expo/expo/pull/19805) by [@kudo](https://github.com/kudo))
+- Fixed failed resolution of 'java.nio.file.Path' on Android. ([#20037](https://github.com/expo/expo/pull/20037) by [@lukmccall](https://github.com/lukmccall))
+- Fixed libraries using the `ViewDefinitionBuilder` crashes when ProGuard or R8 is enabled on Android. ([#20197](https://github.com/expo/expo/pull/20197) by [@lukmccall](https://github.com/lukmccall))
+- Fixed Either types not supporting non-primitive types on iOS. ([#20247](https://github.com/expo/expo/pull/20247) by [@tsapeta](https://github.com/tsapeta))
+- Fixed Function not supporting certain arities on Android. ([#20419](https://github.com/expo/expo/pull/20419) by [@motiz88](https://github.com/motiz88))
+- Added React Native 0.71 support. ([#20470](https://github.com/expo/expo/pull/20470) by [@kudo](https://github.com/kudo))
+- Fixed the `SharedObject` initializer being inaccessible due to `internal` protection level. ([#20588](https://github.com/expo/expo/pull/20588) by [@tsapeta](https://github.com/tsapeta))
+
+### 💡 Others
+
+- [iOS] Make `Enumerable` protocol implement `CaseIterable` to get rid of operating on unsafe pointers. ([#20640](https://github.com/expo/expo/pull/20640) by [@tsapeta](https://github.com/tsapeta))
+
+## 1.0.4 - 2022-12-21
 
 ### 🐛 Bug fixes
 
-- Fixed failed resolution of 'java.nio.file.Path' on Android.
+- Fixed views are not correctly initialized after reloading on Android. ([#20063](https://github.com/expo/expo/pull/20063) by [@lukmccall](https://github.com/lukmccall))
+- Fixed threading crash issue when running with Hermes on iOS. ([#20506](https://github.com/expo/expo/pull/20506) by [@kudo](https://github.com/kudo))
 
-## 1.0.2 — 2022-11-08
+## 1.0.2 - 2022-11-08
 
 ### 💡 Others
 

package/ExpoModulesCore.podspec

@@ -1,8 +1,21 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+reactNativeVersion = '0.0.0'
+begin
+  reactNativeVersion = `node --print "require('react-native/package.json').version"`
+rescue
+  reactNativeVersion = '0.0.0'
+end
+if ENV["REACT_NATIVE_OVERRIDE_VERSION"]
+  reactNativeVersion = ENV["REACT_NATIVE_OVERRIDE_VERSION"]
+end
+
+REACT_NATIVE_MINOR_VERSION = reactNativeVersion.split('.')[1].to_i
+
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-fabric_compiler_flags = '-DRN_FABRIC_ENABLED'
+fabric_compiler_flags = '-DRN_FABRIC_ENABLED -DRCT_NEW_ARCH_ENABLED'
 folly_version = '2021.07.22.00'
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
@@ -20,24 +33,44 @@ Pod::Spec.new do |s|
   s.static_framework = true
   s.header_dir     = 'ExpoModulesCore'
 
+  header_search_paths = [
+    # EXJavaScriptRuntime -> Hermes
+    '"$(PODS_ROOT)/boost"',
+    '"$(PODS_ROOT)/DoubleConversion"',
+    '"$(PODS_ROOT)/RCT-Folly"',
+    '"${PODS_ROOT}/Headers/Public/React-hermes"',
+    '"${PODS_ROOT}/Headers/Public/hermes-engine"',
+
+    # EXAppDelegateWrapper -> RCTAppDelegate -> RCTCxxBridgeDelegate
+    '"${PODS_ROOT}/Headers/Private/React-Core"',
+
+    # similar to https://github.com/facebook/react-native/commit/c4b51e8d7, review this when we drop SDK 47
+    '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging"',
+    '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers"',
+  ]
+
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
     'USE_HEADERMAP' => 'YES',
     'DEFINES_MODULE' => 'YES',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'HEADER_SEARCH_PATHS' => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
+    'HEADER_SEARCH_PATHS' => header_search_paths.join(' '),
+    "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\"",
     'OTHER_SWIFT_FLAGS' => "$(inherited) #{fabric_enabled ? fabric_compiler_flags : ''}"
   }
   s.user_target_xcconfig = {
     "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
   }
 
+  compiler_flags = folly_compiler_flags + ' ' + "-DREACT_NATIVE_MINOR_VERSION=#{REACT_NATIVE_MINOR_VERSION}"
+
   s.dependency 'React-Core'
   s.dependency 'ReactCommon/turbomodule/core'
+  s.dependency 'React-RCTAppDelegate' if REACT_NATIVE_MINOR_VERSION >= 71
 
   if fabric_enabled
-    s.compiler_flags = folly_compiler_flags + ' ' + fabric_compiler_flags
+    compiler_flags << ' ' << fabric_compiler_flags
 
     s.dependency 'React-RCTFabric'
     s.dependency 'RCT-Folly', folly_version
@@ -55,8 +88,9 @@ Pod::Spec.new do |s|
     exclude_files.append('ios/Fabric/')
     exclude_files.append('common/cpp/fabric/')
   end
-  s.exclude_files = exclude_files
 
+  s.exclude_files = exclude_files
+  s.compiler_flags = compiler_flags
   s.private_header_files = ['ios/**/*+Private.h', 'ios/**/Swift.h']
 
   s.test_spec 'Tests' do |test_spec|

package/android/CMakeLists.txt

@@ -6,7 +6,7 @@ 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}")
+set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_NATIVE_TARGET_VERSION} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR}")
 
 if (${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
@@ -72,8 +72,6 @@ if (NOT LIBRN_DIR)
     file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
 endif ()
 
-file(GLOB libfbjni_include_DIRS "${BUILD_DIR}/fbjni-*-headers.jar/")
-
 # tests
 
 if(${UNIT_TEST})
@@ -100,81 +98,33 @@ else()
   set(JSEXECUTOR_INCLUDE "")
 endif()
 
+# find libraries
+
+find_library(LOG_LIB log)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+
+find_package(fbjni REQUIRED CONFIG)
 
 # includes
 
+get_target_property(INCLUDE_reactnativejni
+        ReactAndroid::reactnativejni
+        INTERFACE_INCLUDE_DIRECTORIES)
 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"
+        ${INCLUDE_reactnativejni}/react
+
+        # header only imports from turbomodule, e.g. CallInvokerHolder.h
         "${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"
-        "${libfbjni_include_DIRS}"
         "${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_library(
-        FBJNI_LIB
-        fbjni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-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(
@@ -190,12 +140,12 @@ target_link_libraries(
         ${PACKAGE_NAME}
         CommonSettings
         ${LOG_LIB}
-        ${FBJNI_LIB}
-        ${JSI_LIB}
-        ${JSEXECUTOR_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        ${FOLLY_LIB}
-        ${REACT_NATIVE_MODULES_CORE}
+        fbjni::fbjni
+        ReactAndroid::jsi
+        ReactAndroid::reactnativejni
+        ReactAndroid::folly_runtime
+        ReactAndroid::react_nativemodule_core
         android
+        ${JSEXECUTOR_LIB}
         ${NEW_ARCHITECTURE_DEPENDENCIES}
 )

package/android/ExpoModulesCorePlugin.gradle

@@ -13,3 +13,203 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
 ext.applyKotlinExpoModulesCorePlugin = {
   apply plugin: KotlinExpoModulesCorePlugin
 }
+
+// [BEGIN] Remove when we drop SDK 47
+abstract class ExtractReactNativeAARTask extends DefaultTask {
+  @Input
+  abstract Property<String> getBuildType()
+
+  @Input
+  abstract Property<String> getReactNativeDir()
+
+  @TaskAction
+  def taskAction() {
+    def suffix = buildType.get() == 'Debug' ? '-debug' : '-release'
+    def rnAARs = project.fileTree("${reactNativeDir.get()}/android").matching { include "**/react-native/**/*${suffix}.aar" }
+    if (rnAARs.isEmpty()) {
+      rnAARs = project.fileTree("${reactNativeDir.get()}/android").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]
+    project.copy {
+      from project.zipTree(file)
+      into "${project.buildDir}/${packageName}"
+      include "jni/**/*"
+    }
+  }
+}
+
+class LegacyReactNativeLibsExtractionPlugin implements Plugin<Project> {
+  void nativeBuildDependsOn(project, dependsOnTask, buildTypesIncludes) {
+    def buildTasks = project.tasks.findAll { task ->
+      def taskName = task.name
+      if (taskName.contains("Clean")) { return false }
+      if (taskName.contains("externalNative") || taskName.contains("CMake") || taskName.contains("generateJsonModel")) {
+        if (buildTypesIncludes == null) { return true }
+        for (buildType in buildTypesIncludes) {
+          if (taskName.contains(buildType)) { return true }
+        }
+      }
+      return false
+    }
+    buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
+  }
+
+  void apply(Project project) {
+    def REACT_NATIVE_BUILD_FROM_SOURCE = project.findProject(":ReactAndroid") != null
+    def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+      ? project.findProject(":ReactAndroid").getProjectDir().parent
+      : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, project.rootDir).text.trim()).parent
+
+    def reactProperties = new Properties()
+    new 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 = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME")
+    def REACT_NATIVE_TARGET_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+
+    def isNewArchitectureEnabled = project.findProperty("newArchEnabled") == "true"
+    def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
+    def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("${project.buildDir}/downloads")
+    def thirdPartyNdkDir = new File("${project.buildDir}/third-party-ndk")
+    def reactNativeThirdParty = new File("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/third-party")
+
+    def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDirectories') ?: project.tasks.register('createNativeDepsDirectories') {
+      downloadsDir.mkdirs()
+      thirdPartyNdkDir.mkdirs()
+    }
+
+    def extractReactNativeAARRelease = project.tasks.register('extractReactNativeAARRelease', ExtractReactNativeAARTask) {
+      reactNativeDir = REACT_NATIVE_DIR
+      buildType = 'Release'
+    }
+    def extractReactNativeAARDebug = project.tasks.register('extractReactNativeAARDebug', ExtractReactNativeAARTask) {
+      reactNativeDir = REACT_NATIVE_DIR
+      buildType = 'Debug'
+    }
+
+    def packageReactNdkDebugLibs = project.tasks.register("packageReactNdkDebugLibs", Copy) {
+      dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+      from("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/prebuilt/lib")
+      into("${project.buildDir}/react-ndk/exported")
+    }
+    def packageReactNdkReleaseLibs = project.tasks.register("packageReactNdkReleaseLibs", Copy) {
+      dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+      from("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/prebuilt/lib")
+      into("${project.buildDir}/react-ndk/exported")
+    }
+
+    // [BEGIN] Extra libs
+   def downloadDoubleConversion = project.tasks.create('downloadDoubleConversion', project.Download) {
+      dependsOn(createNativeDepsDirectories)
+      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"))
+    }
+
+    def prepareDoubleConversion = project.tasks.register('prepareDoubleConversion', Copy) {
+      dependsOn(downloadDoubleConversion)
+      from(project.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")
+    }
+
+    def downloadFolly = project.tasks.create('downloadFolly', project.Download) {
+      dependsOn(createNativeDepsDirectories)
+      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"))
+    }
+
+    def prepareFolly = project.tasks.register('prepareFolly', Copy) {
+      dependsOn(downloadFolly)
+      from(project.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] Extra libs
+
+    project.afterEvaluate {
+      if (REACT_NATIVE_BUILD_FROM_SOURCE) {
+        nativeBuildDependsOn(project, ":ReactAndroid:copyReleaseJniLibsProjectOnly", ["Release", "RelWithDebInfo"])
+        nativeBuildDependsOn(project, ":ReactAndroid:copyDebugJniLibsProjectOnly", ["Debug"])
+      } else {
+        nativeBuildDependsOn(project, extractReactNativeAARRelease, ["Release", "RelWithDebInfo"])
+        nativeBuildDependsOn(project, extractReactNativeAARDebug, ["Debug"])
+      }
+
+      def extraLibs = project.extensions.extraProperties.has('extraLegacyReactNativeLibs')
+        ? project.extensions.extraProperties.get('extraLegacyReactNativeLibs')
+        : []
+      extraLibs.each {
+        nativeBuildDependsOn(project, project.tasks.named(it), null)
+      }
+
+      if (isNewArchitectureEnabled) {
+        def preDebugBuild = project.tasks.named('preDebugBuild')
+        def preReleaseBuild = project.tasks.named('preReleaseBuild')
+        preDebugBuild.configure {
+          dependsOn(packageReactNdkDebugLibs)
+        }
+        preReleaseBuild.configure {
+          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
+        project.tasks.named('configureCMakeDebug').configure {
+          dependsOn(preDebugBuild)
+        }
+        project.tasks.named('configureCMakeRelWithDebInfo').configure {
+          dependsOn(preReleaseBuild)
+        }
+        def reactNativeArchitectures = project.getProperties().get("reactNativeArchitectures")?.split(",") ?: ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+
+        reactNativeArchitectures.each { architecture ->
+          project.tasks.named("configureCMakeDebug[${architecture}]")?.configure {
+            dependsOn("preDebugBuild")
+          }
+          project.tasks.named("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
+            dependsOn("preReleaseBuild")
+          }
+        }
+      }
+    }
+  }
+}
+
+ext.applyLegacyReactNativeLibsExtractionPlugin = {
+  apply plugin: LegacyReactNativeLibsExtractionPlugin
+}
+
+// [END] Remove when we drop SDK 47