@smileid/usesmileid_mlkit_face 12.0.2 → 12.1.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+Full release notes: [Smile ID docs](https://docs.usesmileid.com/developer-resources/sdks/mobile/release-notes/react-native-expo).
+
+## 12.1.0
+
+See the repository CHANGELOG for the 12.1.0 release notes.
+
+
 ## 12.0.2
 
 See the repository CHANGELOG for the 12.0.2 release notes.

package/README.md

@@ -30,15 +30,15 @@ package to `expo.plugins` in `app.json` and run `npx expo prebuild --clean`:
     "plugins": [
       [
         "@smileid/usesmileid_mlkit_face",
-        { "additionalModelDependencies": ["barcode_ui"] }
+        { "kspVersion": "2.3.6", "additionalModelDependencies": ["barcode_ui"] }
       ]
     ]
   }
 }
 ```
 
-The plugin pins `compileSdk`, the Kotlin/KSP versions the AAR was compiled with,
-and the `androidx.core` version that resolves under Expo's Android Gradle Plugin.
+The plugin pins the Kotlin the AAR was compiled with (2.3.20) and the
+`androidx.core` version that resolves under Expo's Android Gradle Plugin.
 It also claims the `com.google.mlkit.vision.DEPENDENCIES` meta-data on your
 `<application>` with `tools:replace`: this AAR declares that key as `face`, so
 without the override a second ML Kit consumer declaring its own value (for
@@ -47,6 +47,10 @@ Android manifest merger. `additionalModelDependencies` is optional — name the
 hints your other consumers declare so their models are prefetched at install
 time rather than downloaded on first use.
 
+Expo's own KSP lookup carries no entry for that Kotlin and falls back to a KSP
+the compiler cannot load, so pass `kspVersion` as shown — the samples use
+`2.3.6`. `kotlinVersion` overrides the Kotlin pin.
+
 ## Usage
 
 ```ts

package/android/build.gradle

@@ -17,7 +17,7 @@ plugins {
 }
 
 group = 'com.usesmileid.mlkit.face'
