feat: Upgrade Android to new arch C++ only

Author: mrousavy

README.md

@@ -13,9 +13,6 @@ const worklet = () => {
 }
 ```
 
-> [!NOTE]
-> In most cases, react-native-worklets-core shouldn't be used as a standalone dependency but rather as a peer-dependency for other modules such as [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera), [react-native-wishlist](https://github.com/margelo/react-native-wishlist), or [react-native-skia](https://github.com/Shopify/react-native-skia).
-
 ## Installation
 
 1. Install the library from npm:
@@ -37,6 +34,12 @@ const worklet = () => {
     yarn start --reset-cache
     ```
 
+## Requirements
+
+- Requires react-native 0.74 or higher
+- Requires the [new architecture](https://reactnative.dev/docs/the-new-architecture/landing-page) to be enabled
+- Requires [Hermes](https://reactnative.dev/docs/hermes)
+
 ## Usage
 
 See [USAGE.md](docs/USAGE.md)

package/android/CMakeLists.txt

@@ -1,96 +1,41 @@
-project("rnworklets")
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.9.0)
+project(ReactNativeWorklets)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
+set(PACKAGE_NAME "react-native-worklets-core")
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-  string(APPEND CMAKE_CXX_FLAGS " -DDEBUG")
-endif()
-
-set(PACKAGE_NAME "rnworklets")
-
-
-# Pre-set Folly flags from React Native core
-include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
-add_compile_options(${folly_FLAGS})
-
-# Consume shared libraries and headers from prefabs
-find_package(fbjni REQUIRED CONFIG)
-find_package(ReactAndroid REQUIRED CONFIG)
-
-if(${JS_RUNTIME} STREQUAL "hermes")
-  find_package(hermes-engine REQUIRED CONFIG)
-endif()
-
-file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "../cpp/**.cpp")
-
+# Compile sources
 add_library(
-  ${PACKAGE_NAME}
-  SHARED
-  ${SOURCES_COMMON}
-  cpp-adapter.cpp
+        ${PACKAGE_NAME}
+        SHARED
+        ../cpp/base/WKTJsiHostObject.cpp
+        ../cpp/base/WKTRuntimeLifecycleMonitor.cpp
+        ../cpp/dispatch/WKTDispatchQueue.cpp
+        ../cpp/wrappers/WKTJsiPromiseWrapper.cpp
+        ../cpp/wrappers/WKTJsiWrapper.cpp
+        ../cpp/WKTJsiWorkletApi.cpp
+        ../cpp/WKTJsiWorkletContext.cpp
 )
 
-# includes
-target_include_directories(
-  ${PACKAGE_NAME}
-  PRIVATE
-  ../cpp
-  ../cpp/base
-  ../cpp/decorators
-  ../cpp/dispatch
-  ../cpp/sharedvalues
-  ../cpp/wrappers
-  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
-  "${REACT_NATIVE_DIR}/ReactCommon"
-  "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
-  "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
-)
+# Add headers search paths
+target_include_directories(${PACKAGE_NAME} PUBLIC ../cpp)
 
-# build shared lib
-set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+# Add Hermes (from com.facebook.react:hermes-android)
+find_package(hermes-engine REQUIRED CONFIG)
 
+# Link everything together
 target_link_libraries(
-  ${PACKAGE_NAME}
-  log
-  android
+        ${PACKAGE_NAME}
+        ReactAndroid::jsi               # <-- JSI core
+        react_codegen_RNWorkletsSpec    # <-- Generated Specs from CodeGen
+        hermes-engine::libhermes        # <-- Hermes Prefab
 )
 
-target_link_libraries(
-  ${PACKAGE_NAME}
-  ReactAndroid::folly_runtime
-  ReactAndroid::glog
-  ReactAndroid::jsi
-  ReactAndroid::reactnativejni
-  fbjni::fbjni
-)
-
-if(${JS_RUNTIME} STREQUAL "hermes")
-  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
-
-  # From prefab from module `com.facebook.react:hermes-android`
-  set(HERMES_LIB hermes-engine::libhermes)
-
+# Add Hermes Debugger if enabled in Gradle CMake options
+if(${HERMES_ENABLE_DEBUGGER})
   target_link_libraries(
     ${PACKAGE_NAME}
-    ${HERMES_LIB}
+    ReactAndroid::hermes_executor
   )
-
-  if(${HERMES_ENABLE_DEBUGGER})
-    set(HERMES_EXECUTOR_LIB ReactAndroid::hermes_executor)
-
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${HERMES_EXECUTOR_LIB}
-    )
-  endif()
-elseif(${JS_RUNTIME} STREQUAL "jsc")
-  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
-
-  set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
-
-  target_link_libraries(${PACKAGE_NAME} ${JSEXECUTOR_LIB})
-else()
-  message(FATAL_ERROR "Unknown JS runtime ${JS_RUNTIME}.")
 endif()

package/android/build.gradle

