@regulaforensics/face-sdk 7.1.211-rc → 7.1.252-beta

package/README.md

@@ -3,7 +3,7 @@ Face SDK is a framework that is used for face matching, recognition and liveness
 This plugin makes possible to use it with react-native, cordova and ionic applications.
 
 ## Demo applications
-In the [examples](examples/) folder you can find demo 4 applications:
+In the [examples](examples/) folder you can find 4 demo applications:
 * [React-native](examples/react-native)
 * [Cordova](examples/cordova)
 * [Ionic(ionic app with cordova, angular)](examples/ionic)

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '7.1.211-rc'
+  s.version      = '7.1.252-beta'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -13,9 +13,9 @@ Pod::Spec.new do |s|
   s.homepage     = 'https://regulaforensics.com'
 
   s.source       = { http: "file:#{source}" }
-  s.ios.deployment_target = '12.0'
+  s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
-  s.dependency 'FaceSDKStage', '7.1.2581'
+  s.dependency 'FaceSDKStage', '7.1.2586'
   s.dependency 'React'
 end

package/android/CVDFaceSDK.kt

@@ -1,19 +1,27 @@
 package com.regula.plugin.facesdk
 
+import android.content.Context
+import android.util.Log
 import org.apache.cordova.CallbackContext
 import org.apache.cordova.CordovaPlugin
-import org.apache.cordova.CordovaWebView
 import org.apache.cordova.PluginResult
 import org.json.JSONArray
 
-lateinit var args: JSONArray
-lateinit var eventSender: CordovaWebView
 val eventCallbackIds = mutableMapOf<String, String>()
 
+lateinit var args: JSONArray
+lateinit var binding: CordovaPlugin
+val context: Context
+    get() = binding.cordova.context
+
 fun sendEvent(callbackId: String, data: Any? = "") {
-    val pluginResult = PluginResult(PluginResult.Status.OK, data.toSendable() as String?)
+    val pluginResult = when (data) {
+        is Int -> PluginResult(PluginResult.Status.OK, data)
+        is Boolean -> PluginResult(PluginResult.Status.OK, data)
+        else -> PluginResult(PluginResult.Status.OK, data.toSendable() as String?)
+    }
     pluginResult.keepCallback = true
-    eventSender.sendPluginResult(pluginResult, eventCallbackIds[callbackId] ?: callbackId)
+    binding.webView.sendPluginResult(pluginResult, eventCallbackIds[callbackId] ?: callbackId)
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -22,13 +30,19 @@ fun <T> argsNullable(index: Int): T? = if (args.get(index).toString() != "null")
 } else null
 
 class CVDFaceSDK : CordovaPlugin() {
+    init {
+        binding = this
+    }
+
     override fun execute(action: String, arguments: JSONArray, callbackContext: CallbackContext): Boolean {
-        activity = cordova.activity
-        eventSender = webView
         args = arguments
         val method = args.remove(0) as String
         if (method == "setEvent") eventCallbackIds[args(0)] = callbackContext.callbackId
-        methodCall(method) { data: Any? -> sendEvent(callbackContext.callbackId, data) }
+        try {
+            methodCall(method) { data: Any? -> sendEvent(callbackContext.callbackId, data) }
+        } catch (error: Exception) {
+            Log.e("REGULA", "Caught exception in \"$method\" function:", error)
+        }
         return true
     }
 }

package/android/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:7.1.3704'){
+    implementation('com.regula.face:api:6.4.3709'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.face:api:7.1.3704'){
+    implementation('com.regula.face:api:6.4.3709'){
         transitive = true
     }
 }

package/android/src/main/java/com/regula/plugin/facesdk/Config.kt

@@ -1,3 +1,5 @@
+@file:Suppress("EnumValuesSoftDeprecate")
+
 package com.regula.plugin.facesdk
 
 import com.regula.facesdk.configuration.Customization
