Bumps and fixes for react native version bump

Gross hack to make things sort of work
WIP
2025-08-12 15:36:55 -06:00 · 2024-11-10 17:51:15 -07:00 · 2024-11-09 19:52:05 -07:00
14 changed files with 2551 additions and 3192 deletions
--- a/package/.envrc
+++ b/package/.envrc
@ -1,5 +0,0 @@
-use flake . --impure
-
-if [ -f .envrc.local ]; then
-    source .envrc.local
-fi
--- a/package/android/CMakeLists.txt
+++ b/package/android/CMakeLists.txt
@ -63,7 +63,7 @@ target_link_libraries(
        ${LOG_LIB}                          # <-- Logcat logger
        android                             # <-- Android JNI core
        ReactAndroid::jsi                   # <-- RN: JSI
-        ReactAndroid::reactnativejni        # <-- RN: React Native JNI bindings
+        # ReactAndroid::reactnativejni      # <-- Temporarily disabled for RN 0.79+ compatibility
        fbjni::fbjni                        # <-- fbjni
        GLESv2                              # <-- OpenGL (for VideoPipeline)
        EGL                                 # <-- OpenGL (EGL) (for VideoPipeline)
--- a/package/android/src/main/java/com/mrousavy/camera/CameraView+TakePhoto.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/CameraView+TakePhoto.kt
@ -13,69 +13,36 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.mrousavy.camera.core.CameraSession
 import com.mrousavy.camera.core.InsufficientStorageError
+import com.mrousavy.camera.utils.FileUtils
 import com.mrousavy.camera.types.Flash
-import com.mrousavy.camera.types.QualityPrioritization
 import com.mrousavy.camera.utils.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import kotlinx.coroutines.*

-private const val TAG = "CameraView.takePhoto"
+private const val TAG = "CameraView.takeSnapshot"

@SuppressLint("UnsafeOptInUsageError")
 suspend fun CameraView.takePhoto(optionsMap: ReadableMap): WritableMap {
  val options = optionsMap.toHashMap()
-  Log.i(TAG, "Taking photo... Options: $options")
+  Log.i(TAG, "Taking snapshot... Options: $options")
+  val bitmap = previewView.getBitmap() ?: throw Error()

-  val qualityPrioritization = options["qualityPrioritization"] as? String ?: "balanced"
-  val flash = options["flash"] as? String ?: "off"
-  val enableAutoStabilization = options["enableAutoStabilization"] == true
-  val enableShutterSound = options["enableShutterSound"] as? Boolean ?: true
-  val enablePrecapture = options["enablePrecapture"] as? Boolean ?: false
+  val file = FileUtils.createTempFile(context, "png");

-  // TODO: Implement Red Eye Reduction
-  options["enableAutoRedEyeReduction"]
+  // Write snapshot to .jpg file
+  FileUtils.writeBitmapTofile(bitmap, file, 100)

-  val flashMode = Flash.fromUnionValue(flash)
-  val qualityPrioritizationMode = QualityPrioritization.fromUnionValue(qualityPrioritization)
+  Log.i(TAG, "Successfully saved snapshot to file!")

-  val photo = cameraSession.takePhoto(
-    qualityPrioritizationMode,
-    flashMode,
-    enableShutterSound,
-    enableAutoStabilization,
-    enablePrecapture,
-    orientation
-  )
-
-  photo.use {
-    Log.i(TAG, "Successfully captured ${photo.image.width} x ${photo.image.height} photo!")
-
-    val cameraCharacteristics = cameraManager.getCameraCharacteristics(cameraId!!)
-
-    val path = try {
-      savePhotoToFile(context, cameraCharacteristics, photo)
-    } catch (e: IOException) {
-      if (e.message?.contains("no space left", true) == true) {
-        throw InsufficientStorageError()
-      } else {
-        throw e
-      }
-    }
-
-    Log.i(TAG, "Successfully saved photo to file! $path")
-
-    val map = Arguments.createMap()
-    map.putString("path", path)
-    map.putInt("width", photo.image.width)
-    map.putInt("height", photo.image.height)
-    map.putString("orientation", photo.orientation.unionValue)
-    map.putBoolean("isRawPhoto", photo.format == ImageFormat.RAW_SENSOR)
-    map.putBoolean("isMirrored", photo.isMirrored)
-
-    return map
-  }
+  // Parse output data
+  val map = Arguments.createMap()
+  map.putString("path", file.absolutePath)
+  map.putInt("width", bitmap.width)
+  map.putInt("height", bitmap.height)
+  map.putBoolean("isMirrored", false)
+  return map
 }

 private fun writePhotoToFile(photo: CameraSession.CapturedPhoto, file: File) {
--- a/package/android/src/main/java/com/mrousavy/camera/CameraView.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/CameraView.kt
@ -102,7 +102,7 @@ class CameraView(context: Context) :

  // session
  internal val cameraSession: CameraSession
-  private val previewView: PreviewView
+  val previewView: PreviewView
  private var currentConfigureCall: Long = System.currentTimeMillis()
  internal var frameProcessor: FrameProcessor? = null

--- a/package/android/src/main/java/com/mrousavy/camera/core/PreviewView.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/PreviewView.kt
@ -1,11 +1,14 @@
 package com.mrousavy.camera.core

 import android.annotation.SuppressLint
-import android.content.res.Configuration
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Point
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.util.Size
+import android.view.PixelCopy
 import android.view.SurfaceHolder
 import android.view.SurfaceView
 import com.facebook.react.bridge.UiThreadUtil
@ -13,9 +16,69 @@ import com.mrousavy.camera.extensions.resize
 import com.mrousavy.camera.extensions.rotatedBy
 import com.mrousavy.camera.types.Orientation
 import com.mrousavy.camera.types.ResizeMode
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlin.math.roundToInt
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
+import android.graphics.Bitmap
+import android.graphics.Matrix
+
+fun rotateBitmap90CounterClockwise(source: Bitmap): Bitmap {
+    val width = source.width
+    val height = source.height
+
+    // Create a new Bitmap with swapped width and height
+    val rotatedBitmap = Bitmap.createBitmap(height, width, source.config ?: Bitmap.Config.ARGB_8888)
+
+    for (y in 0 until height) {
+        for (x in 0 until width) {
+            // Set the pixel in the new position
+            rotatedBitmap.setPixel(y, width - 1 - x, source.getPixel(x, y))
+        }
+    }
+
+    return rotatedBitmap
+}
+
+
+fun Bitmap.transformBitmap(orientation: Orientation): Bitmap {
+    return when (orientation) {
+        Orientation.PORTRAIT -> this // No transformation needed
+        Orientation.LANDSCAPE_LEFT -> {
+            // Transpose (swap width and height)
+            val transposedBitmap = Bitmap.createBitmap(height, width, config ?: Bitmap.Config.ARGB_8888)
+            for (y in 0 until height) {
+                for (x in 0 until width) {
+                    transposedBitmap.setPixel(y, width - 1 - x, getPixel(x, y))
+                }
+            }
+            transposedBitmap
+        }
+        Orientation.PORTRAIT_UPSIDE_DOWN -> {
+            // Invert vertically and horizontally (180-degree rotation)
+            val invertedBitmap = Bitmap.createBitmap(width, height, config ?: Bitmap.Config.ARGB_8888)
+            for (y in 0 until height) {
+                for (x in 0 until width) {
+                    invertedBitmap.setPixel(width - 1 - x, height - 1 - y, getPixel(x, y))
+                }
+            }
+            invertedBitmap
+        }
+        Orientation.LANDSCAPE_RIGHT -> {
+            // Transpose (swap width and height) and invert vertically
+            val transposedBitmap = Bitmap.createBitmap(height, width, config ?: Bitmap.Config.ARGB_8888)
+            for (y in 0 until height) {
+                for (x in 0 until width) {
+                    transposedBitmap.setPixel(height - 1 - y, x, getPixel(x, y))
+                }
+            }
+            transposedBitmap
+        }
+    }
+}
+

@SuppressLint("ViewConstructor")
 class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
@ -81,6 +144,34 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
    }
  }

