@shopify/react-native-skia 2.12.0 → 2.13.0

package/LICENSE.md

@@ -1,4 +1,5 @@
-Copyright 2021-present, Shopify Inc.
+Copyright 2026-present, William Candillon
+Copyright 2021-2026, Shopify Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/Package.swift

@@ -86,10 +86,10 @@ let package = Package(
         .headerSearchPath("cpp/rnskia"), // apple/ uses bare "RNSkView.h"
         .headerSearchPath("cpp/utils"), // apple/ uses bare "RNSkLog.h"
 
-        // CocoaPods forces both project-wide; the SwiftPM path defines neither.
-        // Skia's Apple sources still gate on them: without them RNSkiaModule's
-        // legacy branch fails to compile and -getTurboModule: is dropped, so
-        // the JSI bindings never install.
+        // CocoaPods defines both project-wide for a New Architecture app; the
+        // SwiftPM path defines neither. Skia's own sources no longer gate on
+        // them, but React's headers do (RCT_REMOVE_LEGACY_ARCH hides the
+        // legacy bridge API), so mirror what CocoaPods does.
         .define("RCT_NEW_ARCH_ENABLED", to: "1"),
         .define("RCT_REMOVE_LEGACY_ARCH", to: "1"),
 

package/android/CMakeLists.txt

@@ -1,7 +1,6 @@
 project(RNSkia)
 cmake_minimum_required(VERSION 3.4.1)
 
-set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 20)
 
 # SKIA_LIBS_PATH is passed from Gradle (pointing at the prebuilt Skia binaries,
@@ -48,20 +47,7 @@ set (SKIA_SKSG_LIB "sksg")
 set (SKIA_JSONREADER_LIB "jsonreader")
 
 
-# Clear some variables
-unset(LIBRN_DIR CACHE)
-unset(libfbjni_link_DIRS CACHE)
-unset(libfbjni_include_DIRS CACHE)
-
-set(build_DIR ${CMAKE_SOURCE_DIR}/build)
-file(GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
-file(GLOB libfbjni_link_DIRS "${build_DIR}/fbjni*.aar/jni/${ANDROID_ABI}")
-file(GLOB libfbjni_include_DIRS "${build_DIR}/fbjni-*-headers.jar/")
-
 message("-- ABI     : " ${ANDROID_ABI})
-message("-- PREBUILT: " ${PREBUILT_DIR})
-message("-- BUILD   : " ${build_DIR})
-message("-- LIBRN   : " ${LIBRN_DIR})
 
 link_directories(${SKIA_LIBS_PATH}/)
 
@@ -80,14 +66,6 @@ else()
     )
 endif()
 
