expo-modules-core 1.8.0 → 1.10.0

package/CHANGELOG.md

@@ -10,6 +10,62 @@
 
 ### 💡 Others
 
+## 1.10.0 — 2023-11-14
+
+### 🛠 Breaking changes
+
+- Bumped iOS deployment target to 13.4. ([#25063](https://github.com/expo/expo/pull/25063) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- On `Android` bump `compileSdkVersion` and `targetSdkVersion` to `34`. ([#24708](https://github.com/expo/expo/pull/24708) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 🎉 New features
+
+- Add `preventModuleOverriding` to `ModuleRegistry.register` method. ([#24860](https://github.com/expo/expo/pull/24860) by [@wschurman](https://github.com/wschurman))
+- [iOS] `CGFloat` can now be used as an argument type. ([#25140](https://github.com/expo/expo/pull/25140) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Mock native code on web platforms. ([#25264](https://github.com/expo/expo/pull/25264) by [@EvanBacon](https://github.com/EvanBacon))
+- [iOS] Fixed the object identifier for shared object types. ([#25060](https://github.com/expo/expo/pull/25060) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Fixed concurrent functions (async/await) not converting results such as records and shared objects. ([#25075](https://github.com/expo/expo/pull/25075) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Fixed concurrent functions (async/await) not supporting an owner argument (view and class functions). ([#25141](https://github.com/expo/expo/pull/25141) by [@tsapeta](https://github.com/tsapeta))
+- Fixed UIView arguments not being resolved correctly when passed in with findNodeHandle ([#24703](https://github.com/expo/expo/pull/24703) by [@javache](https://github.com/javache))
+- [Android] Improve boot time on low-end devices. ([#25267](https://github.com/expo/expo/pull/25267) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improve performance of enum and map converters. ([#25272](https://github.com/expo/expo/pull/25272) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improve logic responsible for obtaining converters that slow down the startup time. ([#25273](https://github.com/expo/expo/pull/25273) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improving the creation process of views for better performance. ([#25274](https://github.com/expo/expo/pull/25274) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Remove `unimodule.json` in favour of `expo-module.config.json`. ([#25100](https://github.com/expo/expo/pull/25100) by [@reichhartd](https://github.com/reichhartd))
+- Remove deprecated `REACT_NATIVE_OVERRIDE_VERSION` for React Native nightly testing. ([#25151](https://github.com/expo/expo/pull/25151) by [@kudo](https://github.com/kudo))
+- Removed backward compatible code for deprecated SDKs. ([#25154](https://github.com/expo/expo/pull/25154) by [@kudo](https://github.com/kudo))
+
+## 1.9.0 — 2023-10-17
+
+### 🛠 Breaking changes
+
+- Dropped support for Android SDK 21 and 22. ([#24201](https://github.com/expo/expo/pull/24201) by [@behenate](https://github.com/behenate))
+
+### 🎉 New features
+
+- Add `CommonExceptions.ModuleNotFound`. ([#24898](https://github.com/expo/expo/pull/24898) by [@lukmccall](https://github.com/lukmccall))
+- [Android] `Set<T>` can now be passed as an argument to a module method. ([#24897](https://github.com/expo/expo/pull/24897) by [@lukmccall](https://github.com/lukmccall))
+
+### 🐛 Bug fixes
+
+- Fixed typed arrays couldn't be returned from synchronous functions. ([#24744](https://github.com/expo/expo/pull/24744) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Fixed exception when deallocating shared objects. ([#24836](https://github.com/expo/expo/pull/24836) by [@kudo](https://github.com/kudo))
+- [Android] Fixed `null` or `undefined` wasn't converted to `JavaScriptValue`. ([#24899](https://github.com/expo/expo/pull/24899) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Fixed `Either` converter not working with types that have common representation in JavaScript. ([#24903](https://github.com/expo/expo/pull/24903) by [@lukmccall](https://github.com/lukmccall))
+- [Android] `Any` converter doesn't use `ReadableMap` or `ReadableList` anymore. Objects and arrays are converted to Kotlin's primitives. ([#24963](https://github.com/expo/expo/pull/24963) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Improve tracking on Android. ([#24625](https://github.com/expo/expo/pull/24625) by [@lukmccall](https://github.com/lukmccall))
+- Use native UUIDv5 generation on `Android` and `iOS`. ([#24200](https://github.com/expo/expo/pull/24200) by [@behenate](https://github.com/behenate))
+- Ensure native modules are installed before required. ([#24746](https://github.com/expo/expo/pull/24746) by [@tsapeta](https://github.com/tsapeta))
+- Clean up and restructure the modules core package directory. ([#24816](https://github.com/expo/expo/pull/24816) by [@tsapeta](https://github.com/tsapeta))
+
 ## 1.8.0 — 2023-09-15
 
 ### 🎉 New features

package/ExpoModulesCore.podspec

@@ -8,9 +8,6 @@ begin
 rescue
   reactNativeVersion = '0.0.0'
 end
-if ENV["REACT_NATIVE_OVERRIDE_VERSION"]
-  reactNativeVersion = ENV["REACT_NATIVE_OVERRIDE_VERSION"]
-end
 
 reactNativeMinorVersion = reactNativeVersion.split('.')[1].to_i
 
@@ -27,7 +24,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platforms       = { :ios => '13.0', :tvos => '13.0'}
+  s.platforms       = { :ios => '13.4', :tvos => '13.4'}
   s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
@@ -43,10 +40,6 @@ Pod::Spec.new do |s|
 
     # 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

package/android/CMakeLists.txt

@@ -6,7 +6,6 @@ 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} ${BOOST_VERSION}")
 
 string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}")
 
@@ -66,14 +65,6 @@ target_compile_options(CommonSettings INTERFACE
   ${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})

package/android/ExpoModulesCorePlugin.gradle

@@ -1,5 +1,15 @@
 class KotlinExpoModulesCorePlugin implements Plugin<Project> {
   void apply(Project project) {
+    // For compatibility reasons the plugin needs to declare that it provides common build.gradle
+    // options for the modules
+    project.rootProject.ext.expoProvidesDefaultConfig = {
+      true
+    }
+
+    project.ext.safeExtGet = { prop, fallback ->
+      project.rootProject.ext.has(prop) ? project.rootProject.ext.get(prop) : fallback
+    }
+
     project.buildscript {
       project.ext.kotlinVersion = {
         project.rootProject.ext.has("kotlinVersion")
@@ -23,212 +33,64 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
           : "1.8.10-1.0.9"
       }
     }
-  }
-}
 
-ext.applyKotlinExpoModulesCorePlugin = {
-  apply plugin: KotlinExpoModulesCorePlugin
-}
+    // Setup build options that are common for all modules
+    if (project.plugins.hasPlugin('kotlin-android')) {
+      project.android {
+        compileSdkVersion project.ext.safeExtGet("compileSdkVersion", 34)
 
-ext.boolish = { value ->
-  return value.toString().toBoolean()
-}
-
-// [BEGIN] Remove when we drop SDK 47
-abstract class ExtractReactNativeAARTask extends DefaultTask {
-  @Input
-  abstract Property<String> getBuildType()
-
-  @Input
-  abstract Property<String> getReactNativeDir()
+        defaultConfig {
+          minSdkVersion project.ext.safeExtGet("minSdkVersion", 23)
+          targetSdkVersion project.ext.safeExtGet("targetSdkVersion", 34)
+        }
 
-  @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")
+        lintOptions {
+          abortOnError false
+        }
       }
     }
-    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 }
+ext.applyKotlinExpoModulesCorePlugin = {
+  apply plugin: KotlinExpoModulesCorePlugin
+}
+
+ext.useExpoPublishing = {
+  afterEvaluate {
+    publishing {
+      publications {
+        release(MavenPublication) {
+          from components.release
+        }
+      }
+      repositories {
+        maven {
+          url = mavenLocal().url
         }
       }
-      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 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")
-          }
-        }
+  android {
+    publishing {
+      singleVariant("release") {
+        withSourcesJar()
       }
     }
   }
 }
 
-ext.applyLegacyReactNativeLibsExtractionPlugin = {
-  apply plugin: LegacyReactNativeLibsExtractionPlugin
+ext.useCoreDependencies = {
+  dependencies {
+    // Avoids cyclic dependencies
+    if (!project.project.name.startsWith("expo-modules-core")) {
+      implementation project.project(':expo-modules-core')
+    }
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.ext.kotlinVersion()}"
+  }
 }
 
-// [END] Remove when we drop SDK 47
+ext.boolish = { value ->
+  return value.toString().toBoolean()
+}

package/android/build.gradle

@@ -3,18 +3,22 @@ import java.nio.file.Paths
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
-apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.8.0'
+version = '1.10.0'
 
-buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  if (expoModulesCorePlugin.exists()) {
-    apply from: expoModulesCorePlugin
-    applyKotlinExpoModulesCorePlugin()
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+if (expoModulesCorePlugin.exists()) {
+  apply from: expoModulesCorePlugin
+  applyKotlinExpoModulesCorePlugin()
+
+  // Remove this check, but keep the contents after SDK49 support is dropped
+  if (safeExtGet("expoProvidesDefaultConfig", false)) {
+    useExpoPublishing()
   }
+}
 
+buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -35,7 +39,6 @@ buildscript {
 
   dependencies {
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-    classpath("de.undercouch:gradle-download-task:5.3.0")
   }
 }
 
@@ -49,28 +52,17 @@ def isExpoModulesCoreTests = {
   return false
 }.call()
 
-def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
-def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads")
-def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
-
 def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":packages:react-native:ReactAndroid") != null
 def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
   ? findProject(":packages:react-native:ReactAndroid").getProjectDir().parent
   : 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(":packages:react-native:ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
-  : "${buildDir}/react/jni"
 
 def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
-// TODO: Remove react-native < 0.71 support
-def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION") ?: "1_76_0"
-def REACT_NATIVE_VERSION = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_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")
-
 def reactNativeArchitectures() {
   def value = project.getProperties().get("reactNativeArchitectures")
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
@@ -89,23 +81,44 @@ USE_HERMES = USE_HERMES && isExpoModulesCoreTests
 
 def isNewArchitectureEnabled = findProperty("newArchEnabled") == "true"
 
-afterEvaluate {
-  publishing {
-    publications {
-      release(MavenPublication) {
-        from components.release
+// Remove this if and it's contents, when support for SDK49 is dropped
+if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+  afterEvaluate {
+    publishing {
+      publications {
+        release(MavenPublication) {
+          from components.release
+        }
       }
-    }
-    repositories {
-      maven {
-        url = mavenLocal().url
+      repositories {
+        maven {
+          url = mavenLocal().url
+        }
       }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
+  // Remove this if and it's contents, when support for SDK49 is dropped
+  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+
+    defaultConfig {
+      minSdkVersion safeExtGet("minSdkVersion", 23)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
+    }
+
+    publishing {
+      singleVariant("release") {
+        withSourcesJar()
+      }
+    }
+
+    lintOptions {
+      abortOnError false
+    }
+  }
 
   if (rootProject.hasProperty("ndkPath")) {
     ndkPath rootProject.ext.ndkPath
@@ -128,11 +141,9 @@ android {
 
   namespace "expo.modules"
   defaultConfig {
-    minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.8.0"
+    versionName "1.10.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -142,14 +153,9 @@ android {
         abiFilters (*reactNativeArchitectures())
         arguments "-DANDROID_STL=c++_shared",
           "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
-          "-DREACT_NATIVE_SO_DIR=${REACT_NATIVE_SO_DIR}",
           "-DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}",
-          "-DBOOST_VERSION=${BOOST_VERSION}",
           "-DUSE_HERMES=${USE_HERMES}",
           "-DIS_NEW_ARCHITECTURE_ENABLED=${isNewArchitectureEnabled}",
-          "-DPROJECT_BUILD_DIR=$buildDir",
-          "-DREACT_ANDROID_DIR=${REACT_NATIVE_DIR}/ReactAndroid",
-          "-DREACT_ANDROID_BUILD_DIR=${REACT_NATIVE_DIR}/ReactAndroid/build",
           "-DUNIT_TEST=${isExpoModulesCoreTests}"
       }
     }
@@ -157,23 +163,7 @@ android {
 
   externalNativeBuild {
     cmake {
-      if (REACT_NATIVE_TARGET_VERSION >= 71) {
-        path "CMakeLists.txt"
-      } else {
-        path "legacy/CMakeLists.txt"
-      }
-    }
-  }
-
-  sourceSets {
-    main {
-      java {
-        if (REACT_NATIVE_TARGET_VERSION >= 73) {
-          srcDirs += "src/reactnative"
-        } else {
-          srcDirs += "src/reactnative72"
-        }
-      }
+      path "CMakeLists.txt"
     }
   }
 
@@ -217,9 +207,6 @@ android {
     }
   }
 
-  lintOptions {
-    abortOnError false
-  }
 
   testOptions {
     unitTests.includeAndroidResources = true
@@ -234,11 +221,6 @@ android {
       }
     }
   }
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-    }
-  }
 }
 
 
@@ -293,60 +275,3 @@ dependencies {
     }
   }
 }
-
-def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDirectories') ?: project.tasks.register('createNativeDepsDirectories') {
-  downloadsDir.mkdirs()
-  thirdPartyNdkDir.mkdirs()
-}
-
-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 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}")
-  }
-}
-
-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) }
-}
-
-afterEvaluate {
-  if (REACT_NATIVE_TARGET_VERSION < 71) {
-    nativeBuildDependsOn(project, prepareBoost, null)
-  }
-}
-
-if (REACT_NATIVE_TARGET_VERSION < 71) {
-  project.ext.extraLegacyReactNativeLibs = [
-    'prepareDoubleConversion',
-    'prepareFolly',
-  ]
-  applyLegacyReactNativeLibsExtractionPlugin()
-}

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

@@ -22,7 +22,6 @@ ExpoModulesHostObject::~ExpoModulesHostObject() {
   installer->jsRegistry.reset();
   installer->runtimeHolder.reset();
   installer->jsInvoker.reset();
-  installer->nativeInvoker.reset();
   installer->jniDeallocator.reset();
 }