@@ -20,6 +22,8 @@ fun setFaceCaptureConfig(builder: FaceCaptureConfiguration.Builder, config: JSON
         "closeButtonEnabled" -> builder.setCloseButtonEnabled(v as Boolean)
         "torchButtonEnabled" -> builder.setTorchButtonEnabled(v as Boolean)
         "vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
+        "detectOcclusion" -> builder.setDetectOcclusion(v as Boolean)
+        "showFaceAnimation" -> builder.setShowFaceAnimation(v as Boolean)
         "cameraPositionAndroid" -> builder.setCameraId(v.toInt())
         "screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
         "timeout" -> builder.setTimeout(v.toFloat())
@@ -33,6 +37,8 @@ fun getFaceCaptureConfig(input: FaceCaptureConfiguration) = mapOf(
     "closeButtonEnabled" to input.isCloseButtonEnabled,
     "torchButtonEnabled" to input.isTorchButtonEnabled,
     "vibrateOnSteps" to input.isVibrateOnSteps,
+    "detectOcclusion" to input.isDetectOcclusion,
+    "showFaceAnimation" to input.isShowFaceAnimation,
     "cameraPositionAndroid" to input.cameraId,
     "screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
     "timeout" to input.timeout,
@@ -78,11 +84,13 @@ fun getLivenessConfig(input: LivenessConfiguration) = mapOf(
 fun setMatchFacesConfig(builder: MatchFacesConfiguration.Builder, config: JSONObject) = config.forEach { k, v ->
     when (k) {
         "processingMode" -> builder.setProcessingMode(ProcessingMode.values()[v.toInt()])
+        "locationTrackingEnabled" -> builder.setLocationTrackingEnabled(v as Boolean)
     }
 }
 
 fun getMatchFacesConfig(input: MatchFacesConfiguration) = mapOf(
-    "processingMode" to input.processingMode.ordinal
+    "processingMode" to input.processingMode.ordinal,
+    "locationTrackingEnabled" to input.isLocationTrackingEnabled
 ).toJson()
 
 fun setCustomization(input: Customization, config: JSONObject) = config.forEach { key, value ->

package/android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt

@@ -1,3 +1,5 @@
+@file:Suppress("EnumValuesSoftDeprecate", "unused")
+
 package com.regula.plugin.facesdk
 
 import android.annotation.SuppressLint

package/android/src/main/java/com/regula/plugin/facesdk/Main.kt

@@ -1,9 +1,9 @@
 package com.regula.plugin.facesdk
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import com.regula.plugin.facesdk.Convert.toBase64
 import com.regula.common.LocalizationCallbacks
+import com.regula.common.ble.BLEWrapper
 import com.regula.facesdk.FaceSDK.Instance
 import com.regula.facesdk.callback.DetectFacesCompletion
 import com.regula.facesdk.callback.FaceCaptureCallback
@@ -13,6 +13,7 @@ import com.regula.facesdk.callback.LivenessCallback
 import com.regula.facesdk.callback.LivenessNotificationCallback
 import com.regula.facesdk.callback.MatchFaceCallback
 import com.regula.facesdk.callback.PersonDBCallback
+import com.regula.facesdk.configuration.InitializationBleDeviceConfiguration
 import com.regula.facesdk.listener.NetworkInterceptorListener
 import com.regula.facesdk.model.LivenessNotification
 import com.regula.facesdk.model.results.matchfaces.MatchFacesSimilarityThresholdSplit
@@ -68,11 +69,6 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
 inline fun <reified T> args(index: Int) = argsNullable<T>(index)!!
 typealias Callback = (Any?) -> Unit
 
-@SuppressLint("StaticFieldLeak")
-lateinit var activity: Activity
-val context
-    get() = activity
-
 const val cameraSwitchEvent = "cameraSwitchEvent"
 const val livenessNotificationEvent = "livenessNotificationEvent"
 const val videoEncoderCompletionEvent = "video_encoder_completion"
@@ -98,9 +94,17 @@ fun setCustomization(config: JSONObject) = setCustomization(Instance().customiza
 
 fun isInitialized(callback: Callback) = callback(Instance().isInitialized)
 
-fun initialize(callback: Callback, config: JSONObject?) = config?.let {
-    Instance().initialize(context, initConfigFromJSON(it), initCompletion(callback))
-} ?: Instance().initialize(context, initCompletion(callback))
+@SuppressLint("MissingPermission")
+fun initialize(callback: Callback, config: JSONObject?) =
+    if (config == null)
+        Instance().initialize(context, initCompletion(callback))
+    else if (config.getBooleanOrNull("useBleDevice") != true)
+        Instance().initialize(context, initConfigFromJSON(config), initCompletion(callback))
+    else
+        getBleWrapper()?.let {
+            Instance().initialize(context, InitializationBleDeviceConfiguration(it), initCompletion(callback))
+        } ?: callback(false)
+// TODO return an exception telling that btDevice is not connected
 
 fun deinitialize() = Instance().deinitialize()
 
@@ -136,11 +140,13 @@ fun stopLiveness() = Instance().stopLivenessProcessing(context)
 
 fun matchFaces(callback: Callback, request: JSONObject, config: JSONObject?) = config?.let {
     Instance().matchFaces(
+        context,
         matchFacesRequestFromJSON(request),
         matchFacesConfigFromJSON(it),
         matchFacesCompletion(callback)
     )
 } ?: Instance().matchFaces(
+    context,
     matchFacesRequestFromJSON(request),
     matchFacesCompletion(callback)
 )

package/android/src/main/java/com/regula/plugin/facesdk/RNFaceApiModule.kt

@@ -1,5 +1,7 @@
 package com.regula.plugin.facesdk
 
+import android.content.Context
+import android.util.Log
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -13,13 +15,16 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 var listenerCount = 0
+
 lateinit var args: JSONArray
-lateinit var reactContext: ReactContext
+lateinit var binding: ReactContext
+val context: Context
+    get() = binding.applicationContext
 
 fun sendEvent(event: String, data: Any? = "") {
     if (listenerCount <= 0) return
     val result = if (data is JSONObject || data is JSONArray) data.toString() else data.toString() + ""
-    reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, result)
+    binding.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(event, result)
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -30,15 +35,16 @@ fun <T> argsNullable(index: Int): T? {
     return value as T
 }
 
+@Suppress("unused")
 class RNFaceSDKPackage : ReactPackage {
     override fun createNativeModules(rc: ReactApplicationContext) = listOf(RNFaceSDKModule(rc))
     override fun createViewManagers(rc: ReactApplicationContext) = emptyList<ViewManager<*, *>>()
 }
 
 @Suppress("unused", "UNUSED_PARAMETER")
-class RNFaceSDKModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(rc) {
+class RNFaceSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     init {
-        reactContext = rc
+        binding = reactContext
     }
 
     @ReactMethod
@@ -54,8 +60,12 @@ class RNFaceSDKModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(
     @ReactMethod
     fun exec(method: String, arguments: ReadableArray, promise: Promise) {
         args = JSONArray(arguments.toArrayList())
-        reactContext.currentActivity?.let { activity = it }
-        methodCall(method) { data -> promise.resolve(data.toSendable()) }
+        try {
+            methodCall(method) { data -> promise.resolve(data.toSendable()) }
+        } catch (error: Exception) {
+            Log.e("REGULA", "Caught exception in \"$method\" function:", error)
+        }
     }
+
     override fun getName() = "RNFaceSDK"
 }

package/android/src/main/java/com/regula/plugin/facesdk/Utils.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UNCHECKED_CAST")
+@file:Suppress("UNCHECKED_CAST", "EnumValuesSoftDeprecate", "UseKtx")
 
 package com.regula.plugin.facesdk
 
@@ -10,6 +10,8 @@ import android.graphics.Typeface
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.util.Base64
+import android.util.Log
+import com.regula.common.ble.BLEWrapper
 import com.regula.facesdk.configuration.Customization
 import com.regula.facesdk.enums.CustomizationColor
 import com.regula.facesdk.enums.CustomizationFont
@@ -284,4 +286,32 @@ internal object Convert {
         val height = (bitmap.height * density).toInt()
         BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
     }
-}
+}
+
+fun getBleWrapper(): BLEWrapper? {
+    listOf(
+        "io.flutter.plugins.regula.documentreader.flutter_document_reader_api",
+        "cordova.plugin.documentreader",
+        "com.regula.documentreader"
+    ).forEach { packageName ->
+        getVarFromClass<BLEWrapper>(
+            packageName,
+            "BluetoothUtilKt",
+            "bluetooth"
+        )?.let { return it }
+    }
+    Log.e("REGULA", "Failed to get BLEWrapper from DocumentReader plugin")
+    return null
+}
+
+fun <T> getVarFromClass(packageName: String, className: String, varName: String): T? {
+    try {
+        val targetClass = Class.forName("$packageName.$className")
+        val field = targetClass.getDeclaredField(varName)
+        field.isAccessible = true
+        val result = field.get(null) as BLEWrapper?
+        return result as T?
+    } catch (_: Exception) {
+        return null
+    }
+}

package/examples/capacitor/README.md

@@ -12,18 +12,13 @@
 **Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE.
 
 
-## How to use offine match
+## How to use offline match
 1. Place a license that supports offline match at `public/assets/regula.license`.
 
-2. Change android and iOS bundle id if required by your license(replace `ANDROID_ID` and `IOS_ID` with actual ids):
-  * Change `applicationId` to `ANDROID_ID` in `android/app/build.gradle`.
-  * Change `Bundle Identifier` to `IOS_ID` in `ios/App/App.xcodeproj` in the `Signing & Capabilities` section.
-
-3. Change core with the following commands:
+2. Change core with the following commands:
 ```bash
 npm uninstall @regulaforensics/face-core-basic
 npm install @regulaforensics/face-core-match
-ionic cap sync
 ```
 
-4. Turn off the internet and run the app.
+3. Turn off the internet and run the app.

package/examples/capacitor/android/app/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "com.regula.faceapi"
+    namespace "com.regula.documentreader.api.androidtest"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "com.regula.faceapi"
+        applicationId "com.regula.documentreader.api.androidtest"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
              // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
@@ -36,9 +35,6 @@ dependencies {
     implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
     implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
     implementation project(':capacitor-android')
-    testImplementation "junit:junit:$junitVersion"
-    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
 }
 

package/examples/capacitor/android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 
@@ -13,10 +13,10 @@ dependencies {
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-status-bar')
-
+    implementation "androidx.core:core:1.6.+"
+    implementation "androidx.webkit:webkit:1.4.0"
 }
 
-
 if (hasProperty('postBuildExtras')) {
   postBuildExtras()
 }

package/examples/capacitor/android/app/src/main/AndroidManifest.xml

@@ -3,17 +3,15 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:icon="@drawable/ic_launcher"
+        android:label="FaceSDK"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
         <activity
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
             android:name=".MainActivity"
-            android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
             android:exported="true">
@@ -24,20 +22,9 @@
             </intent-filter>
 
         </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
-        </provider>
     </application>
 
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.NFC" />
 </manifest>

package/examples/capacitor/android/app/src/main/java/com/regula/{faceapi → documentreader}/MainActivity.java

@@ -1,4 +1,4 @@
-package com.regula.faceapi;
+package com.regula.documentreader.api.androidtest;
 
 import com.getcapacitor.BridgeActivity;
 

package/examples/capacitor/android/app/src/main/res/values/strings.xml

@@ -2,6 +2,6 @@
 <resources>
     <string name="app_name">FaceSDK</string>
     <string name="title_activity_main">FaceSDK</string>
-    <string name="package_name">com.regula.faceapi</string>
-    <string name="custom_url_scheme">com.regula.faceapi</string>
+    <string name="package_name">com.regula.documentreader.api.androidtest</string>
+    <string name="custom_url_scheme">com.regula.documentreader.api.androidtest</string>
 </resources>

package/examples/capacitor/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.8.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
 
         // NOTE: Do not place your application dependencies here; they belong

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

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

package/examples/capacitor/android/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +134,13 @@ 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.
@@ -144,7 +148,7 @@ 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
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

package/examples/capacitor/android/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

package/examples/capacitor/android/variables.gradle

@@ -1,16 +1,16 @@
 ext {
     minSdkVersion = 24
-    compileSdkVersion = 34
-    targetSdkVersion = 34
-    androidxActivityVersion = '1.8.2'
-    androidxAppCompatVersion = '1.6.1'
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    androidxActivityVersion = '1.9.2'
+    androidxAppCompatVersion = '1.7.0'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.12.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
+    androidxCoreVersion = '1.15.0'
+    androidxFragmentVersion = '1.8.4'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.12.1'
     junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.5'
-    androidxEspressoCoreVersion = '3.5.1'
-    cordovaAndroidVersion = '12.0.1'
+    androidxJunitVersion = '1.2.1'
+    androidxEspressoCoreVersion = '3.6.1'
+    cordovaAndroidVersion = '13.0.0'
 }