feat: ✨ V3 ✨

.github/workflows/build-android.yml

@@ -25,10 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup JDK 1.8
+      - name: Setup JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -55,7 +55,5 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Run Gradle Build for android/
-        run: cd android && ./gradlew assembleDebug --build-cache && cd ..
       - name: Run Gradle Build for example/android/
         run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../..

.github/workflows/build-ios.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 2.6.8
           bundler-cache: true
           working-directory: example/ios
 

.github/workflows/validate-android.yml

@@ -23,10 +23,10 @@ jobs:
         working-directory: ./android
     steps:
       - uses: actions/checkout@v2
-      - name: Setup JDK 1.8
+      - name: Setup JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/validate-cpp.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-review
-          flags: --linelength=230 --exclude "android/src/main/cpp/reanimated-headers"
+          flags: --linelength=230
           targets: --recursive cpp android/src/main/cpp
           filter: "-legal/copyright\
             ,-readability/todo\

VisionCamera.podspec

@@ -6,7 +6,7 @@ reactVersion = '0.0.0'
 begin
   reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.66.0'
+  reactVersion = '0.71.0'
 end
 rnVersion = reactVersion.split('.')[1]
 
@@ -28,7 +28,8 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+    "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) SK_GL=1 SK_METAL=1',
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig = {
@@ -44,6 +45,7 @@ Pod::Spec.new do |s|
   s.source_files = [
     "ios/**/*.{m,mm,swift}",
     "ios/CameraBridge.h",
+    "ios/Skia Render Layer/PreviewSkiaView.h",
     "ios/Frame Processor/Frame.h",
     "ios/Frame Processor/FrameProcessorCallback.h",
     "ios/Frame Processor/FrameProcessorRuntimeManager.h",
@@ -64,4 +66,6 @@ Pod::Spec.new do |s|
   s.dependency "React-callinvoker"
   s.dependency "React"
   s.dependency "React-Core"
+  s.dependency "react-native-worklets"
+  s.dependency "react-native-skia"
 end

android/CMakeLists.txt

@@ -1,42 +1,32 @@
 project(VisionCamera)
-cmake_minimum_required(VERSION 3.4.1)
-
-set (CMAKE_VERBOSE_MAKEFILE ON)
-set (CMAKE_CXX_STANDARD 14)
-
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-        include("${NODE_MODULES_DIR}/react-native/ReactAndroid/cmake-utils/folly-flags.cmake")
-        add_compile_options(${folly_FLAGS})
-else()
-        set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID -DFOR_HERMES=${FOR_HERMES}")
-endif()
-
-
-set (PACKAGE_NAME "VisionCamera")
-set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-        # Consume shared libraries and headers from prefabs
-        find_package(fbjni REQUIRED CONFIG)
-        find_package(ReactAndroid REQUIRED CONFIG)
-else()
-        set (RN_SO_DIR ${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/react/jni)
-endif()
-# VisionCamera shared
-
-if(${REACT_NATIVE_VERSION} LESS 66)
-        set (
-                INCLUDE_JSI_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-        )
-        set (
-                INCLUDE_JSIDYNAMIC_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-        )
+cmake_minimum_required(VERSION 3.9.0)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(PACKAGE_NAME "VisionCamera")
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 17)
+
+# Folly
+include("${NODE_MODULES_DIR}/react-native/ReactAndroid/cmake-utils/folly-flags.cmake")
+add_compile_options(${folly_FLAGS})
+
+# Third party libraries (Prefabs)
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_package(react-native-worklets REQUIRED CONFIG)
+find_library(LOG_LIB log)
+
+# Skia is optional, if it's enabled we link it.
+if (ENABLE_SKIA_INTEGRATION)
+    find_package(shopify_react-native-skia REQUIRED CONFIG)
 endif()
 
+# Add react-native-vision-camera sources
 add_library(
         ${PACKAGE_NAME}
         SHARED
+        ../cpp/JSITypedArray.cpp
         src/main/cpp/VisionCamera.cpp
         src/main/cpp/JSIJNIConversion.cpp
         src/main/cpp/FrameHostObject.cpp
@@ -48,213 +38,33 @@ add_library(
         src/main/cpp/java-bindings/JHashMap.cpp
 )
 
-# includes
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-        target_include_directories(
-                ${PACKAGE_NAME}
-                PRIVATE
-                "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/yoga"
-                # --- Reanimated ---
-                # New
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/AnimatedSensor"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/Tools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/SpecTools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/SharedItems"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/Registries"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/LayoutAnimations"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/hidden_headers"
-                "src/main/cpp"
-        )
-else()
-        file (GLOB LIBFBJNI_INCLUDE_DIR "${BUILD_DIR}/fbjni-*-headers.jar/")
-
-        target_include_directories(
-                ${PACKAGE_NAME}
-                PRIVATE
-                # --- fbjni ---
-                "${LIBFBJNI_INCLUDE_DIR}"
-                # --- Third Party (required by RN) ---
-                "${BUILD_DIR}/third-party-ndk/boost"
-                "${BUILD_DIR}/third-party-ndk/double-conversion"
-                "${BUILD_DIR}/third-party-ndk/folly"
-                "${BUILD_DIR}/third-party-ndk/glog"
-                # --- React Native ---
-                "${NODE_MODULES_DIR}/react-native/React"
-                "${NODE_MODULES_DIR}/react-native/React/Base"
-                "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
-                "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-                "${NODE_MODULES_DIR}/hermes-engine/android/include/"
-                ${INCLUDE_JSI_CPP} # only on older RN versions
-                ${INCLUDE_JSIDYNAMIC_CPP} # only on older RN versions
-                # --- Reanimated ---
-                # Old
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/AnimatedSensor"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/Tools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SpecTools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SharedItems"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/Registries"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/LayoutAnimations"
-                # New
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/AnimatedSensor"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/Tools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/SpecTools"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/SharedItems"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/Registries"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/LayoutAnimations"
-                "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/hidden_headers"
-                "src/main/cpp"
-        )
-endif()
-
-
-
-# find libraries
-
-file (GLOB LIBRN_DIR "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
-
-if(${FOR_HERMES})
-        string(APPEND CMAKE_CXX_FLAGS " -DFOR_HERMES=1")
-
-        if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-                find_package(hermes-engine REQUIRED CONFIG)
-        elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 69)
-                # Bundled Hermes from module `com.facebook.react:hermes-engine` or project `:ReactAndroid:hermes-engine`
-                target_include_directories(
-                        ${PACKAGE_NAME}
-                        PRIVATE
-                        "${JS_RUNTIME_DIR}/API"
-                        "${JS_RUNTIME_DIR}/public"
-                )
-        else()
-                # From `hermes-engine` npm package
-                target_include_directories(
-                        ${PACKAGE_NAME}
-                        PRIVATE
-                        "${JS_RUNTIME_DIR}/android/include"
-                )
-        endif()
-
-        if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-                target_link_libraries(
-                        ${PACKAGE_NAME}
-                        "hermes-engine::libhermes"
-                )
-        else()
-                target_link_libraries(
-                        ${PACKAGE_NAME}
-                        "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so"
-                )
-        endif()
-        file (GLOB LIBREANIMATED_DIR "${BUILD_DIR}/react-native-reanimated-*-hermes.aar/jni/${ANDROID_ABI}")
-else()
-        file (GLOB LIBJSC_DIR "${BUILD_DIR}/android-jsc*.aar/jni/${ANDROID_ABI}")
-
-        if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-                set(JS_ENGINE_LIB ReactAndroid::jscexecutor)
-        else()
-                # Use JSC
-                find_library(
-                        JS_ENGINE_LIB
-                        jscexecutor
-                        PATHS ${LIBRN_DIR}
-                        NO_CMAKE_FIND_ROOT_PATH
-                )
-        endif()
-        target_link_libraries(
-                ${PACKAGE_NAME}
-                ${JS_ENGINE_LIB}
-        )
-
-        # Use Reanimated JSC
-        file (GLOB LIBREANIMATED_DIR "${BUILD_DIR}/react-native-reanimated-*-jsc.aar/jni/${ANDROID_ABI}")
-endif()
-
-if(${REACT_NATIVE_VERSION} LESS 71)
-        find_library(
-                FBJNI_LIB
-                fbjni
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-endif()
-
-if(${REACT_NATIVE_VERSION} LESS 69)
-        find_library(
-                FOLLY_LIB
-                folly_json
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-elseif(${REACT_NATIVE_VERSION} LESS 71)
-        find_library(
-                FOLLY_LIB
-                folly_runtime
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-endif()
-
-if(${REACT_NATIVE_VERSION} LESS 71)
-        find_library(
-                REACT_NATIVE_JNI_LIB
-                reactnativejni
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-endif()
-
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-        target_link_libraries(
-                ${PACKAGE_NAME}
-                ReactAndroid::folly_runtime
-                ReactAndroid::glog
-                ReactAndroid::jsi
-                ReactAndroid::reactnativejni
-                fbjni::fbjni
-        )
-elseif(${REACT_NATIVE_VERSION} LESS 66)
-        # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-        set (JSI_LIB "")
-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()
-
-find_library(
-        REANIMATED_LIB
-        reanimated
-        PATHS ${LIBREANIMATED_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-find_library(
-        LOG_LIB
-        log
+# Header Search Paths (includes)
+target_include_directories(
+        ${PACKAGE_NAME}
+        PRIVATE
+        "../cpp"
+        "src/main/cpp"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule" # <-- CallInvokerHolder JNI wrapper
 )
 
-# linking
-message(WARNING "VisionCamera linking: FOR_HERMES=${FOR_HERMES}")
+# Link everything together
 target_link_libraries(
         ${PACKAGE_NAME}
-        ${LOG_LIB}
-        ${JSI_LIB}
-        ${REANIMATED_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        ${FBJNI_LIB}
-        ${FOLLY_LIB}
-        android
+        ${LOG_LIB}                          # <-- Logcat logger
+        android                             # <-- Android JNI core
+        ReactAndroid::jsi                   # <-- RN: JSI
+        ReactAndroid::reactnativejni        # <-- RN: React Native JNI bindings
+        ReactAndroid::folly_runtime         # <-- RN: For casting JSI <> Java objects
+        fbjni::fbjni                        # <-- fbjni
+        react-native-worklets::rnworklets   # <-- RN Worklets
 )
+
+# Skia is optional. If it's enabled, we link it
+if (ENABLE_SKIA_INTEGRATION)
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            shopify_react-native-skia::rnskia   # <-- RN Skia
+    )
+endif()