chore: Upgrade all packages

.github/workflows/build-android.yml

@@ -30,11 +30,11 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
- - name: Setup JDK 11
- uses: actions/setup-java@v2
+ - name: Setup JDK 17
+ uses: actions/setup-java@v4
  with:
  distribution: 'zulu'
- java-version: 11
+ java-version: '17'
  java-package: jdk
 
  - name: Get yarn cache directory path
@@ -74,11 +74,11 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
- - name: Setup JDK 11
- uses: actions/setup-java@v2
+ - name: Setup JDK 17
+ uses: actions/setup-java@v4
  with:
  distribution: 'zulu'
- java-version: 11
+ java-version: '17'
  java-package: jdk
 
  - name: Get yarn cache directory path

package/.eslintrc.js

@@ -2,6 +2,7 @@ module.exports = {
  root: true,
  parser: '@typescript-eslint/parser',
  parserOptions: {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
  tsconfigRootDir: __dirname,
  project: ['./tsconfig.json'],
  ecmaFeatures: {
@@ -10,7 +11,7 @@ module.exports = {
  ecmaVersion: 2018,
  sourceType: 'module',
  },
- ignorePatterns: ['scripts', 'lib', 'docs', 'example', 'app.plugin.js'],
+ ignorePatterns: ['scripts', 'lib', 'docs', 'example', 'app.plugin.js', 'react-native.config.js'],
  plugins: ['@typescript-eslint'],
  extends: ['plugin:@typescript-eslint/recommended', '@react-native'],
  rules: {

package/android/build.gradle

@@ -5,8 +5,6 @@ def agpVersion = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toIntege
 def androidManifestPath = agpVersion >= 7 ? 'src/main/AndroidManifest.xml' : 'src/hasNamespace/AndroidManifest.xml'
 
 buildscript {
- def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["VisionCamera_kotlinVersion"]
-
  repositories {
  maven {
  url "https://plugins.gradle.org/m2/"
@@ -16,8 +14,8 @@ buildscript {
  }
 
  dependencies {
- classpath "com.android.tools.build:gradle:7.4.2"
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath "com.android.tools.build:gradle:7.3.1"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
  }
 }
 
@@ -40,7 +38,7 @@ if (isNewArchitectureEnabled()) {
  apply plugin: "com.facebook.react"
 }
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+apply plugin: "org.jetbrains.kotlin.android"
 
 def safeExtGet(prop, fallback) {
  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -56,6 +54,7 @@ static def findNodeModules(baseDir) {
  // Node"s module resolution algorithm searches up to the root directory,
  // after which the base path will be null
  while (basePath) {
+ println "Traversing ${basePath.toString()}..."
  def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
  def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
  if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
@@ -96,8 +95,8 @@ android {
 
  defaultConfig {
  minSdkVersion safeExtGet("minSdkVersion", 26)
- compileSdkVersion safeExtGet("compileSdkVersion", 33)
- targetSdkVersion safeExtGet("targetSdkVersion", 33)
+ compileSdkVersion safeExtGet("compileSdkVersion", 34)
+ targetSdkVersion safeExtGet("targetSdkVersion", 34)
  versionCode 1
  versionName "1.0"
  buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

package/android/gradle.properties

@@ -4,7 +4,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xms512M -Xmx4g -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1g -Dkotlin.daemon.jvm.options="-Xmx1g"
+org.gradle.jvmargs=-Xms512M -Xmx4g -XX:MaxMetaspaceSize=1g -Dkotlin.daemon.jvm.options="-Xmx1g"
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true

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

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
  esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 # shell script including quotes and variable substitutions, so put them in
@@ -205,6 +214,12 @@ set -- \
  org.gradle.wrapper.GradleWrapperMain \
  "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

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

@@ -71,8 +71,6 @@ class CameraDevicesManager(private val reactContext: ReactApplicationContext) :
  eventEmitter.emit("CameraDevicesChanged", getDevicesJson())
  }
 
- override fun hasConstants(): Boolean = true
-
  override fun getConstants(): MutableMap<String, Any?> {
  val devices = getDevicesJson()
  val preferredDevice = if (devices.size() > 0) devices.getMap(0) else null

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

@@ -35,7 +35,8 @@ class VisionCameraProxy(context: ReactApplicationContext) {
 
  init {
  val jsCallInvokerHolder = context.catalystInstance.jsCallInvokerHolder as CallInvokerHolderImpl
- val jsRuntimeHolder = context.javaScriptContextHolder.get()
+ val jsRuntimeHolder =
+ context.javaScriptContextHolder?.get() ?: throw Error("JSI Runtime is null! VisionCamera does not yet support bridgeless mode..")
  mScheduler = VisionCameraScheduler()
  mContext = WeakReference(context)
  mHybridData = initHybrid(jsRuntimeHolder, jsCallInvokerHolder, mScheduler)

package/example/android/app/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
-apply plugin: "kotlin-android"
 
 import com.android.build.OutputFile
 
@@ -97,6 +97,7 @@ def reactNativeArchitectures() {
 
 android {
  ndkVersion rootProject.ext.ndkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
  compileSdkVersion rootProject.ext.compileSdkVersion
 
  namespace "com.mrousavy.camera.example"

package/example/android/app/src/debug/AndroidManifest.xml

@@ -4,7 +4,5 @@
 
  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
- <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
- <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
- </application>
+ <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

package/example/android/app/src/main/java/com/mrousavy/camera/example/MainActivity.kt

@@ -0,0 +1,22 @@
+package com.mrousavy.camera.example
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+ /**
+ * Returns the name of the main component registered from JavaScript. This is used to schedule
+ * rendering of the component.
+ */
+ override fun getMainComponentName(): String = "VisionCameraExample"
+
+ /**
+ * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+ * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+ */
+ override fun createReactActivityDelegate(): ReactActivityDelegate =
+ DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}