+  suspend fun getBitmap(): Bitmap? = withContext(Dispatchers.Main) {
+    val frame = holder.getSurfaceFrame()
+
+    val width = frame.width()
+    val height = frame.height()
+
+    val bitmap = Bitmap.createBitmap(height, width, Bitmap.Config.ARGB_8888)
+
+    // Use a coroutine to suspend until the PixelCopy request is complete
+    suspendCancellableCoroutine<Bitmap?> { continuation ->
+    PixelCopy.request(
+        holder.surface,
+        bitmap,
+        { copyResult ->
+          if (copyResult == PixelCopy.SUCCESS) {
+            continuation.resume(rotateBitmap90CounterClockwise(bitmap))
+          } else {
+            continuation.resumeWithException(
+                RuntimeException("PixelCopy failed with error code $copyResult")
+            )
+          }
+        },
+        Handler(Looper.getMainLooper())
+    )
+    }
+  }
+
+
  fun convertLayerPointToCameraCoordinates(point: Point, cameraDeviceDetails: CameraDeviceDetails): Point {
    val sensorOrientation = cameraDeviceDetails.sensorOrientation
    val cameraSize = Size(cameraDeviceDetails.activeSize.width(), cameraDeviceDetails.activeSize.height())
--- a/package/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.mrousavy.camera.frameprocessor

 import android.util.Log
@ -7,7 +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
+// 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
@ -21,19 +23,26 @@ class VisionCameraProxy(private val reactContext: ReactApplicationContext) {

  @DoNotStrip
  @Keep
-  private var mHybridData: HybridData
+  private var mHybridData: HybridData?
  private var mContext: WeakReference<ReactApplicationContext>
  private var mScheduler: VisionCameraScheduler
  val context: ReactApplicationContext
    get() = reactContext

  init {
-    val jsCallInvokerHolder = context.catalystInstance.jsCallInvokerHolder as CallInvokerHolderImpl
-    val jsRuntimeHolder =
-      context.javaScriptContextHolder?.get() ?: throw Error("JSI Runtime is null! VisionCamera does not yet support bridgeless mode..")
+    // TODO: Fix for React Native 0.79+ - these APIs are now framework-only
+    // Since Frame Processors are disabled anyway (react-native-worklets-core not found),
+    // we'll disable this functionality to allow the build to complete
+    Log.w(TAG, "Frame Processor initialization disabled due to React Native 0.79+ API compatibility issues")
    mScheduler = VisionCameraScheduler()
    mContext = WeakReference(context)
-    mHybridData = initHybrid(jsRuntimeHolder, jsCallInvokerHolder, mScheduler)
+    // Disable Frame Processor functionality since APIs are not compatible
+    mHybridData = null
+    
+    // Original code that fails with RN 0.79+:
+    // val jsCallInvokerHolder = context.catalystInstance.jsCallInvokerHolder as CallInvokerHolderImpl
+    // val jsRuntimeHolder = context.javaScriptContextHolder?.get() ?: throw Error("JSI Runtime is null!")
+    // mHybridData = initHybrid(jsRuntimeHolder, jsCallInvokerHolder, mScheduler)
  }

  @UiThread
@ -69,5 +78,6 @@ class VisionCameraProxy(private val reactContext: ReactApplicationContext) {
    FrameProcessorPluginRegistry.getPlugin(name, this, options)

  // private C++ funcs
-  private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: CallInvokerHolderImpl, scheduler: VisionCameraScheduler): HybridData
+  // Commented out due to React Native 0.79+ API compatibility issues
+  // private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: CallInvokerHolderImpl, scheduler: VisionCameraScheduler): HybridData
 }
--- a/package/android/src/main/java/com/mrousavy/camera/utils/FileUtils.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/utils/FileUtils.kt
@ -1,13 +1,33 @@
 package com.mrousavy.camera.utils

 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Size
 import java.io.File
+import java.io.FileOutputStream

 class FileUtils {
  companion object {
-    fun createTempFile(context: Context, extension: String): File =
-      File.createTempFile("mrousavy", extension, context.cacheDir).also {
-        it.deleteOnExit()
+    fun writeBitmapTofile(bitmap: Bitmap, file: File, quality: Int) {
+      FileOutputStream(file).use { stream ->
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 50, stream)
      }
+    }
+
+    fun getImageSize(imagePath: String): Size {
+      val bitmapOptions = BitmapFactory.Options().also {
+        it.inJustDecodeBounds = true
+      }
+      BitmapFactory.decodeFile(imagePath, bitmapOptions)
+      val width = bitmapOptions.outWidth
+      val height = bitmapOptions.outHeight
+      return Size(width, height)
+    }
+
+    fun createTempFile(context: Context, extension: String): File =
+        File.createTempFile("mrousavy", extension, context.cacheDir).also {
+      it.deleteOnExit()
+    }
  }
 }
--- a/package/example/package.json
+++ b/package/example/package.json
@ -17,8 +17,8 @@
    "@react-native-community/blur": "^4.3.2",
    "@react-navigation/native": "^6.1.7",
    "@react-navigation/native-stack": "^6.9.13",
-    "react": "^18.2.0",
-    "react-native": "^0.72.3",
+    "react": "^19.1.1",
+    "react-native": "^0.81.0",
    "react-native-fast-image": "^8.6.3",
    "react-native-gesture-handler": "^2.12.1",
    "react-native-mmkv": "^2.10.2",
@ -42,7 +42,7 @@
    "@types/react-native-vector-icons": "^6.4.13",
    "@types/react-native-video": "^5.0.15",
    "babel-plugin-module-resolver": "^5.0.0",
-    "eslint": "^8.46.0",
+    "eslint": "^9.33.0",
    "eslint-plugin-prettier": "^5.0.0",
    "metro-react-native-babel-preset": "^0.77.0",
    "prettier": "^3.2.4",
--- a/package/example/src/capture-button.tsx
+++ b/package/example/src/capture-button.tsx
@ -47,7 +47,7 @@ export const RecordingButton: React.FC<RecordingButtonProps> = ({ style, camera,
          onMediaCaptured(video, 'video')
          onStoppedRecording()
        },
-      })
+      }, 'video.mp4')
      console.log('called startRecording()!')
      isRecording.current = true
      setRecordingState(true)
