Bumps and fixes for react native version bump

package/android/CMakeLists.txt

@@ -19,7 +19,9 @@ endif()
 
 
 # Add react-native-vision-camera sources
-set(SOURCES
+add_library(
+        ${PACKAGE_NAME}
+        SHARED
         # Shared C++
         ../cpp/MutableRawBuffer.cpp
         # Java JNI
@@ -29,33 +31,17 @@ set(SOURCES
         src/main/cpp/OpenGLContext.cpp
         src/main/cpp/OpenGLRenderer.cpp
         src/main/cpp/MutableJByteBuffer.cpp
-)
+        # Frame Processor
-
+        src/main/cpp/frameprocessor/FrameHostObject.cpp
-# Only add Frame Processor sources if enabled
+        src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
-if (ENABLE_FRAME_PROCESSORS)
+        src/main/cpp/frameprocessor/JSIJNIConversion.cpp
-        list(APPEND SOURCES
+        src/main/cpp/frameprocessor/VisionCameraProxy.cpp
-                src/main/cpp/frameprocessor/FrameHostObject.cpp
+        src/main/cpp/frameprocessor/java-bindings/JSharedArray.cpp
-                src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrame.cpp
-                src/main/cpp/frameprocessor/JSIJNIConversion.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.cpp
-                src/main/cpp/frameprocessor/VisionCameraProxy.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
-                src/main/cpp/frameprocessor/java-bindings/JSharedArray.cpp
+        src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
-                src/main/cpp/frameprocessor/java-bindings/JFrame.cpp
+        src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
-                src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.cpp
-                src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
-                src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
-                src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
-        )
-endif()
-
-add_library(
-        ${PACKAGE_NAME}
-        SHARED
-        ${SOURCES}
-)
-
-# Force 16KB page alignment for Android 15+ compatibility
-set_target_properties(${PACKAGE_NAME} PROPERTIES
-    LINK_FLAGS "-Wl,-z,max-page-size=16384"
 )
 
 # Header Search Paths (includes)
@@ -74,13 +60,13 @@ target_include_directories(
 # Link everything together
 target_link_libraries(
         ${PACKAGE_NAME}
-        ${LOG_LIB}                      # <-- Logcat logger
+        ${LOG_LIB}                          # <-- Logcat logger
-        android                         # <-- Android JNI core
+        android                             # <-- Android JNI core
-        ReactAndroid::jsi               # <-- RN: JSI
+        ReactAndroid::jsi                   # <-- RN: JSI
-        ReactAndroid::reactnative       # <-- RN: React Native JNI bindings (RN 0.76+)
+        # ReactAndroid::reactnativejni      # <-- Temporarily disabled for RN 0.79+ compatibility
-        fbjni::fbjni                    # <-- fbjni
+        fbjni::fbjni                        # <-- fbjni
-        GLESv2                          # <-- OpenGL (for VideoPipeline)
+        GLESv2                              # <-- OpenGL (for VideoPipeline)
-        EGL                             # <-- OpenGL (EGL) (for VideoPipeline)
+        EGL                                 # <-- OpenGL (EGL) (for VideoPipeline)
 )
 
 # Optionally also add Frame Processors here

package/android/build.gradle

@@ -133,16 +133,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  kotlinOptions {
-    jvmTarget = "17"
-    freeCompilerArgs += [
-      "-opt-in=kotlin.RequiresOptIn",
-      "-opt-in=com.facebook.react.annotations.UnstableReactNativeAPI"
-    ]
   }
 
   externalNativeBuild {
@@ -165,7 +157,6 @@ android {
             "**/libhermes-executor-debug.so",
             "**/libhermes_executor.so",
             "**/libreactnativejni.so",
-            "**/libreactnative.so",
             "**/libturbomodulejsijni.so",
             "**/libreact_nativemodule_core.so",
             "**/libjscexecutor.so"

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/cpp/VisionCamera.cpp

@@ -9,13 +9,11 @@
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
   return facebook::jni::initialize(vm, [] {
-    // VideoPipeline is needed for video recording even without Frame Processors
-    vision::VideoPipeline::registerNatives();
-#if VISION_CAMERA_ENABLE_FRAME_PROCESSORS
-    // Frame Processor JNI bindings - only register when Frame Processors are enabled
     vision::VisionCameraInstaller::registerNatives();
     vision::JVisionCameraProxy::registerNatives();
     vision::JVisionCameraScheduler::registerNatives();
+    vision::VideoPipeline::registerNatives();
+#if VISION_CAMERA_ENABLE_FRAME_PROCESSORS
     vision::JFrameProcessor::registerNatives();
     vision::JSharedArray::registerNatives();
 #endif

package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt

@@ -32,7 +32,7 @@ class CameraViewManager : ViewGroupManager<CameraView>() {
       .put("cameraError", MapBuilder.of("registrationName", "onError"))
       .put("cameraCodeScanned", MapBuilder.of("registrationName", "onCodeScanned"))
       .put("onVideoChunkReady", MapBuilder.of("registrationName", "onVideoChunkReady"))
-      .build()?.toMutableMap()
+      .build()
 
   override fun getName(): String = TAG
 

package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt

@@ -31,12 +31,10 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
     init {
       try {
         // Load the native part of VisionCamera.
-        // Includes the OpenGL VideoPipeline (needed for video recording)
+        // Includes the OpenGL VideoPipeline, as well as Frame Processor JSI bindings
-        // Frame Processors remain disabled for RN 0.79+ compatibility
         System.loadLibrary("VisionCamera")
-        Log.i(TAG, "VisionCamera native library loaded successfully")
       } catch (e: UnsatisfiedLinkError) {
-        Log.e(TAG, "Failed to load VisionCamera C++ library!", e)
+        Log.e(VisionCameraProxy.TAG, "Failed to load VisionCamera C++ library!", e)
         throw e
       }
     }
@@ -75,11 +73,15 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
     }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  fun installFrameProcessorBindings(): Boolean {
+  fun installFrameProcessorBindings(): Boolean =
-    // Frame Processors are disabled for React Native 0.79+ compatibility
+    try {
-    Log.i(TAG, "Frame Processor bindings not installed - Frame Processors disabled for RN 0.79+ compatibility")
+      val proxy = VisionCameraProxy(reactApplicationContext)
-    return false
+      VisionCameraInstaller.install(proxy)
-  }
+      true
+    } catch (e: Error) {
+      Log.e(TAG, "Failed to install Frame Processor JSI Bindings!", e)
+      false
+    }
 
   @ReactMethod
   fun takePhoto(viewTag: Int, options: ReadableMap, promise: Promise) {
@@ -155,7 +157,7 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
   }
 
   private fun canRequestPermission(permission: String): Boolean {
-    val activity = reactApplicationContext.currentActivity as? PermissionAwareActivity
+    val activity = currentActivity as? PermissionAwareActivity
     return activity?.shouldShowRequestPermissionRationale(permission) ?: false
   }
 

package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt

@@ -105,12 +105,6 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
     muxerContext?.finish()
     chunkIndex++
 
-    val format = this.encodedFormat
-    if (format == null) {
-      Log.e(TAG, "Cannot create muxer: encodedFormat is null (onOutputFormatChanged not called yet)")
-      return
-    }
-
     val newFileName = "$chunkIndex.mp4"
     val newOutputFile = File(this.outputDirectory, newFileName)
     Log.i(TAG, "Creating new muxer for file: $newFileName")
@@ -120,7 +114,7 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
     )
     muxer.setOrientationHint(orientationHint)
     muxerContext = MuxerContext(
-        muxer, newOutputFile, chunkIndex, bufferInfo.presentationTimeUs, format, this.callbacks
+        muxer, newOutputFile, chunkIndex, bufferInfo.presentationTimeUs, this.encodedFormat!!, this.callbacks
     )
   }
 
@@ -129,8 +123,7 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
   }
 
   private fun chunkLengthUs(bufferInfo: BufferInfo): Long {
-    val context = muxerContext ?: return 0L
+    return bufferInfo.presentationTimeUs - muxerContext!!.startTimeUs
-    return bufferInfo.presentationTimeUs - context.startTimeUs
   }
 
   fun start() {
@@ -162,13 +155,7 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
       if (muxerContext == null || (atKeyframe(bufferInfo) && chunkLengthUs(bufferInfo) >= targetDurationUs)) {
         this.createNextMuxer(bufferInfo)
       }
-      val context = muxerContext
+      muxerContext!!.muxer.writeSampleData(muxerContext!!.videoTrack, encodedData, bufferInfo)
-      if (context == null) {
-        Log.e(TAG, "Cannot write sample data: muxerContext is null")
-        encoder.releaseOutputBuffer(index, false)
-        return
-      }
-      context.muxer.writeSampleData(context.videoTrack, encodedData, bufferInfo)
       encoder.releaseOutputBuffer(index, false)
     }
   }

package/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt

@@ -9,6 +9,7 @@ import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
+// import com.facebook.react.turbomodule.core.CallInvokerHolderImpl // Commented out due to RN 0.79+ compatibility
 import com.facebook.react.uimanager.UIManagerHelper
 import com.mrousavy.camera.CameraView
 import com.mrousavy.camera.core.ViewNotFoundError
@@ -77,9 +78,6 @@ class VisionCameraProxy(private val reactContext: ReactApplicationContext) {
     FrameProcessorPluginRegistry.getPlugin(name, this, options)
 
   // private C++ funcs
-  // Frame Processors are disabled - native registration is skipped via VISION_CAMERA_ENABLE_FRAME_PROCESSORS=OFF
+  // Commented out due to React Native 0.79+ API compatibility issues
-  // This method is never called or registered, kept for reference only
+  // private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: CallInvokerHolderImpl, scheduler: VisionCameraScheduler): HybridData
-  // @DoNotStrip
-  // @Keep
-  // private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: Any, scheduler: VisionCameraScheduler): HybridData
 }

package/android/src/main/java/com/mrousavy/camera/utils/withPromise.kt

@@ -11,6 +11,6 @@ inline fun withPromise(promise: Promise, closure: () -> Any?) {
   } catch (e: Throwable) {
     e.printStackTrace()
     val error = if (e is CameraError) e else UnknownCameraError(e)
-    promise.reject("${error.domain}/${error.id}", error.message ?: "Unknown error", error.cause)
+    promise.reject("${error.domain}/${error.id}", error.message, error.cause)
   }
 }