@@ -1,74 +1,29 @@
-import java.nio.file.Paths
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Worklets_" + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return getExtOrDefault(name).toInteger()
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
-static def findNodeModules(baseDir) {
-  def basePath = baseDir.toPath().normalize()
-  // Node's module resolution algorithm searches up to the root directory,
-  // after which the base path will be null
-  while (basePath) {
-    def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
-    def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
-    if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
-      return nodeModulesPath.toString()
-    }
-    basePath = basePath.getParent()
+buildscript {
+  repositories {
+    google()
+    mavenCentral()
   }
-  throw new GradleException("react-native-worklets-core: Failed to find node_modules/ path!")
-}
 
-def JS_RUNTIME = {
-  // Override JS runtime with environment variable
-  if (System.getenv("JS_RUNTIME")) {
-    return System.getenv("JS_RUNTIME")
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
   }
-
-  // Check if Hermes is enabled in app setup
-  def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-  if (appProject?.hermesEnabled?.toBoolean()) {
-    return "hermes"
-  }
-
-  // Use JavaScriptCore (JSC) by default
-  return "jsc"
-}.call()
-
-def nodeModules = findNodeModules(projectDir)
-
-def reactNativeArchitectures() {
-  def value = project.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 apply plugin: "com.android.library"
+apply plugin: "com.facebook.react"
 
-if (isNewArchitectureEnabled()) {
-    apply plugin: "com.facebook.react"
-}
-
-task prepareHeaders(type: Copy) {
-  from fileTree('../cpp').filter { it.isFile() }
-  into "${project.buildDir}/headers/rnworklets/react-native-worklets-core/"
-  includeEmptyDirs = false
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Worklets_" + name]
 }
 
-task deleteCmakeCache() {
-  doFirst {
-    delete "${projectDir}/.cxx"
-  }
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Worklets_" + name]).toInteger()
 }
 
 android {
+  namespace "com.worklets"
+
+  ndkVersion getExtOrDefault("ndkVersion")
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
@@ -77,39 +32,27 @@ android {
 
     externalNativeBuild {
       cmake {
-        arguments "-DANDROID_STL=c++_shared",
-                "-DANDROID_TOOLCHAIN=clang",
-                "-DREACT_NATIVE_DIR=${nodeModules}/react-native",
-                "-DJS_RUNTIME=${JS_RUNTIME}"
-        abiFilters (*reactNativeArchitectures())
+        cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
       }
     }
   }
 
-  buildFeatures {
-    prefab true
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
   externalNativeBuild {
     cmake {
       path "CMakeLists.txt"
     }
   }
 
+  buildFeatures {
+    buildConfig true
+    prefab true
+  }
+
   buildTypes {
     debug {
       externalNativeBuild {
         cmake {
-          if (JS_RUNTIME == "hermes") {
-            arguments "-DHERMES_ENABLE_DEBUGGER=1"
-          } else {
-            arguments "-DHERMES_ENABLE_DEBUGGER=0"
-          }
+          arguments "-DHERMES_ENABLE_DEBUGGER=1"
         }
       }
     }
@@ -119,62 +62,33 @@ android {
           arguments "-DHERMES_ENABLE_DEBUGGER=0"
         }
       }
+      minifyEnabled false
     }
   }
 
-  sourceSets {
-    main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += ["src/newarch"]
-      } else {
-        java.srcDirs += ["src/oldarch"]
-      }
-    }
-  }
-
-  packagingOptions {
-    excludes = [
-      "META-INF",
-      "META-INF/**",
-      "**/libc++_shared.so",
-      "**/libfbjni.so",
-      "**/libjsi.so",
-      "**/libfolly_json.so",
-      "**/libfolly_runtime.so",
-      "**/libglog.so",
-      "**/libhermes.so",
-      "**/libhermes-executor-debug.so",
-      "**/libhermes_executor.so",
-      "**/libreactnativejni.so",
-      "**/libturbomodulejsijni.so",
-      "**/libreact_nativemodule_core.so",
-      "**/libjscexecutor.so",
-    ]
-  }
-
-  buildFeatures {
-    prefabPublishing true
+  lintOptions {
+    disable "GradleCompatible"
   }
+}
 
-  prefab {
-    rnworklets {
-      headers "${project.buildDir}/headers/rnworklets/"
-    }
-  }
+repositories {
+  mavenCentral()
+  google()
 }
 
+
 dependencies {
-  implementation "com.facebook.react:react-android"
-  if (JS_RUNTIME == "hermes") {
-    implementation "com.facebook.react:hermes-android"
-  }
-}
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
 
-preBuild.dependsOn(prepareHeaders)
+  // Requires Hermes Runtime
+  implementation "com.facebook.react:hermes-android"
+}
 
-tasks.configureEach { task ->
-  // C++ clean
-  if (task.name.contains("clean")) {
-    task.dependsOn(deleteCmakeCache)
-  }
+react {
+  jsRootDir = file("../src/")
+  libraryName = "Worklets"
+  codegenJavaPackageName = "com.worklets"
 }

package/android/cpp-adapter.cpp

@@ -1,5 +1,4 @@
-Worklets_kotlinVersion=1.7.0
-Worklets_minSdkVersion=21
+Worklets_minSdkVersion=23
 Worklets_targetSdkVersion=31
 Worklets_compileSdkVersion=31
 Worklets_ndkversion=21.4.7075529