-if(${REACT_NATIVE_VERSION} LESS 66)
-        file(
-                TO_CMAKE_PATH
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-                INCLUDE_JSI_CPP
-        )
-endif()
-
 add_library(
         ${PACKAGE_NAME}
         SHARED
@@ -145,8 +123,6 @@ target_include_directories(
 
         # Shared JSI infrastructure (cpp/jsi) via prefix-qualified includes
         ../cpp
-
-        ${libfbjni_include_DIRS}
 )
 
 add_library(svg STATIC IMPORTED)
@@ -189,113 +165,9 @@ find_library(
 )
 message("-- LOG     : " ${LOG_LIB})
 
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # We need to find packages since from RN 0.71 binaries are prebuilt
-    find_package(fbjni REQUIRED CONFIG)
-    find_package(ReactAndroid REQUIRED CONFIG)
-endif()
-
-unset(JSI_LIB CACHE)
-if(${REACT_NATIVE_VERSION} LESS 66)
-    # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-    set (JSI_LIB "")
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (JSI_LIB ReactAndroid::jsi)
-else()
-    # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-    find_library(
-        JSI_LIB
-        jsi
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- JSI     : " ${JSI_LIB})
-
-unset(REACT_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 packs react_nativemodule_core into ReactAndroid::reactnative
-    set (REACT_LIB ReactAndroid::reactnative)
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (REACT_LIB ReactAndroid::react_nativemodule_core)
-    else()
-    find_library(
-            REACT_LIB
-            react_nativemodule_core
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- REACT   : " ${REACT_LIB})
-
-unset(FBJNI_LIBRARY CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (FBJNI_LIBRARY fbjni::fbjni)
-else()
-    find_library(
-            FBJNI_LIBRARY
-            fbjni
-            PATHS ${libfbjni_link_DIRS}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- FBJNI   : " ${FBJNI_LIBRARY})
-
-unset(REACTNATIVEJNI_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have reactnativejni
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (REACTNATIVEJNI_LIB "ReactAndroid::reactnativejni")
-else()
-    find_library(
-            REACTNATIVEJNI_LIB
-            reactnativejni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- REACTNATIVEJNI   : " ${REACTNATIVEJNI_LIB})
-
-unset(RUNTIMEEXECUTOR_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have runtimeexecutor
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (RUNTIMEEXECUTOR_LIB "ReactAndroid::runtimeexecutor")
-else()
-    find_library(
-            RUNTIMEEXECUTOR_LIB
-            runtimeexecutor
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- RUNTIMEEXECUTOR   : " ${RUNTIMEEXECUTOR_LIB})
-
-unset(TURBOMODULES_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have turbomodulejsijni
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (TURBOMODULES_LIB "ReactAndroid::turbomodulejsijni")
-else()
-    find_library(
-            TURBOMODULES_LIB
-            turbomodulejsijni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- TURBO   : " ${TURBOMODULES_LIB})
-
-add_definitions(-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION})
+# React Native distributes prebuilt binaries via prefab.
+find_package(fbjni REQUIRED CONFIG)
+find_package(ReactAndroid REQUIRED CONFIG)
 
 # Set RN_SERIALIZABLE_STATE and C++ flags for React Native 0.81+
 if(${REACT_NATIVE_VERSION} GREATER_EQUAL 80)
@@ -307,50 +179,25 @@ else()
 endif()
 
 # Link
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    set(COMMON_LIBS
-        ${LOG_LIB}
-        ${REACT_LIB}
-        ${FBJNI_LIBRARY}
-        ${JSI_LIB}
-        ${SKIA_SVG_LIB}
-        ${SKIA_SKSHAPER_LIB}
-        ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_CORE_LIB}
-        ${SKIA_SKUNICODE_ICU_LIB}
-        ${SKIA_SKOTTIE_LIB}
-        ${SKIA_SKSG_LIB}
-        ${SKIA_JSONREADER_LIB}
-        ${SKIA_LIB}
-        -ljnigraphics
-        -lGLESv2
-        -lEGL
-        -landroid
-    )
-else()
-    set(COMMON_LIBS
-        ${LOG_LIB}
-        ${FBJNI_LIBRARY}
-        ${REACT_LIB}
-        ${JSI_LIB}
-        ${REACTNATIVEJNI_LIB}
-        ${RUNTIMEEXECUTOR_LIB}
-        ${TURBOMODULES_LIB}
-        ${SKIA_SVG_LIB}
-        ${SKIA_SKSHAPER_LIB}
-        ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_CORE_LIB}
-        ${SKIA_SKUNICODE_ICU_LIB}
-        ${SKIA_SKOTTIE_LIB}
-        ${SKIA_SKSG_LIB}
-        ${SKIA_JSONREADER_LIB}
-        ${SKIA_LIB}
-        -ljnigraphics
-        -lGLESv2
-        -lEGL
-        -landroid
-    )
-endif()
+set(COMMON_LIBS
+    ${LOG_LIB}
+    ReactAndroid::reactnative
+    fbjni::fbjni
+    ReactAndroid::jsi
+    ${SKIA_SVG_LIB}
+    ${SKIA_SKSHAPER_LIB}
+    ${SKIA_SKPARAGRAPH_LIB}
+    ${SKIA_SKUNICODE_CORE_LIB}
+    ${SKIA_SKUNICODE_ICU_LIB}
+    ${SKIA_SKOTTIE_LIB}
+    ${SKIA_SKSG_LIB}
+    ${SKIA_JSONREADER_LIB}
+    ${SKIA_LIB}
+    -ljnigraphics
+    -lGLESv2
+    -lEGL
+    -landroid
+)
 
 if(SK_GRAPHITE)
     target_link_libraries(${PACKAGE_NAME}
@@ -360,8 +207,6 @@ if(SK_GRAPHITE)
 else()
     target_link_libraries(${PACKAGE_NAME}
         ${COMMON_LIBS}
-        -lGLESv2
-        -lEGL
     )
 endif()
 

package/android/build.gradle

@@ -2,39 +2,23 @@ import java.nio.file.Paths
 
 // android/build.gradle
 
-// based on:
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
-//   previous location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
-//   previous location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-
 // FBJNI build is based on:
 // https://github.com/facebookincubator/fbjni/blob/main/docs/android_setup.md
 
 // These defaults should reflect the SDK versions used by
-// the minimum React Native version supported.
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 28
+// the minimum React Native version supported (0.78).
+def DEFAULT_COMPILE_SDK_VERSION = 35
+def DEFAULT_BUILD_TOOLS_VERSION = '35.0.0'
+def DEFAULT_MIN_SDK_VERSION = 24
+def DEFAULT_TARGET_SDK_VERSION = 34
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
 apply plugin: 'com.android.library'
+// Runs codegen for the TurboModule spec and the Fabric component (src/specs).
+apply plugin: 'com.facebook.react'
 
 def reactNativeArchitectures() {
   def value = project.getProperties().get("reactNativeArchitectures")
@@ -128,10 +112,6 @@ logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
 def sourceBuild = false
 def defaultDir
 
-if (isNewArchitectureEnabled()) {
-    apply plugin: "com.facebook.react"
-}
-
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
 } else if (findProject(':ReactAndroid') != null) {
@@ -147,54 +127,18 @@ if (!defaultDir.exists()) {
     )
 }
 
-def prebuiltDir = sourceBuild
-    ? "$nodeModules/react-native/ReactAndroid/src/main/jni/prebuilt/lib"
-    : "$buildDir/react-native-0*/jni"
-
-
-def buildType = "debug"
-if (gradle.startParameter.taskRequests.args[0].toString().contains("Release")) {
-    buildType = "release"
-} else if (gradle.startParameter.taskRequests.args[0].toString().contains("Debug")) {
-    buildType = "debug"
-}
-
 def reactProperties = new Properties()
 file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 def FULL_RN_VERSION =  (System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME"))
 def REACT_NATIVE_VERSION = FULL_RN_VERSION.split("\\.")[1].toInteger()
-def ENABLE_PREFAB = REACT_NATIVE_VERSION > 68
 
 logger.warn("react-native-skia: RN Version: ${REACT_NATIVE_VERSION} / ${FULL_RN_VERSION}")
 logger.warn("react-native-skia: isSourceBuild: ${sourceBuild}")
-logger.warn("react-native-skia: PrebuiltDir: ${prebuiltDir}")
-logger.warn("react-native-skia: buildType: ${buildType}")
 logger.warn("react-native-skia: buildDir: ${buildDir}")
 logger.warn("react-native-skia: node_modules: ${nodeModules}")
-logger.warn("react-native-skia: Enable Prefab: ${ENABLE_PREFAB}")
-
-buildscript {
-    // The Android Gradle plugin is only required when opening the android folder stand-alone.
-    // This avoids unnecessary downloads and potential conflicts when the library is included as a
-    // module dependency in an application project.
-    // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
-    if (project == rootProject) {
-        repositories {
-            google()
-        }
-        dependencies {
-            // This should reflect the Gradle plugin version used by
-            // the minimum React Native version supported.
-            classpath 'com.android.tools.build:gradle:3.4.1'
-        }
-    }
-}
 
 android {
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-      namespace "com.shopify.reactnative.skia"
-    }
+    namespace "com.reactnative.skia"
 
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
@@ -213,17 +157,15 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         externalNativeBuild {
             cmake {
-                cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
+                cppFlags "-fexceptions", "-frtti"
                 abiFilters (*reactNativeArchitectures())
                 arguments '-DANDROID_STL=c++_shared',
                           "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
                           "-DREACT_NATIVE_DIR=${defaultDir}",
                           "-DNODE_MODULES_DIR=${nodeModules}",
-                          "-DPREBUILT_DIR=${prebuiltDir}",
                           "-DSKIA_LIBS_PATH=${skiaLibsPath}",
                           "-DSK_GRAPHITE=${useGraphite ? 'ON' : 'OFF'}",
                           "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
@@ -245,25 +187,6 @@ android {
         jniLibs {
             srcDirs += [skiaLibsPath]
         }
-        java {
-            if (!isNewArchitectureEnabled()) {
-                srcDirs += [
-                    "src/paper/java",
-                ]
-            }
-
-            if (REACT_NATIVE_VERSION == 74) {
-                srcDirs += [
-                    "src/reactnative74/java"
-                ]
-            } else {
-                // the name latest here might be confusing as it applies for versions
-                // below 74 as well
-                srcDirs += [
-                    "src/latest/java"
-                ]
-            }
-        }
     }
 
     externalNativeBuild {
@@ -277,45 +200,23 @@ android {
              "**/libc++_shared.so",
              "**/libfbjni.so",
              "**/libjsi.so",
-             "**/libreact_nativemodule_core.so",
-             "**/libreactnativejni.so",
-             "**/libruntimeexecutor.so",
-             "**/libturbomodulejsijni.so",
              "**/libreactnative.so",
              "META-INF/**"
         ]
     }
 
-    if (ENABLE_PREFAB) {
-        buildFeatures {
-                prefab true
-                prefabPublishing true
-        }
-        prefab {
-            rnskia {
-                headers "${project.buildDir}/headers/rnskia/"
-            }
-        }
+    buildFeatures {
+        prefab true
+        prefabPublishing true
     }
-
-    // Create new configurations that can be referred to in dependencies.
-    // The Android Gradle Plugin 3.* does not allow hooking into existing
-    // configurations like `implementation`.
-    configurations {
-        extractHeaders
-        extractJNI
+    prefab {
+        rnskia {
+            headers "${project.buildDir}/headers/rnskia/"
+        }
     }
 }
 
 repositories {
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    maven {
-        // Android JSC is installed from npm
-        url("$rootDir/../node_modules/jsc-android/dist")
-    }
     mavenCentral {
         // We don't want to fetch react-native from Maven Central as there are
         // older versions over there.
@@ -329,102 +230,32 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-
-    if (REACT_NATIVE_VERSION < 71) {
-        logger.warn("react-native-skia: Extracting files from AAR (pre RN 0.71)")
-        //noinspection GradleDynamicVersion
-        extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
-        //noinspection GradleDynamicVersion
-        extractJNI("com.facebook.fbjni:fbjni:0.2.2")
-    }
-
-    if (!sourceBuild) {
-        def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
-        if (REACT_NATIVE_VERSION < 69) {
-            logger.warn("react-native-skia: aar state pre 69. match **/**/*.aar")
-            rnAarMatcher = "**/**/*.aar"
-        } else if (REACT_NATIVE_VERSION >= 71) {
-            logger.warn("react-native-skia: aar state post 70, do nothing")
-            return
-        }
-        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile
-        logger.warn("react-native-skia: Extracting JNI files (pre RN 0.71) ${rnAAR}")
-        extractJNI(files(rnAAR))
-    }
 }
 
-def localBuildDir = buildDir
-def headersConfiguration = configurations.extractHeaders
-def jniConfiguration = configurations.extractJNI
-
-task extractAARHeaders {
-    doLast {
-        headersConfiguration.files.each { file ->
-            def absFile = file.absoluteFile
-            project.copy {
-                from project.zipTree(absFile)
-                into "${localBuildDir}/${absFile.name}"
-                include "**/*.h"
-            }
+// Package all the cpp code in a flattened directory structure
+task prepareHeaders(type: Copy) {
+    from("../cpp")
+    from("./cpp")
+    into "${project.buildDir}/headers/rnskia/react-native-skia"
+    includeEmptyDirs = false
+    include "**/*.h"
+    eachFile {
+        String path = it.path
+
+        if (path.contains("api/third_party")) {
+            // Skip flattening third_party dir
+            path = path.substring("api/".length())
+        } else if (path.contains("skia/include") || path.contains("skia/modules") || path.contains("skia/src")) {
+            // Skip flattening Skia dir
+            path = path.substring("skia/".length())
+        } else if (path.startsWith("dawn/include/")) {
+            // Flatten dawn/include/dawn and dawn/include/webgpu
+            path = path.substring("dawn/include/".length())
+        } else {
+            // flatten anything else
+            path = path.substring(path.lastIndexOf("/") + 1)
         }
+        it.path = path
     }
 }
-
-task extractJNIFiles {
-    doLast {
-        jniConfiguration.files.each { file ->
-            def absFile = file.absoluteFile
-            project.copy {
-                from project.zipTree(absFile)
-                into "${localBuildDir}/${absFile.name}"
-                include "jni/**/*"
-            }
-        }
-    }
-}
-
-extractJNIFiles.mustRunAfter extractAARHeaders
-
-if (ENABLE_PREFAB) {
-    // Package all the cpp code in a flattened directory structure
-    task prepareHeaders(type: Copy) {
-        from("../cpp")
-        from("./cpp")
-        into "${project.buildDir}/headers/rnskia/react-native-skia"
-        includeEmptyDirs = false
-        include "**/*.h"
-        eachFile {
-            String path = it.path
-
-            if (path.contains("api/third_party")) {
-                // Skip flattening third_party dir
-                path = path.substring("api/".length())
-            } else if (path.contains("skia/include") || path.contains("skia/modules") || path.contains("skia/src")) {
-                // Skip flattening Skia dir
-                path = path.substring("skia/".length())
-            } else if (path.startsWith("dawn/include/")) {
-                // Flatten dawn/include/dawn and dawn/include/webgpu
-                path = path.substring("dawn/include/".length())
-            } else {
-                // flatten anything else
-                path = path.substring(path.lastIndexOf("/") + 1)
-            }
-            it.path = path
-        }
-    }
-    preBuild.dependsOn(prepareHeaders)
-}
-
-def nativeBuildDependsOn(dependsOnTask, variant) {
-  def buildTasks = tasks.findAll({ task ->
-      !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
-  if (variant != null) {
-    buildTasks = buildTasks.findAll({ task -> task.name.contains(variant) })
-  }
-  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
-}
-
-afterEvaluate {
-  nativeBuildDependsOn(extractAARHeaders, null)
-  nativeBuildDependsOn(extractJNIFiles, null)
-}
+preBuild.dependsOn(prepareHeaders)

package/android/cpp/jni/JniSkiaManager.cpp

@@ -7,47 +7,6 @@
 
 #include "RNSkManager.h"
 
-namespace {
-
-#if REACT_NATIVE_VERSION >= 75
-using CallFuncType = facebook::react::CallFunc;
-#else
-using CallFuncType = std::function<void()>;
-#endif
-
-// For bridgeless mode, currently we don't have a way to get the JSCallInvoker
-// from Java. Workaround to use RuntimeExecutor to simulate the behavior of
-// JSCallInvoker. In the future when bridgeless mode is a standard and no more
-// backward compatible to be considered, we could just use RuntimeExecutor to
-// run task on JS thread.
-class BridgelessJSCallInvoker : public facebook::react::CallInvoker {
-public:
-  explicit BridgelessJSCallInvoker(
-      facebook::react::RuntimeExecutor runtimeExecutor)
-      : runtimeExecutor_(std::move(runtimeExecutor)) {}
-
-  void invokeAsync(CallFuncType &&func) noexcept override {
-    runtimeExecutor_([func = std::move(func)](facebook::jsi::Runtime &runtime) {
-#if REACT_NATIVE_VERSION >= 75
-      func(runtime);
-#else
-      func();
-#endif
-    });
-  }
-
-  void invokeSync(CallFuncType &&func) override {
-    throw std::runtime_error(
-        "Synchronous native -> JS calls are currently not supported.");
-  }
-
-private:
-  facebook::react::RuntimeExecutor runtimeExecutor_;
-
-}; // class BridgelessJSCallInvoker
-
-} // namespace
-
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
@@ -65,12 +24,11 @@ void JniSkiaManager::registerNatives() {
 jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
 JniSkiaManager::initHybrid(
     jni::alias_ref<jhybridobject> jThis, jlong jsContext,
-    jni::alias_ref<facebook::react::JRuntimeExecutor::javaobject>
-        jRuntimeExecutor,
+    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
+        jsCallInvokerHolder,
     JavaPlatformContext skiaContext) {
 
-  auto jsCallInvoker = std::make_shared<BridgelessJSCallInvoker>(
-      jRuntimeExecutor->cthis()->get());
+  auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   // cast from JNI hybrid objects to C++ instances
   return makeCxxInstance(jThis, reinterpret_cast<jsi::Runtime *>(jsContext),
                          jsCallInvoker, skiaContext->cthis());

package/android/cpp/jni/include/JniPlatformContext.h

@@ -21,7 +21,7 @@ namespace jni = facebook::jni;
 class JniPlatformContext : public jni::HybridClass<JniPlatformContext> {
 public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/shopify/reactnative/skia/PlatformContext;";
+      "Lcom/reactnative/skia/PlatformContext;";
 
   static jni::local_ref<jhybriddata>
   initHybrid(jni::alias_ref<jhybridobject> jThis, const float);