@callstack/react-native-brownfield 3.13.1 → 3.14.0

package/lib/typescript/module/src/expo-config-plugin/android/utils/gradleHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradleHelpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/android/utils/gradleHelpers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B9D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,CAqBR"}
+{"version":3,"file":"gradleHelpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/android/utils/gradleHelpers.ts"],"names":[],"mappings":"AAMA,KAAK,yBAAyB,GAAG;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,EAAE,oBAA4B,EAAE,GAAE,yBAA8B,GAC/D,MAAM,CAsCR;AA6BD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,EAAE,oBAA4B,EAAE,GAAE,yBAA8B,GAC/D,MAAM,CA2BR"}

package/lib/typescript/module/src/expo-config-plugin/android/utils/hermes.d.ts

@@ -1,6 +1,8 @@
-export declare function getHermesArtifact(rnVersion: string): {
+type HermesArtifact = {
     groupId: string;
     artifactId: string;
     version: string;
 };
+export declare function getHermesArtifact(rnVersion: string, projectRoot?: string): HermesArtifact;
+export {};
 //# sourceMappingURL=hermes.d.ts.map

package/lib/typescript/module/src/expo-config-plugin/android/utils/hermes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hermes.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/android/utils/hermes.ts"],"names":[],"mappings":"AAEA,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM;;;;EAgFlD"}
+{"version":3,"file":"hermes.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/android/utils/hermes.ts"],"names":[],"mappings":"AAKA,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAgEF,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,cAAc,CAiFhB"}

package/lib/typescript/module/src/expo-config-plugin/android/withAndroidModuleFiles.d.ts

@@ -1,6 +1,8 @@
 import { type ConfigPlugin } from '@expo/config-plugins';
 import type { ResolvedBrownfieldPluginConfigWithAndroid } from '../types';
 import { type AndroidManifestMetaDataEntry, type AndroidStringResourceEntry } from './utils/androidManifest';
+export declare function resolveCompileSdkVersionExpression(config: ResolvedBrownfieldPluginConfigWithAndroid): string;
+export declare function resolveTargetSdkVersionExpression(config: ResolvedBrownfieldPluginConfigWithAndroid): string;
 /**
  * Creates the Android library module directory structure and files
  */

package/lib/typescript/module/src/expo-config-plugin/android/withAndroidModuleFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withAndroidModuleFiles.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/withAndroidModuleFiles.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAK,EAEV,yCAAyC,EAC1C,MAAM,UAAU,CAAC;AAIlB,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAGhC,MAAM,yBAAyB,CAAC;AAOjC;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,UAAU,EACV,MAAM,EACN,SAAS,EACT,WAAW,EACX,WAAW,GACZ,EAAE;IACD;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,EAAE,yCAAyC,CAAC;CACnD,GAAG,IAAI,CAsFP;AAED,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,MAAM,EACN,mBAAmB,GACpB,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;IAClD,mBAAmB,EAAE,4BAA4B,EAAE,CAAC;CACrD,GAAG,IAAI,CASP;AAED,wBAAgB,gCAAgC,CAAC,EAC/C,UAAU,EACV,MAAM,EACN,0BAA0B,GAC3B,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;IAClD,0BAA0B,EAAE,0BAA0B,EAAE,CAAC;CAC1D,GAAG,IAAI,CAUP;AAkBD,wBAAgB,wCAAwC,CAAC,EACvD,UAAU,EACV,MAAM,GACP,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;CACnD,GAAG,IAAI,CAsBP;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAC/C,yCAAyC,CAwC1C,CAAC"}
+{"version":3,"file":"withAndroidModuleFiles.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/withAndroidModuleFiles.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAK,EAEV,yCAAyC,EAC1C,MAAM,UAAU,CAAC;AAIlB,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAGhC,MAAM,yBAAyB,CAAC;AAOjC,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,yCAAyC,GAChD,MAAM,CAMR;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,yCAAyC,GAChD,MAAM,CAMR;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,UAAU,EACV,MAAM,EACN,SAAS,EACT,WAAW,EACX,WAAW,GACZ,EAAE;IACD;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,EAAE,yCAAyC,CAAC;CACnD,GAAG,IAAI,CA0FP;AAED,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,MAAM,EACN,mBAAmB,GACpB,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;IAClD,mBAAmB,EAAE,4BAA4B,EAAE,CAAC;CACrD,GAAG,IAAI,CASP;AAED,wBAAgB,gCAAgC,CAAC,EAC/C,UAAU,EACV,MAAM,EACN,0BAA0B,GAC3B,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;IAClD,0BAA0B,EAAE,0BAA0B,EAAE,CAAC;CAC1D,GAAG,IAAI,CAUP;AAkBD,wBAAgB,wCAAwC,CAAC,EACvD,UAAU,EACV,MAAM,GACP,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,yCAAyC,CAAC;CACnD,GAAG,IAAI,CAsBP;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAC/C,yCAAyC,CAwC1C,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/android/withBrownfieldAndroid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBrownfieldAndroid.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/withBrownfieldAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAU9B,OAAO,KAAK,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;AAE1E;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,yCAAyC,CAwC1C,CAAC"}
+{"version":3,"file":"withBrownfieldAndroid.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/withBrownfieldAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAU9B,OAAO,KAAK,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;AAE1E;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,yCAAyC,CA0C1C,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/ios/podfileHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"podfileHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/podfileHelpers.ts"],"names":[],"mappings":"AA0FA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAChB,MAAM,CAgDR"}
+{"version":3,"file":"podfileHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/podfileHelpers.ts"],"names":[],"mappings":"AAgGA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAChB,MAAM,CAmDR"}