-version = '12.0.2'
+version = '12.1.0'
 
 android {
   namespace 'com.usesmileid.mlkit.face'
@@ -29,7 +29,7 @@ android {
   // android/build.gradle and the rest of the @expo/* modules.
   defaultConfig {
     versionCode 1
-    versionName '12.0.2'
+    versionName '12.1.0'
     // R8 keep-rules to bundle into partner apps that depend on this
     // module. Without these, R8 may rename the Expo module entry
     // point and the JS-bridged member functions, breaking autolinking.
@@ -38,26 +38,26 @@ android {
 }
 
 dependencies {
+  // kamera native core: the analyzer executor takes analysis frames from
+  // kamera's KameraFrameHub so pixels never cross the JS bridge. Resolves from
+  // Maven Central; a local publishToMavenLocal build wins (see kamera.md).
+  implementation 'com.usesmileid:kamera:1.0.5'
+
   // Existing Smile ID native AAR — the entire ML pipeline lives here.
   // This Expo Module is a thin Kotlin shim that constructs the
   // session and bridges its four methods to JS via Expo Modules.
-  implementation 'com.usesmileid:mlkit-face:12.0.2'
-
-  // VisionCamera frame-processor plugin classes. The host app provides
-  // this dependency via RN autolinking — react-native-vision-camera >= 4.7.3
-  // must be present in the partner app's package.json.
-  implementation project(':react-native-vision-camera')
-
-  // CameraX types (`ImageProxy`, `ExperimentalGetImage`) referenced by the
-  // frame processor plugin. VisionCamera declares camera-core as
-  // `implementation`, so it is NOT on this module's compile classpath
-  // transitively — compileOnly pins the compile-time API while the host
-  // app's VisionCamera provides the runtime classes (its camera-core is
-  // 1.5.0-alpha03; the `ImageProxy` surface used here is stable since 1.0).
-  compileOnly 'androidx.camera:camera-core:1.5.0-alpha03'
-
-  // `FaceDetectorAnalyzer()` takes a defaulted `FaceDetector` argument, so the compiler
-  // needs that type to emit the call. The AAR above declares ML Kit at runtime
-  // scope only — enough to execute, not to compile against.
-  compileOnly 'com.google.android.gms:play-services-mlkit-face-detection:17.1.0'
+  implementation 'com.usesmileid:mlkit-face:12.1.0'
+
+
+}
+
+// kamera resolves from Maven Central. mavenLocal stays injected — content-filtered to
+// com.usesmileid — the same way kamera's own glue does it, so a locally published kamera
+// build takes precedence during the kamera dev loop without host apps editing repos.
+rootProject.allprojects {
+  repositories {
+    mavenLocal {
+      content { includeGroup 'com.usesmileid' }
+    }
+  }
 }

package/android/src/main/java/com/usesmileid/mlkit/face/UseSmileIDMlkitFaceKameraAnalysisTick.kt

@@ -0,0 +1,42 @@
+package com.usesmileid.mlkit.face
+
+import com.usesmileid.bridge.model.YuvFrame as NativeYuvFrame
+import com.usesmileid.kamera.integration.KameraFrameHub
+import com.usesmileid.rn.analyzer.mlkitface.toNativeYuvFrame
+import kotlin.coroutines.cancellation.CancellationException
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+
+/**
+ * Scans the latest [KameraFrameHub] frame natively; no pending frame returns the `no_frame` wire error.
+ * The frame's rotationDegrees already uprights the buffer to the locked interface axis.
+ */
+internal fun analyzeKameraFrameTick(arguments: Map<String, Any?>?): Any {
+    val frame = KameraFrameHub.take() ?: return mapOf("error" to "no_frame")
+    val yuvFrame = try {
+        frame.toNativeYuvFrame()
+    } finally {
+        // Closing releases the frame to the pipeline; the converted copy owns its own bytes.
+        frame.close()
+    }
+
+    // Device-tilt context (0 = upright portrait) for the validators.
+    val jsRotation = (arguments?.get("rotation") as? Number)?.toInt() ?: 0
+
+    return runBlocking {
+        withContext(UseSmileIDMlkitFaceSessionHolder.sessionDispatcher) {
+            val activeSession = UseSmileIDMlkitFaceSessionHolder.session
+                ?: return@withContext mapOf("error" to "session_not_configured")
+
+            try {
+                val scanResult = activeSession.scan(yuvFrame, jsRotation)
+                val events = activeSession.drainCaptureReadyEvents()
+                UseSmileIDMlkitFaceModule.buildWireResult(scanResult, events)
+            } catch (cancellation: CancellationException) {
+                throw cancellation
+            } catch (e: Exception) {
+                mapOf("error" to ("scan_failed: " + (e.message ?: e.javaClass.simpleName)))
+            }
+        }
+    }
+}

package/android/src/main/java/com/usesmileid/mlkit/face/UseSmileIDMlkitFaceModule.kt

@@ -14,7 +14,6 @@ import com.usesmileid.bridge.session.UseSmileIDFaceSession
 import com.usesmileid.bridge.session.UseSmileIDScanState
 import com.usesmileid.bridge.session.UseSmileIDScanStateType
 import com.usesmileid.bridge.storage.FrameStorage
-import com.mrousavy.camera.frameprocessors.FrameProcessorPluginRegistry
 import com.usesmileid.rn.analyzer.mlkitface.UseSmileIDAnalyzerExecutor
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.modules.Module
@@ -31,10 +30,7 @@ import expo.modules.kotlin.modules.ModuleDefinition
  * subclass hooks (session construction, wire conversion) and forwards
  * the async functions through it.
  *
- * Per-frame work is handled by [UseSmileIDMlkitFaceFrameProcessorPlugin],
- * which is registered with VisionCamera's frame-processor runtime in
- * [OnCreate]. Partners call `VisionCameraProxy.initFrameProcessorPlugin`
- * from their JS worklet instead of the old `AsyncFunction("analyze")`.
+ * Frames reach `analyzeKameraFrame` through kamera's native hub; pixels never cross the JS bridge.
  *
  * Lifecycle: Expo instantiates exactly one `Module` per app process;
  * the executor is owned for the module's lifetime.
@@ -118,20 +114,17 @@ class UseSmileIDMlkitFaceModule : Module() {
                 ?: throw IllegalStateException("Module not attached to a React context")
             executor.onAttach(ctx)
 
-            // Guard against duplicate registration on dev-client hot reloads
-            // where OnCreate can fire more than once in the same process.
-            if (!pluginRegistered) {
-                pluginRegistered = true
-                FrameProcessorPluginRegistry.addFrameProcessorPlugin(
-                    FRAME_PROCESSOR_PLUGIN_NAME,
-                ) { _, _ -> UseSmileIDMlkitFaceFrameProcessorPlugin() }
-            }
         }
 
         AsyncFunction("configure") { config: Map<String, Any?> ->
             executor.handleConfigure(config)
         }
 
+        AsyncFunction("analyzeKameraFrame") { arguments: Map<String, Any?>? ->
+            // Blocks this module's async queue so only one scan is in flight at a time.
+            analyzeKameraFrameTick(arguments)
+        }
+
         AsyncFunction("reset") {
             executor.handleReset()
         }
@@ -158,21 +151,6 @@ class UseSmileIDMlkitFaceModule : Module() {
         /** Wire-format key partners pass via `FaceConfig.analyzerFactoryKey`. */
         const val KEY: String = "mlkit-face"
 
-        /**
-         * Must match the JS worklet's `VisionCameraProxy.initFrameProcessorPlugin(...)`
-         * call exactly — drift is a runtime "plugin not found" error.
-         */
-        const val FRAME_PROCESSOR_PLUGIN_NAME: String = "UseSmileIDMlkitFaceFrameProcessor"
-
-        /**
-         * [FrameProcessorPluginRegistry.addFrameProcessorPlugin] asserts uniqueness
-         * and crashes on duplicate registration; this guard prevents that on dev-client
-         * hot reloads where [OnCreate] fires more than once per process.
-         */
-        @Volatile
-        private var pluginRegistered: Boolean = false
-
-        /** Wire-result builder shared with [UseSmileIDMlkitFaceFrameProcessorPlugin]. */
         internal fun buildWireResult(
             scanResult: UseSmileIDFaceScanResult,
             events: List<NativeCaptureReadyEvent>,

package/android/src/main/java/com/usesmileid/mlkit/face/UseSmileIDMlkitFaceSessionHolder.kt

@@ -10,9 +10,8 @@ import kotlinx.coroutines.asCoroutineDispatcher
  *
  * The session's state machine is not thread-safe; all operations —
  * scan+drain as one atomic unit, flush, reset, close — are serialized
- * through [sessionDispatcher] (a single-thread executor). The FP plugin
- * blocks its thread via [runBlocking]; VisionCamera drops frames that
- * arrive while a scan is in flight rather than queuing them.
+ * through [sessionDispatcher] (a single-thread executor). The analysis tick blocks its
+ * caller via [runBlocking]; kamera's hub keeps only the latest frame, so frames never queue.
  */
 internal object UseSmileIDMlkitFaceSessionHolder {
 

package/android/src/main/java/com/usesmileid/rn/analyzer/mlkitface/UseSmileIDAnalyzerExecutor.kt

@@ -12,6 +12,8 @@ import com.usesmileid.bridge.model.CaptureType
 import com.usesmileid.bridge.model.YuvFrame as NativeYuvFrame
 import com.usesmileid.bridge.storage.DocumentSide
 import com.usesmileid.bridge.storage.FrameStorage
+import com.usesmileid.kamera.frame.KameraFrame
+import com.usesmileid.kamera.integration.KameraFrameHub
 import java.io.File
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -171,6 +173,7 @@ abstract class UseSmileIDAnalyzerExecutor<
 
     // Shared implementation behind the Expo Module's async functions -----
 
+
     /**
      * Implementation behind `configure`. Closes any prior session,
      * allocates a fresh on-disk session directory, and delegates session
@@ -281,3 +284,28 @@ abstract class UseSmileIDAnalyzerExecutor<
         return dir
     }
 }
+
+/** Copies the YUV planes so the frame can close at once; rotation stays metadata for the detector. */
+internal fun KameraFrame.toNativeYuvFrame(): NativeYuvFrame {
+    val yPlane = planes[0]
+    val uPlane = planes[1]
+    val vPlane = planes[2]
+    fun copyBytes(buffer: java.nio.ByteBuffer): ByteArray {
+        val source = buffer.duplicate()
+        source.rewind()
+        return ByteArray(source.remaining()).also { source.get(it) }
+    }
+    return NativeYuvFrame(
+        planeY = copyBytes(yPlane.buffer),
+        planeU = copyBytes(uPlane.buffer),
+        planeV = copyBytes(vPlane.buffer),
+        yRowStride = yPlane.rowStride,
+        uRowStride = uPlane.rowStride,
+        vRowStride = vPlane.rowStride,
+        uPixelStride = uPlane.pixelStride,
+        vPixelStride = vPlane.pixelStride,
+        width = width,
+        height = height,
+        rotation = rotationDegrees,
+    )
+}

package/dist/index.d.ts

@@ -20,9 +20,10 @@ import type { FaceConfig, FaceScanResult } from "@smileid/usesmileid_bridge";
  * `FaceAnalyzer` for the canonical contract.
  */
 /**
- * Must match the Kotlin Expo Module's `Name("UseSmileIDMlkitFace")` and its
- * VisionCamera frame-processor-plugin registration — drift is a runtime
- * "module/plugin not found" error, not a compile error.
+ * Must match the Kotlin Expo Module's `Name("UseSmileIDMlkitFace")` — drift is a runtime
+ * "module not found" error, not a compile error.
+ *
+ * `frameProcessorPluginName` is inert; kept only for API compatibility.
  */
 export declare const UseSmileIDMlkitFaceIdentifiers: {
     readonly nativeModuleName: "UseSmileIDMlkitFace";
@@ -30,4 +31,3 @@ export declare const UseSmileIDMlkitFaceIdentifiers: {
 };
 export declare const useSmileIDMlkitFace: import("@smileid/usesmileid_platform_interface").FaceAnalyzer;
 export type { FaceConfig, FaceScanResult };
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,38 +1 @@
-import { AnalyzerFactoryKey } from "@smileid/usesmileid_bridge";
-import { useSmileIDAnalyzerExecutor } from "@smileid/usesmileid_platform_interface";
-/**
- * Google ML Kit face analyzer (Android-only).
- *
- * Thin shim around the existing native session
- * `com.usesmileid.bridge.session.UseSmileIDFaceSession(FaceDetectorAnalyzer())`
- * shipped in the `com.smileidentity:mlkit-face` AAR. The native side
- * runs the entire pipeline (analyzer + validator + transitioner +
- * state machine); this TS layer only routes calls and validates wire
- * payloads at the channel boundary.
- *
- * The canonical wiring lives in [useSmileIDAnalyzerExecutor] in
- * `usesmileid_platform_interface`. This file only supplies the
- * provider-specific identity so all six provider modules share one set
- * of correctness properties by construction.
- *
- * Lifecycle: `configure()` → per-frame analysis via the native frame
- * processor plugin → `reset()`? → `close()`. Calling
- * `close()` twice is idempotent. See `usesmileid_platform_interface`
- * `FaceAnalyzer` for the canonical contract.
- */
-/**
- * Must match the Kotlin Expo Module's `Name("UseSmileIDMlkitFace")` and its
- * VisionCamera frame-processor-plugin registration — drift is a runtime
- * "module/plugin not found" error, not a compile error.
- */
-export const UseSmileIDMlkitFaceIdentifiers = {
-    nativeModuleName: "UseSmileIDMlkitFace",
-    frameProcessorPluginName: "UseSmileIDMlkitFaceFrameProcessor",
-};
-export const useSmileIDMlkitFace = useSmileIDAnalyzerExecutor({
-    nativeModuleName: UseSmileIDMlkitFaceIdentifiers.nativeModuleName,
-    frameProcessorPluginName: UseSmileIDMlkitFaceIdentifiers.frameProcessorPluginName,
-    kind: "face",
-    key: AnalyzerFactoryKey.MLKitFace,
-});
-//# sourceMappingURL=index.js.map
+"use strict";import{AnalyzerFactoryKey as e}from"@smileid/usesmileid_bridge";import{useSmileIDAnalyzerExecutor as r}from"@smileid/usesmileid_platform_interface";export const UseSmileIDMlkitFaceIdentifiers={nativeModuleName:"UseSmileIDMlkitFace",frameProcessorPluginName:"UseSmileIDMlkitFaceFrameProcessor"},useSmileIDMlkitFace=r({nativeModuleName:UseSmileIDMlkitFaceIdentifiers.nativeModuleName,frameProcessorPluginName:UseSmileIDMlkitFaceIdentifiers.frameProcessorPluginName,kind:"face",key:e.MLKitFace});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smileid/usesmileid_mlkit_face",
-  "version": "12.0.2",
+  "version": "12.1.0",
   "description": "Android MLKit face detection implementation for the UseSmileID React Native (Expo) SDK.",
   "homepage": "https://usesmileid.com",
   "repository": {
@@ -36,11 +36,10 @@
   },
   "files": [
     "dist",
-    "src",
-    "android",
+    "android/build.gradle",
+    "android/consumer-rules.pro",
+    "android/src/main",
     "plugin/build",
-    "plugin/src",
-    "plugin/tsconfig.json",
     "app.plugin.js",
     "expo-module.config.json",
     "README.md",
@@ -48,8 +47,8 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@smileid/usesmileid_bridge": "12.0.2",
-    "@smileid/usesmileid_platform_interface": "12.0.2"
+    "@smileid/usesmileid_platform_interface": "12.1.0",
+    "@smileid/usesmileid_bridge": "12.1.0"
   },
   "peerDependencies": {
     "expo": ">=56.0.0",
@@ -57,22 +56,22 @@
     "react-native": ">=0.83.0"
   },
   "devDependencies": {
-    "@types/node": "^25.9.1",
-    "expo": "^56.0.9",
-    "expo-modules-core": "^56.0.15",
-    "react-native": "^0.85.3",
+    "@types/node": "^26.4.1",
+    "expo": "~57.0.20",
+    "expo-modules-core": "^57.0.16",
+    "react-native": "^0.86.3",
     "typescript": "^6.0.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "pnpm run build:lib && pnpm run build:plugin",
+    "build": "pnpm run build:lib && pnpm run build:plugin && node ../Scripts/copy-assets.mjs",
     "build:lib": "tsc -p tsconfig.json",
     "build:plugin": "tsc -p plugin/tsconfig.json",
     "typecheck": "tsc -b && tsc -p plugin/tsconfig.json --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
-    "clean": "rm -rf dist plugin/build .turbo coverage"
+    "clean": "rm -rf dist plugin/build .turbo coverage tsconfig.tsbuildinfo"
   }
 }

package/plugin/build/index.js

@@ -1,27 +1 @@
-"use strict";
-// The module is autolinked as a Gradle subproject, so it inherits the host's
-// Kotlin compiler and `compileSdk`; Expo's defaults for both are lower than the
-// AARs accept and a library cannot raise a setting the root project owns.
-Object.defineProperty(exports, "__esModule", { value: true });
-const root_project_1 = require("./lib/root_project");
-const mlkit_manifest_1 = require("./lib/mlkit_manifest");
-// Lowest Kotlin that reads the AARs' 2.4.x metadata AND has Expo
-// compiler-plugin (pika) artifacts; higher pins break expo-modules-core.
-// KSP is left to Expo's own kotlin→ksp lookup table.
-const DEFAULT_KOTLIN_VERSION = "2.3.20";
-const COMPILE_SDK_VERSION = 37;
-const FORCED_DEPENDENCIES = [
-    "androidx.core:core:1.18.0",
-    "androidx.core:core-ktx:1.18.0",
-];
-const withMlkitFace = (config, options) => {
-    const { kotlinVersion, kspVersion, ...manifestOptions } = options ?? {};
-    return (0, mlkit_manifest_1.withMlkitManifestMerge)((0, root_project_1.withAndroidRootProjectPins)(config, {
-        kotlinVersion: kotlinVersion ?? DEFAULT_KOTLIN_VERSION,
-        ...(kspVersion !== undefined ? { kspVersion } : {}),
-        compileSdkVersion: COMPILE_SDK_VERSION,
-        forcedDependencies: FORCED_DEPENDENCIES,
-    }), manifestOptions);
-};
-exports.default = withMlkitFace;
-//# sourceMappingURL=index.js.map
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const root_project_1=require("./lib/root_project"),mlkit_manifest_1=require("./lib/mlkit_manifest"),DEFAULT_KOTLIN_VERSION="2.3.20",FORCED_DEPENDENCIES=["androidx.core:core:1.18.0","androidx.core:core-ktx:1.18.0"],withMlkitFace=(t,o)=>{const{kotlinVersion:i,kspVersion:e,...r}=o??{};return(0,mlkit_manifest_1.withMlkitManifestMerge)((0,root_project_1.withAndroidRootProjectPins)(t,{kotlinVersion:i??DEFAULT_KOTLIN_VERSION,...e!==void 0?{kspVersion:e}:{},forcedDependencies:FORCED_DEPENDENCIES}),r)};exports.default=withMlkitFace;

package/plugin/build/lib/mlkit_manifest.js

@@ -1,54 +1 @@
-"use strict";
-// The AAR declares this meta-data without `tools:replace`, so only the host `<application>` can claim it for every ML Kit consumer at once.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withMlkitManifestMerge = void 0;
-exports.mergedModelDependencies = mergedModelDependencies;
-exports.applyMlkitManifestMerge = applyMlkitManifestMerge;
-const config_plugins_1 = require("expo/config-plugins");
-const META_DATA_NAME = "com.google.mlkit.vision.DEPENDENCIES";
-const TOOLS_NAMESPACE = "http://schemas.android.com/tools";
-/** The hint this package's AAR declares; always part of the merged value. */
-const PROVIDER_MODEL_DEPENDENCY = "face";
-// ML Kit's own hint vocabulary — lowercase words and underscores.
-const MODEL_DEPENDENCY = /^[a-z0-9_]+$/;
-/** Provider hint first, then the caller's, deduplicated and order-stable. */
-function mergedModelDependencies(additional) {
-    for (const dependency of additional) {
-        if (!MODEL_DEPENDENCY.test(dependency)) {
-            throw new Error(`[smileid-android] '${dependency}' is not a valid ML Kit model dependency. ` +
-                "Expected a lowercase hint such as 'barcode_ui', as printed in the manifest-merger error.");
-        }
-    }
-    return [...new Set([PROVIDER_MODEL_DEPENDENCY, ...additional])].join(",");
-}
-/** Declares the merged `com.google.mlkit.vision.DEPENDENCIES` on the host `<application>` with `tools:replace`. */
-const withMlkitManifestMerge = (config, options) => (0, config_plugins_1.withAndroidManifest)(config, (config) => {
-    config.modResults = applyMlkitManifestMerge(config.modResults, mergedModelDependencies(options?.additionalModelDependencies ?? []));
-    return config;
-});
-exports.withMlkitManifestMerge = withMlkitManifestMerge;
-/** Pure form of the edit. Idempotent; a re-run replaces a stale value. */
-function applyMlkitManifestMerge(manifest, value) {
-    const application = config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(manifest);
-    application["meta-data"] ??= [];
-    const entries = application["meta-data"];
-    const existing = entries.find((entry) => entry?.$?.["android:name"] === META_DATA_NAME);
-    if (existing) {
-        existing.$["android:value"] = value;
-        existing.$["tools:replace"] = "android:value";
-    }
-    else {
-        entries.push({
-            $: {
-                "android:name": META_DATA_NAME,
-                "android:value": value,
-                "tools:replace": "android:value",
-            },
-        });
-    }
-    // Without the namespace on <manifest>, `tools:replace` merges as an unknown attribute.
-    manifest.manifest.$ ??= {};
-    manifest.manifest.$["xmlns:tools"] ??= TOOLS_NAMESPACE;
-    return manifest;
-}
-//# sourceMappingURL=mlkit_manifest.js.map
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.withMlkitManifestMerge=void 0,exports.mergedModelDependencies=mergedModelDependencies,exports.applyMlkitManifestMerge=applyMlkitManifestMerge;const config_plugins_1=require("expo/config-plugins"),META_DATA_NAME="com.google.mlkit.vision.DEPENDENCIES",TOOLS_NAMESPACE="http://schemas.android.com/tools",PROVIDER_MODEL_DEPENDENCY="face",MODEL_DEPENDENCY=/^[a-z0-9_]+$/;function mergedModelDependencies(e){for(const t of e)if(!MODEL_DEPENDENCY.test(t))throw new Error(`[smileid-android] '${t}' is not a valid ML Kit model dependency. Expected a lowercase hint such as 'barcode_ui', as printed in the manifest-merger error.`);return[...new Set([PROVIDER_MODEL_DEPENDENCY,...e])].join(",")}const withMlkitManifestMerge=(e,t)=>(0,config_plugins_1.withAndroidManifest)(e,n=>(n.modResults=applyMlkitManifestMerge(n.modResults,mergedModelDependencies(t?.additionalModelDependencies??[])),n));exports.withMlkitManifestMerge=withMlkitManifestMerge;function applyMlkitManifestMerge(e,t){const n=config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(e);n["meta-data"]??=[];const i=n["meta-data"],o=i.find(s=>s?.$?.["android:name"]===META_DATA_NAME);return o?(o.$["android:value"]=t,o.$["tools:replace"]="android:value"):i.push({$:{"android:name":META_DATA_NAME,"android:value":t,"tools:replace":"android:value"}}),e.manifest.$??={},e.manifest.$["xmlns:tools"]??=TOOLS_NAMESPACE,e}

package/plugin/build/lib/root_project.d.ts

@@ -1,4 +1,5 @@
-import { type ConfigPlugin } from "expo/config-plugins";
+import { type AndroidConfig, type ConfigPlugin } from "expo/config-plugins";
+type PropertiesItem = AndroidConfig.Properties.PropertiesItem;
 export interface AndroidRootProjectPins {
     /**
      * Opt-in: only for hosts whose Kotlin predates the AARs' compiler. Current
@@ -8,12 +9,19 @@ export interface AndroidRootProjectPins {
     kotlinVersion?: string;
     /** Only alongside `kotlinVersion` — Expo's own lookup table may carry no entry for it. */
     kspVersion?: string;
-    /** The AARs declare it as a consumer minimum. Independent of `minSdk`, so device support is unchanged. */
-    compileSdkVersion: number;
+    /** Opt-in: only for a host that must compile above React Native's default. The AARs declare their own consumer floor. */
+    compileSdkVersion?: number;
     /** `group:name:version` coordinates forced everywhere, for deps whose newest release the host toolchain cannot consume. */
     forcedDependencies: readonly string[];
 }
+/**
+ * AGP matches this against the resolved platform, which may or may not carry a minor
+ * (`android-37` vs `android-37.0`), so both forms are listed.
+ */
+export declare function suppressUnsupportedCompileSdkValue(compileSdkVersion: number): string;
+export declare function suppressAdvisoryProperties(items: PropertiesItem[], compileSdkVersion: number | undefined): PropertiesItem[];
 /** Declares the pins ahead of `apply plugin: "expo-root-project"`. */
 export declare const withAndroidRootProjectPins: ConfigPlugin<AndroidRootProjectPins>;
 /** Pure form of the edit. Idempotent; a re-run replaces stale values rather than appending. */
 export declare function applyAndroidRootProjectPins(contents: string, pins: AndroidRootProjectPins): string;
+export {};

package/plugin/build/lib/root_project.js

@@ -1,109 +1,4 @@
-"use strict";
-// `expo-root-project` resolves these through `extra.setIfNotExist`, so they only
-// take effect when declared before that plugin applies.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withAndroidRootProjectPins = void 0;
-exports.applyAndroidRootProjectPins = applyAndroidRootProjectPins;
-const config_plugins_1 = require("expo/config-plugins");
-const BEGIN_MARKER = "// === BEGIN smileid root-project pins ===";
-const END_MARKER = "// === END smileid root-project pins ===";
-const APPLY_ROOT_PROJECT = /^apply\s+plugin:\s*["']expo-root-project["']/m;
-// Bumping `ext.kotlinVersion` moves the dependency catalog but not the compiler, so
-// the classpath line needs pinning too. Version and parentheses are optional so an
-// already-pinned line and Groovy's space-call form still match.
-const KGP_CLASSPATH = /classpath\s*(?:\(\s*)?['"]org\.jetbrains\.kotlin:kotlin-gradle-plugin(?::[^'"]*)?['"](?:\s*\))?/;
-/** Declares the pins ahead of `apply plugin: "expo-root-project"`. */
-const withAndroidRootProjectPins = (config, pins) => (0, config_plugins_1.withProjectBuildGradle)(config, (config) => {
-    if (config.modResults.language !== "groovy") {
-        throw new Error("[smileid-android] Expected android/build.gradle to be Groovy DSL; refusing to edit " +
-            `a ${config.modResults.language} build script.`);
-    }
-    config.modResults.contents = applyAndroidRootProjectPins(config.modResults.contents, pins);
-    return config;
-});
-exports.withAndroidRootProjectPins = withAndroidRootProjectPins;
-/** Pure form of the edit. Idempotent; a re-run replaces stale values rather than appending. */
-function applyAndroidRootProjectPins(contents, pins) {
-    if (pins.kspVersion !== undefined && pins.kotlinVersion === undefined) {
-        throw new Error("[smileid-android] `kspVersion` only makes sense alongside `kotlinVersion`.");
-    }
-    validateGroovySafe(pins);
-    const pinned = pins.kotlinVersion === undefined
-        ? contents
-        : pinKotlinGradlePlugin(contents, pins.kotlinVersion);
-    return upsertPinBlock(pinned, renderPinBlock(pins));
-}
-// Every value lands in a single-quoted Groovy literal; reject anything that could close one.
-function validateGroovySafe(pins) {
-    const values = [
-        pins.kotlinVersion,
-        pins.kspVersion,
-        ...pins.forcedDependencies,
-    ].filter((value) => value !== undefined);
-    for (const value of values) {
-        if (/['\\\n\r\t$]/.test(value)) {
-            throw new Error(`[smileid-android] Refusing to edit android/build.gradle: '${value}' contains an unsafe character.`);
-        }
-    }
-}
-function pinKotlinGradlePlugin(contents, kotlinVersion) {
-    const pinned = `classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}')`;
-    if (!KGP_CLASSPATH.test(contents)) {
-        throw new Error("[smileid-android] Could not locate the kotlin-gradle-plugin classpath line in " +
-            "android/build.gradle. Refusing to silently no-op — the Smile ID analyzer modules do not " +
-            `compile unless the Kotlin compiler is pinned to ${kotlinVersion}.`);
-    }
-    return contents.replace(KGP_CLASSPATH, pinned);
-}
-// Adding a further root-project pin means adding an entry here.
-function renderPinBlock(pins) {
-    const extProperties = [];
-    if (pins.kotlinVersion !== undefined) {
-        extProperties.push(["kotlinVersion", `'${pins.kotlinVersion}'`]);
-    }
-    if (pins.kspVersion !== undefined) {
-        extProperties.push(["kspVersion", `'${pins.kspVersion}'`]);
-    }
-    extProperties.push(["compileSdkVersion", String(pins.compileSdkVersion)]);
-    const lines = extProperties.map(([name, value]) => `ext.${name} = ${value}`);
-    return [
-        BEGIN_MARKER,
-        ...lines,
-        ...renderForcedDependencies(pins.forcedDependencies),
-        END_MARKER,
-    ].join("\n");
-}
-// Its own `allprojects` block, which Gradle merges — editing the template's would
-// break the moment its shape changes.
-function renderForcedDependencies(coordinates) {
-    if (coordinates.length === 0) {
-        return [];
-    }
-    return [
-        "",
-        "// Forced to the newest release that resolves under the AGP Expo generates.",
-        "allprojects {",
-        "  configurations.all {",
-        "    resolutionStrategy {",
-        ...coordinates.map((coordinate) => `      force '${coordinate}'`),
-        "    }",
-        "  }",
-        "}",
-    ];
-}
-function upsertPinBlock(contents, block) {
-    const existing = new RegExp(`${escapeRegExp(BEGIN_MARKER)}[\\s\\S]*?${escapeRegExp(END_MARKER)}`, "m");
-    if (existing.test(contents)) {
-        return contents.replace(existing, block);
-    }
-    if (!APPLY_ROOT_PROJECT.test(contents)) {
-        throw new Error('[smileid-android] Could not locate `apply plugin: "expo-root-project"` in ' +
-            "android/build.gradle. Refusing to silently no-op — these pins only take effect when " +
-            "declared before that plugin applies.");
-    }
-    return contents.replace(APPLY_ROOT_PROJECT, (match) => `${block}\n\n${match}`);
-}
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-//# sourceMappingURL=root_project.js.map
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.withAndroidRootProjectPins=void 0,exports.suppressUnsupportedCompileSdkValue=suppressUnsupportedCompileSdkValue,exports.suppressAdvisoryProperties=suppressAdvisoryProperties,exports.applyAndroidRootProjectPins=applyAndroidRootProjectPins;const config_plugins_1=require("expo/config-plugins"),SUPPRESS_KEY="android.suppressUnsupportedCompileSdk",BEGIN_MARKER="// === BEGIN smileid root-project pins ===",END_MARKER="// === END smileid root-project pins ===",APPLY_ROOT_PROJECT=/^apply\s+plugin:\s*["']expo-root-project["']/m,KGP_CLASSPATH=/classpath\s*(?:\(\s*)?['"]org\.jetbrains\.kotlin:kotlin-gradle-plugin(?::[^'"]*)?['"](?:\s*\))?/;function suppressUnsupportedCompileSdkValue(e){return`${e},${e}.0`}function suppressAdvisoryProperties(e,o){if(o===void 0)return e;const r={type:"property",key:SUPPRESS_KEY,value:suppressUnsupportedCompileSdkValue(o)},n=e.findIndex(t=>t.type==="property"&&t.key===SUPPRESS_KEY);return n===-1?[...e,r]:e.map((t,i)=>i===n?r:t)}const withSuppressedCompileSdkAdvisory=(e,o)=>(0,config_plugins_1.withGradleProperties)(e,r=>(r.modResults=suppressAdvisoryProperties(r.modResults,o),r)),withAndroidRootProjectPins=(e,o)=>withSuppressedCompileSdkAdvisory((0,config_plugins_1.withProjectBuildGradle)(e,r=>{if(r.modResults.language!=="groovy")throw new Error(`[smileid-android] Expected android/build.gradle to be Groovy DSL; refusing to edit a ${r.modResults.language} build script.`);return r.modResults.contents=applyAndroidRootProjectPins(r.modResults.contents,o),r}),o.compileSdkVersion);exports.withAndroidRootProjectPins=withAndroidRootProjectPins;function applyAndroidRootProjectPins(e,o){if(o.kspVersion!==void 0&&o.kotlinVersion===void 0)throw new Error("[smileid-android] `kspVersion` only makes sense alongside `kotlinVersion`.");validateGroovySafe(o);const r=o.kotlinVersion===void 0?e:pinKotlinGradlePlugin(e,o.kotlinVersion);return upsertPinBlock(r,renderPinBlock(o))}function validateGroovySafe(e){const o=[e.kotlinVersion,e.kspVersion,...e.forcedDependencies].filter(r=>r!==void 0);for(const r of o)if(/['\\\n\r\t$]/.test(r))throw new Error(`[smileid-android] Refusing to edit android/build.gradle: '${r}' contains an unsafe character.`)}function pinKotlinGradlePlugin(e,o){const r=`classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:${o}')`;if(!KGP_CLASSPATH.test(e))throw new Error(`[smileid-android] Could not locate the kotlin-gradle-plugin classpath line in android/build.gradle. Refusing to silently no-op \u2014 the Smile ID analyzer modules do not compile unless the Kotlin compiler is pinned to ${o}.`);return e.replace(KGP_CLASSPATH,r)}function renderPinBlock(e){const o=[];e.kotlinVersion!==void 0&&o.push(["kotlinVersion",`'${e.kotlinVersion}'`]),e.kspVersion!==void 0&&o.push(["kspVersion",`'${e.kspVersion}'`]),e.compileSdkVersion!==void 0&&o.push(["compileSdkVersion",String(e.compileSdkVersion)]);const r=o.map(([n,t])=>`ext.${n} = ${t}`);return[BEGIN_MARKER,...r,...renderForcedDependencies(e.forcedDependencies),END_MARKER].join(`
+`)}function renderForcedDependencies(e){return e.length===0?[]:["","// Forced to the newest release that resolves under the AGP Expo generates.","allprojects {","  configurations.all {","    resolutionStrategy {",...e.map(o=>`      force '${o}'`),"    }","  }","}"]}function upsertPinBlock(e,o){const r=new RegExp(`${escapeRegExp(BEGIN_MARKER)}[\\s\\S]*?${escapeRegExp(END_MARKER)}`,"m");if(r.test(e))return e.replace(r,o);if(!APPLY_ROOT_PROJECT.test(e))throw new Error('[smileid-android] Could not locate `apply plugin: "expo-root-project"` in android/build.gradle. Refusing to silently no-op \u2014 these pins only take effect when declared before that plugin applies.');return e.replace(APPLY_ROOT_PROJECT,n=>`${o}
+
+${n}`)}function escapeRegExp(e){return e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}