@ -93,4 +93,4 @@ const styles = StyleSheet.create({
  },
 })

-export default RecordingButton
+export default RecordingButton
--- a/package/example/yarn.lock
+++ b/package/example/yarn.lock
--- a/package/flake.lock
+++ b/package/flake.lock
@ -1,189 +0,0 @@
-{
-  "nodes": {
-    "android-nixpkgs": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1701980274,
-        "narHash": "sha256-uKJIFvsahbWw52TsIht7g2iosXBgJDRMSMoCE1fvEAk=",
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "rev": "bce9d437ed54ee1425b66442a12814fee4cdbd51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "type": "github"
-      }
-    },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "android-nixpkgs",
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1701787589,
-        "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1694102001,
-        "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1701718080,
-        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1702312524,
-        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "android-nixpkgs": "android-nixpkgs",
-        "flake-utils": "flake-utils_2",
-        "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/package/flake.nix
+++ b/package/flake.nix
@ -1,77 +0,0 @@
-{
-  description = "Sample Nix ts-node build";
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-    gitignore = {
-      url = "github:hercules-ci/gitignore.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    android-nixpkgs = {
-      url = "github:tadfisher/android-nixpkgs";
-    };
-  };
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-    gitignore,
-    android-nixpkgs,
-    ...
-  }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {inherit system;};
-      nodejs = pkgs.nodejs-18_x;
-      # NOTE: this does not work
-      appBuild = pkgs.stdenv.mkDerivation {
-        name = "example-ts-node";
-        version = "0.1.0";
-        src = gitignore.lib.gitignoreSource ./.; # uses the gitignore in the repo to only copy files git would see
-        buildInputs = [nodejs];
-        # https://nixos.org/manual/nixpkgs/stable/#sec-stdenv-phases
-        buildPhase = ''
-          # each phase has pre/postHooks. When you make your own phase be sure to still call the hooks
-          runHook preBuild
-          npm ci
-          npm run build
-          runHook postBuild
-        '';
-        installPhase = ''
-          runHook preInstall
-          cp -r node_modules $out/node_modules
-          cp package.json $out/package.json
-          cp -r dist $out/dist
-          runHook postInstall
-        '';
-      };
-      android-sdk = android-nixpkgs.sdk.${system} (sdkPkgs:
-        with sdkPkgs; [
-          cmdline-tools-latest
-          build-tools-30-0-3
-          build-tools-33-0-0
-          build-tools-33-0-1
-          build-tools-34-0-0
-          platform-tools
-          platforms-android-33
-          platforms-android-34
-          emulator
-          ndk-23-1-7779620
-          cmake-3-22-1
-          system-images-android-33-google-apis-x86-64
-          system-images-android-34-google-apis-x86-64
-        ]);
-    in
-      with pkgs; {
-        defaultPackage = appBuild;
-        devShell = mkShell {
-          buildInputs = [nodejs yarn watchman gradle_7 alejandra nodePackages.prettier ktlint kotlin-language-server];
-          ANDROID_SDK_BIN = android-sdk;
-          shellHook = ''
-            export JAVA_HOME=${pkgs.jdk17.home}
-            source ${android-sdk.out}/nix-support/setup-hook
-            export PATH=${android-sdk}/bin:$PATH
-            ORG_GRADLE_PROJECT_ANDROID_HOME="$ANDROID_HOME"
-          '';
-        };
-      });
-}
--- a/package/package.json
+++ b/package/package.json
@ -87,16 +87,15 @@
  "devDependencies": {
    "@expo/config-plugins": "^7.2.5",
    "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
-    "@react-native/eslint-config": "^0.72.2",
-    "@react-native/typescript-config": "^0.74.0",
+    "@react-native/eslint-config": "^0.81.0",
+    "@react-native/typescript-config": "^0.81.0",
    "@release-it/conventional-changelog": "^7.0.0",
    "@types/react": "^18.2.19",
-    "@types/react-native": "^0.72.2",
    "eslint": "^8.46.0",
    "eslint-plugin-prettier": "^5.0.0",
    "prettier": "^3.0.1",
-    "react": "^18.2.0",
-    "react-native": "^0.72.3",
+    "react": "^19.1.1",
+    "react-native": "^0.81.0",
    "react-native-builder-bob": "^0.21.3",
    "react-native-worklets-core": "^0.3.0",
    "release-it": "^16.1.3",
--- a/package/yarn.lock
+++ b/package/yarn.lock
Author	SHA1	Message	Date
Ivan Malison	ac06fa5f56	Bumps and fixes for react native version bump	2025-08-12 15:36:55 -06:00
Ivan Malison	5b52acda26	Gross hack to make things sort of work	2024-11-10 17:51:15 -07:00
Ivan Malison	17f675657e	WIP	2024-11-09 19:52:05 -07:00