package/lib/typescript/module/src/expo-config-plugin/ios/withBrownfieldIos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBrownfieldIos.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/withBrownfieldIos.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,UAAU,CAAC;AAItE;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAC1C,qCAAqC,CAqFtC,CAAC"}
+{"version":3,"file":"withBrownfieldIos.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/withBrownfieldIos.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAa9B,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,UAAU,CAAC;AAItE;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAC1C,qCAAqC,CA2FtC,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/ios/withFmtFix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withFmtFix.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/withFmtFix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,UAAU,CAAC;AAiBtE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAyC/D;AAED,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,qCAAqC,CASvE,CAAC"}
+{"version":3,"file":"withFmtFix.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/withFmtFix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,UAAU,CAAC;AAyCtE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA+C/D;AAED,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,qCAAqC,CASvE,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/ios/xcodeHelpers.d.ts

@@ -17,7 +17,9 @@ export type PbxReferenceLike = {
 } | string;
 export type PbxNativeTarget = {
     buildPhases?: PbxReferenceLike[];
+    buildConfigurationList?: string;
     name?: string;
+    productReference?: string;
 };
 export type PbxResourcesBuildPhase = {
     isa: 'PBXResourcesBuildPhase';
@@ -56,6 +58,10 @@ export declare function rewriteBundleReactNativePhaseScriptForFrameworkTarget(sh
  * @param targetUuid The UUID of the framework target
  */
 export declare function copyBundleReactNativePhase(project: XcodeProject, targetUuid: string): void;
+export declare function getAppTargetDeploymentTarget(project: Pick<XcodeProject, 'getBuildProperty'>, appTargetName: string | null): string | null;
+export declare function resolveFrameworkDeploymentTarget(project: XcodeProject, modRequest: ModProps<XcodeProject>, { fallbackDeploymentTarget, }: {
+    fallbackDeploymentTarget?: string;
+}): string;
 /**
  * Adds the "Patch ExpoModulesProvider" shell script phase to the framework target.
  * Safe to call on every prebuild: skips creation when the phase is already present.

package/lib/typescript/module/src/expo-config-plugin/ios/xcodeHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xcodeHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/xcodeHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAKlE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAC,EAClC,OAAO,EAAE,iCAAiC,GACzC;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAoIA;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,YAAY,EACrB,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,iCAAiC,QAkB3C;AAED,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC;AAE7E,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,EAAE,wBAAwB,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,kCAAkC,EAAE,MAAM,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAOvE,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,qBAAqB,CAEvB;AAmJD,KAAK,0BAA0B,GAAG;IAChC,0BAA0B,EAAE,MAAM,CAAC;IACnC,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,iDAAiD,CAC/D,OAAO,EAAE,YAAY,EACrB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,EACnB,EAAE,0BAA0B,EAAE,gBAAgB,EAAE,EAAE,0BAA0B,GAC3E,OAAO,CAwBT;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,EACE,aAAa,GACd,EAAE;IACD,sDAAsD;IACtD,aAAa,EAAE,OAAO,GAAG,SAAS,CAAC;CACpC,EACD,EACE,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,aAAa,EAAE,mBAAmB,GACnC,EAAE,iCAAiC,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CA8B3C;AAED,wBAAgB,qDAAqD,CACnE,WAAW,EAAE,MAAM,GAClB,MAAM,CAoCR;AAgCD;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,MAAM,GACjB,IAAI,CA+FN;AA4DD;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAC,EAClC,OAAO,EAAE,YAAY,EACrB,EACE,aAAa,EACb,mBAAmB,GACpB,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,QAqCF;AAED;;;;;;GAMG;AACH,wBAAgB,6CAA6C,CAC3D,OAAO,EAAE,YAAY,EACrB,mBAAmB,EAAE,MAAM,WAmC5B"}
+{"version":3,"file":"xcodeHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/ios/xcodeHelpers.ts"],"names":[],"mappings":"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"}

package/lib/typescript/module/src/expo-config-plugin/types/android/BrownfieldPluginAndroidConfig.d.ts

@@ -19,12 +19,12 @@ export interface BrownfieldPluginAndroidConfig {
     minSdkVersion?: number;
     /**
      * Target SDK version for the Android library
-     * @default 35
+     * @default inherited from the generated Expo app project when available
      */
     targetSdkVersion?: number;
     /**
      * Compile SDK version for the Android library
-     * @default 35
+     * @default inherited from the generated Expo app project when available
      */
     compileSdkVersion?: number;
     /**
@@ -42,9 +42,15 @@ export interface BrownfieldPluginAndroidConfig {
      * @default "0.0.1-SNAPSHOT"
      */
     version?: string;
+    /**
+     * Load the Brownfield Gradle plugin from node_modules via includeBuild
+     * instead of the Maven classpath dependency.
+     * @default false
+     */
+    useLocalGradlePlugin?: boolean;
 }
 /**
  * Android configuration with resolved defaults (all fields required)
  */
-export type ResolvedBrownfieldPluginAndroidConfig = Required<BrownfieldPluginAndroidConfig>;
+export type ResolvedBrownfieldPluginAndroidConfig = Required<Omit<BrownfieldPluginAndroidConfig, 'compileSdkVersion' | 'targetSdkVersion'>> & Pick<BrownfieldPluginAndroidConfig, 'compileSdkVersion' | 'targetSdkVersion'>;
 //# sourceMappingURL=BrownfieldPluginAndroidConfig.d.ts.map

package/lib/typescript/module/src/expo-config-plugin/types/android/BrownfieldPluginAndroidConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrownfieldPluginAndroidConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/types/android/BrownfieldPluginAndroidConfig.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAC/C,QAAQ,CAAC,6BAA6B,CAAC,CAAC"}
+{"version":3,"file":"BrownfieldPluginAndroidConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/types/android/BrownfieldPluginAndroidConfig.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAAG,QAAQ,CAC1D,IAAI,CAAC,6BAA6B,EAAE,mBAAmB,GAAG,kBAAkB,CAAC,CAC9E,GACC,IAAI,CAAC,6BAA6B,EAAE,mBAAmB,GAAG,kBAAkB,CAAC,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/types/ios/BrownfieldPluginIosConfig.d.ts

@@ -19,7 +19,7 @@ export interface BrownfieldPluginIosConfig {
     buildSettings?: Record<string, string | boolean | number>;
     /**
      * Minimum iOS deployment target
-     * @default "15.0"
+     * @default inherited from the generated Expo app target when available
      */
     deploymentTarget?: string;
     /**
@@ -32,5 +32,5 @@ export interface BrownfieldPluginIosConfig {
 /**
  * iOS configuration with resolved defaults (all fields required)
  */
-export type ResolvedBrownfieldPluginIosConfig = Required<BrownfieldPluginIosConfig>;
+export type ResolvedBrownfieldPluginIosConfig = Required<Omit<BrownfieldPluginIosConfig, 'deploymentTarget'>> & Pick<BrownfieldPluginIosConfig, 'deploymentTarget'>;
 //# sourceMappingURL=BrownfieldPluginIosConfig.d.ts.map

package/lib/typescript/module/src/expo-config-plugin/types/ios/BrownfieldPluginIosConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrownfieldPluginIosConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/types/ios/BrownfieldPluginIosConfig.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IAE1D;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,iCAAiC,GAC3C,QAAQ,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"BrownfieldPluginIosConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/expo-config-plugin/types/ios/BrownfieldPluginIosConfig.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IAE1D;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,iCAAiC,GAAG,QAAQ,CACtD,IAAI,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CACpD,GACC,IAAI,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/withBrownfield.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBrownfield.d.ts","sourceRoot":"","sources":["../../../../../src/expo-config-plugin/withBrownfield.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,SAAS,CAAC;;AA8FjB,wBAIE"}
+{"version":3,"file":"withBrownfield.d.ts","sourceRoot":"","sources":["../../../../../src/expo-config-plugin/withBrownfield.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAU9B,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,SAAS,CAAC;;AA2DjB,wBAIE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-brownfield",
-  "version": "3.13.1",
+  "version": "3.14.0",
   "license": "MIT",
   "author": "Michal Chudziak <mike.chudziak@callstack.com>",
   "bin": {
@@ -63,6 +63,7 @@
   "files": [
     "src",
     "lib",
+    "app.plugin.js",
     "scripts",
     "gradle-plugin",
     "android",
@@ -85,16 +86,16 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@expo/config-plugins": "^54.0.4"
+    "@expo/config-plugins": ">=54 <100"
   },
   "dependencies": {
-    "@callstack/brownfield-cli": "^3.13.1"
+    "@callstack/brownfield-cli": "^3.14.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
-    "@expo/config-plugins": "^54.0.4",
+    "@expo/config-plugins": "^56.0.8",
     "@react-native/babel-preset": "0.83.2",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.1.1",

package/src/expo-config-plugin/android/utils/constants.ts

@@ -1,2 +1,2 @@
-export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha02';
+export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha03';
 export const brownfieldGradlePluginDependency = `classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;

package/src/expo-config-plugin/android/utils/gradleHelpers.ts

@@ -1,12 +1,29 @@
 import { brownfieldGradlePluginDependency } from './constants';
 import { Logger } from '../../logging';
 
+const LOCAL_GRADLE_PLUGIN_INCLUDE_BUILD =
+  'includeBuild("../node_modules/@callstack/react-native-brownfield/gradle-plugin/brownfield")';
+
+type GradleModificationOptions = {
+  useLocalGradlePlugin?: boolean;
+};
+
 /**
  * Modifies the root build.gradle to add the Brownfield Gradle plugin dependency
  * @param contents The original build.gradle content
  * @returns The modified build.gradle content
  */
-export function modifyRootBuildGradle(contents: string): string {
+export function modifyRootBuildGradle(
+  contents: string,
+  { useLocalGradlePlugin = false }: GradleModificationOptions = {}
+): string {
+  if (useLocalGradlePlugin) {
+    Logger.logDebug(
+      'Skipping Maven Brownfield Gradle plugin classpath because useLocalGradlePlugin is enabled'
+    );
+    return contents;
+  }
+
   // check if already added
   if (contents.includes('brownfield-gradle-plugin')) {
     Logger.logDebug(
@@ -39,6 +56,33 @@ export function modifyRootBuildGradle(contents: string): string {
   return modifiedContents;
 }
 
+function addLocalGradlePluginIncludeBuild(contents: string): string {
+  if (contents.includes('gradle-plugin/brownfield')) {
+    Logger.logDebug(
+      'Local Brownfield Gradle plugin includeBuild already present, skipping'
+    );
+    return contents;
+  }
+
+  Logger.logDebug(
+    'Modifying settings.gradle to include local Brownfield Gradle plugin'
+  );
+
+  const pluginManagementMatch = contents.match(/pluginManagement\s*\{/);
+
+  if (pluginManagementMatch?.index !== undefined) {
+    const insertIndex =
+      pluginManagementMatch.index + pluginManagementMatch[0].length;
+    const insertion = `\n\t${LOCAL_GRADLE_PLUGIN_INCLUDE_BUILD}`;
+
+    return (
+      contents.slice(0, insertIndex) + insertion + contents.slice(insertIndex)
+    );
+  }
+
+  return `pluginManagement {\n\t${LOCAL_GRADLE_PLUGIN_INCLUDE_BUILD}\n}\n\n${contents}`;
+}
+
 /**
  * Modifies settings.gradle to include the Brownfield module
  * @param contents The original settings.gradle content
@@ -47,16 +91,23 @@ export function modifyRootBuildGradle(contents: string): string {
  */
 export function modifySettingsGradle(
   contents: string,
-  moduleName: string
+  moduleName: string,
+  { useLocalGradlePlugin = false }: GradleModificationOptions = {}
 ): string {
+  let modifiedContents = contents;
+
+  if (useLocalGradlePlugin) {
+    modifiedContents = addLocalGradlePluginIncludeBuild(modifiedContents);
+  }
+
   const includeStatement = `include ':${moduleName}'`;
 
   // check if already included
-  if (contents.includes(includeStatement)) {
+  if (modifiedContents.includes(includeStatement)) {
     Logger.logDebug(
       `Module "${moduleName}" already in settings.gradle, skipping`
     );
-    return contents;
+    return modifiedContents;
   }
 
   Logger.logDebug(
@@ -64,7 +115,7 @@ export function modifySettingsGradle(
   );
 
   // add the include statement at the end
-  const modifiedContents = contents + `\n${includeStatement}\n`;
+  modifiedContents = modifiedContents + `\n${includeStatement}\n`;
 
   Logger.logDebug(`Added module "${moduleName}" to settings.gradle`);
 

package/src/expo-config-plugin/android/utils/hermes.ts

@@ -1,6 +1,80 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+
 import { Logger } from '../../logging';
 
-export function getHermesArtifact(rnVersion: string) {
+type HermesArtifact = {
+  groupId: string;
+  artifactId: string;
+  version: string;
+};
+
+function parseVersionProperties(contents: string): Record<string, string> {
+  return contents
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0 && !line.startsWith('#'))
+    .reduce<Record<string, string>>((result, line) => {
+      const separatorIndex = line.indexOf('=');
+      if (separatorIndex === -1) {
+        return result;
+      }
+
+      const key = line.slice(0, separatorIndex).trim();
+      const value = line.slice(separatorIndex + 1).trim();
+
+      if (key.length > 0 && value.length > 0) {
+        result[key] = value;
+      }
+
+      return result;
+    }, {});
+}
+
+function resolveHermesArtifactFromInstalledReactNative(
+  projectRoot?: string
+): HermesArtifact | null {
+  if (!projectRoot) {
+    return null;
+  }
+
+  const versionPropertiesPath = path.join(
+    projectRoot,
+    'node_modules',
+    'react-native',
+    'sdks',
+    'hermes-engine',
+    'version.properties'
+  );
+
+  if (!fs.existsSync(versionPropertiesPath)) {
+    return null;
+  }
+
+  const properties = parseVersionProperties(
+    fs.readFileSync(versionPropertiesPath, 'utf8')
+  );
+  const resolvedVersion =
+    properties.HERMES_V1_VERSION_NAME ?? properties.HERMES_VERSION_NAME;
+
+  if (!resolvedVersion) {
+    Logger.logWarning(
+      `Could not resolve Hermes version from '${versionPropertiesPath}'. Falling back to the Brownfield Hermes version map.`
+    );
+    return null;
+  }
+
+  return {
+    groupId: 'com.facebook.hermes',
+    artifactId: 'hermes-android',
+    version: resolvedVersion,
+  };
+}
+
+export function getHermesArtifact(
+  rnVersion: string,
+  projectRoot?: string
+): HermesArtifact {
   let [rnMajorVersionString, rnMinorVersionString, rnPatchVersionString] =
     rnVersion.split('.') as [string?, string?, string?];
 
@@ -32,13 +106,14 @@ export function getHermesArtifact(rnVersion: string) {
     );
   }
 
-  // below: 0.84.x
+  // above: 0.84.x
   if (rnMinorVersion >= 84) {
-    return {
-      groupId: 'com.facebook.hermes',
-      artifactId: 'hermes-android',
-      version: '0.15.1',
-    };
+    const installedReactNativeArtifact =
+      resolveHermesArtifactFromInstalledReactNative(projectRoot);
+
+    if (installedReactNativeArtifact) {
+      return installedReactNativeArtifact;
+    }
   }
 
   // below: 0.83.x

package/src/expo-config-plugin/android/withAndroidModuleFiles.ts

@@ -22,6 +22,26 @@ import {
 } from './utils/expo-updates';
 import { getHermesArtifact } from './utils/hermes';
 
+export function resolveCompileSdkVersionExpression(
+  config: ResolvedBrownfieldPluginConfigWithAndroid
+): string {
+  if (config.android.compileSdkVersion != null) {
+    return config.android.compileSdkVersion.toString();
+  }
+
+  return 'resolveRootProjectInt("compileSdkVersion")';
+}
+
+export function resolveTargetSdkVersionExpression(
+  config: ResolvedBrownfieldPluginConfigWithAndroid
+): string {
+  if (config.android.targetSdkVersion != null) {
+    return config.android.targetSdkVersion.toString();
+  }
+
+  return 'resolveRootProjectInt("targetSdkVersion")';
+}
+
 /**
  * Creates the Android library module directory structure and files
  */
@@ -63,7 +83,10 @@ export function createAndroidModule({
 
   Logger.logDebug(`Creating Android module in: ${androidDir}`);
 
-  const hermesArtifact = getHermesArtifact(rnVersion);
+  const hermesArtifact = getHermesArtifact(rnVersion, projectRoot);
+  const compileSdkVersionExpression =
+    resolveCompileSdkVersionExpression(config);
+  const targetSdkVersionExpression = resolveTargetSdkVersionExpression(config);
   Logger.logDebug(
     `Resolved Hermes artifact: ${hermesArtifact.groupId}:${hermesArtifact.artifactId}:${hermesArtifact.version}`
   );
@@ -75,7 +98,8 @@ export function createAndroidModule({
       content: renderTemplate('android', 'build.gradle.kts', {
         '{{PACKAGE_NAME}}': android.packageName,
         '{{MIN_SDK_VERSION}}': android.minSdkVersion.toString(),
-        '{{COMPILE_SDK_VERSION}}': android.compileSdkVersion.toString(),
+        '{{TARGET_SDK_VERSION}}': targetSdkVersionExpression,
+        '{{COMPILE_SDK_VERSION}}': compileSdkVersionExpression,
         '{{GROUP_ID}}': android.groupId,
         '{{ARTIFACT_ID}}': android.artifactId,
         '{{ARTIFACT_VERSION}}': android.version,

package/src/expo-config-plugin/android/withBrownfieldAndroid.ts

@@ -32,7 +32,8 @@ export const withBrownfieldAndroid: ConfigPlugin<
   // Step 1: modify root build.gradle to add Brownfield Gradle plugin dependency
   config = withProjectBuildGradle(config, (gradleConfig) => {
     gradleConfig.modResults.contents = modifyRootBuildGradle(
-      gradleConfig.modResults.contents
+      gradleConfig.modResults.contents,
+      { useLocalGradlePlugin: androidConfig.useLocalGradlePlugin }
     );
 
     return gradleConfig;
@@ -42,7 +43,8 @@ export const withBrownfieldAndroid: ConfigPlugin<
   config = withSettingsGradle(config, (settingsConfig) => {
     settingsConfig.modResults.contents = modifySettingsGradle(
       settingsConfig.modResults.contents,
-      androidConfig.moduleName
+      androidConfig.moduleName,
+      { useLocalGradlePlugin: androidConfig.useLocalGradlePlugin }
     );
 
     return settingsConfig;

package/src/expo-config-plugin/ios/podfileHelpers.ts

@@ -53,13 +53,18 @@ ${BROWNFIELD_POD_HOOK_MARKER_END}
   return modifiedPodfile;
 }
 
-function ensureExpoDefinesForSDK55AndAbove(podfile: string): string {
+function ensureExpoDefinesForSDK55AndAbove(
+  podfile: string,
+  expoMajor: number
+): string {
   if (podfile.includes(BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START)) {
     return podfile;
   }
 
+  const defaultDeploymentTarget = expoMajor >= 56 ? '16.4' : '15.1';
   const hook = `
     ${BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START}
+    brownfield_ios_deployment_target = podfile_properties['ios.deploymentTarget'] || '${defaultDeploymentTarget}'
     installer.pods_project.targets.each do |target|
       if target.name == 'ReactBrownfield'
         puts "[Brownfield] Adding definition of EXPO_SDK_GTE_55 to target: #{target.name}"
@@ -68,6 +73,7 @@ function ensureExpoDefinesForSDK55AndAbove(podfile: string): string {
           conditions = config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] || '$(inherited)'
           conditions = conditions.to_s
           config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = "#{conditions} EXPO_SDK_GTE_55"
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = brownfield_ios_deployment_target
         end
       end
     end
@@ -143,7 +149,10 @@ export function modifyPodfile(
     modifiedPodfile = ensureExpoPhaseOrderingHook(modifiedPodfile);
   } else {
     // Expo SDK >= 55
-    modifiedPodfile = ensureExpoDefinesForSDK55AndAbove(modifiedPodfile);
+    modifiedPodfile = ensureExpoDefinesForSDK55AndAbove(
+      modifiedPodfile,
+      expoMajor
+    );
   }
 
   return modifiedPodfile;

package/src/expo-config-plugin/ios/withBrownfieldIos.ts

@@ -9,6 +9,7 @@ import {
   addFrameworkTarget,
   addSourceFilesBuildPhase,
   copyBundleReactNativePhase,
+  resolveFrameworkDeploymentTarget,
 } from './xcodeHelpers';
 import { modifyPodfile } from './podfileHelpers';
 import { injectFmtFixIntoPodfile } from './withFmtFix';
@@ -37,11 +38,17 @@ export const withBrownfieldIos: ConfigPlugin<
   config = withXcodeProject(config, (xcodeConfig) => {
     const { modResults: project, modRequest } = xcodeConfig;
     const hasExpoUpdates = hasExpoUpdatesInstalled(modRequest.projectRoot);
+    const iosProps = {
+      ...props.ios,
+      deploymentTarget: resolveFrameworkDeploymentTarget(project, modRequest, {
+        fallbackDeploymentTarget: props.ios.deploymentTarget,
+      }),
+    };
 
     const { frameworkTargetUUID, targetAlreadyExists } = addFrameworkTarget(
       project,
       modRequest,
-      props.ios
+      iosProps
     );
 
     // Ensure Expo.plist is present in the framework resources phase when
@@ -90,7 +97,7 @@ export const withBrownfieldIos: ConfigPlugin<
       );
     }
 
-    addSourceFilesBuildPhase(project, frameworkTargetUUID, props.ios);
+    addSourceFilesBuildPhase(project, frameworkTargetUUID, iosProps);
 
     return xcodeConfig;
   });

package/src/expo-config-plugin/ios/withFmtFix.ts

@@ -4,8 +4,27 @@ import type { ResolvedBrownfieldPluginConfigWithIos } from '../types';
 
 const FMT_FIX_MARKER =
   '# Fix fmt 11.0.2 consteval compilation error with Xcode 26.4+';
+const FMT_FIX_MARKER_START = '# >>> react-native-brownfield fmt fix >>>';
+const FMT_FIX_MARKER_END = '# <<< react-native-brownfield fmt fix <<<';
+const LEGACY_FMT_FIX_BLOCK = new RegExp(
+  [
+    '\\n?\\s*',
+    escapeRegExp(FMT_FIX_MARKER),
+    "\\n\\s*fmt_base = File\\.join\\(installer\\.sandbox\\.pod_dir\\('fmt'\\), 'include', 'fmt', 'base\\.h'\\)",
+    '\\n\\s*if File\\.exist\\?\\(fmt_base\\)',
+    '\\n\\s*content = File\\.read\\(fmt_base\\)',
+    "\\n\\s*patched = content\\.gsub\\(/\\^#\\\\s\\*define FMT_USE_CONSTEVAL 1\\$/, '# define FMT_USE_CONSTEVAL 0'\\)",
+    '\\n\\s*if patched != content',
+    '\\n\\s*File\\.chmod\\(0644, fmt_base\\)',
+    '\\n\\s*File\\.write\\(fmt_base, patched\\)',
+    '\\n\\s*end',
+    '\\n\\s*end\\n?',
+  ].join(''),
+  'm'
+);
 
 const FMT_FIX_RUBY = `\
+    ${FMT_FIX_MARKER_START}
     ${FMT_FIX_MARKER}
     fmt_base = File.join(installer.sandbox.pod_dir('fmt'), 'include', 'fmt', 'base.h')
     if File.exist?(fmt_base)
@@ -15,14 +34,30 @@ const FMT_FIX_RUBY = `\
         File.chmod(0644, fmt_base)
         File.write(fmt_base, patched)
       end
-    end`;
+    end
+    ${FMT_FIX_MARKER_END}`;
+
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 
 export function injectFmtFixIntoPodfile(podfile: string): string {
-  if (podfile.includes(FMT_FIX_MARKER)) {
-    return podfile;
+  const withoutLegacyBlock = podfile.replace(LEGACY_FMT_FIX_BLOCK, '\n');
+  const existingBlockPattern = new RegExp(
+    `\\n?\\s*${escapeRegExp(FMT_FIX_MARKER_START)}[\\s\\S]*?${escapeRegExp(
+      FMT_FIX_MARKER_END
+    )}\\n?`,
+    'm'
+  );
+
+  if (existingBlockPattern.test(withoutLegacyBlock)) {
+    return withoutLegacyBlock.replace(
+      existingBlockPattern,
+      `\n${FMT_FIX_RUBY}\n`
+    );
   }
 
-  const lines = podfile.split('\n');
+  const lines = withoutLegacyBlock.split('\n');
   const postInstallIndex = lines.findIndex((line) =>
     /^\s*post_install do \|installer\|/.test(line)
   );
@@ -31,24 +66,19 @@ export function injectFmtFixIntoPodfile(podfile: string): string {
     return podfile;
   }
 
-  let depth = 0;
+  const baseIndent = lines[postInstallIndex].match(/^(\s*)/)?.[1].length ?? 0;
   let insertionIndex = -1;
 
-  for (let index = postInstallIndex; index < lines.length; index += 1) {
-    const trimmed = lines[index].trim();
-
-    if (trimmed.endsWith(' do |installer|')) {
-      depth += 1;
+  for (let index = postInstallIndex + 1; index < lines.length; index += 1) {
+    const endMatch = lines[index].match(/^(\s*)end\s*$/);
+    if (!endMatch) {
       continue;
     }
 
-    if (trimmed === 'end') {
-      depth -= 1;
-
-      if (depth === 0) {
-        insertionIndex = index;
-        break;
-      }
+    const endIndent = endMatch[1].length;
+    if (endIndent === baseIndent) {
+      insertionIndex = index;
+      break;
     }
   }