@callstack/react-native-brownfield 3.13.2 → 3.15.0

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;
     }
   }
 

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

@@ -186,7 +186,9 @@ export type PbxReferenceLike = { value?: string; comment?: string } | string;
 
 export type PbxNativeTarget = {
   buildPhases?: PbxReferenceLike[];
+  buildConfigurationList?: string;
   name?: string;
+  productReference?: string;
 };
 
 export type PbxResourcesBuildPhase = {
@@ -428,7 +430,7 @@ export function getFrameworkBuildSettings(
 
     // basic settings
     PRODUCT_BUNDLE_IDENTIFIER: `"${bundleIdentifier}"`,
-    IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
+    IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget ?? '15.0',
 
     // Ensure the BrownfieldLib (or equivalent name) is installed at the correct path
     DYLIB_INSTALL_NAME_BASE: '"@rpath"',
@@ -681,6 +683,65 @@ function resolveAppTargetName(
   return null;
 }
 
+function normalizeXcodeBuildSettingValue(
+  value: string | number | boolean | null | undefined
+): string | null {
+  if (value == null) {
+    return null;
+  }
+
+  const normalized = IOSConfig.XcodeUtils.unquote(String(value)).trim();
+  return normalized.length > 0 ? normalized : null;
+}
+
+export function getAppTargetDeploymentTarget(
+  project: Pick<XcodeProject, 'getBuildProperty'>,
+  appTargetName: string | null
+): string | null {
+  if (!appTargetName) {
+    return null;
+  }
+
+  return (
+    normalizeXcodeBuildSettingValue(
+      project.getBuildProperty(
+        'IPHONEOS_DEPLOYMENT_TARGET',
+        'Release',
+        appTargetName
+      )
+    ) ??
+    normalizeXcodeBuildSettingValue(
+      project.getBuildProperty(
+        'IPHONEOS_DEPLOYMENT_TARGET',
+        'Debug',
+        appTargetName
+      )
+    )
+  );
+}
+
+export function resolveFrameworkDeploymentTarget(
+  project: XcodeProject,
+  modRequest: ModProps<XcodeProject>,
+  {
+    fallbackDeploymentTarget,
+  }: {
+    fallbackDeploymentTarget?: string;
+  }
+): string {
+  if (fallbackDeploymentTarget != null) {
+    return fallbackDeploymentTarget;
+  }
+
+  const appTargetName = resolveAppTargetName(project, modRequest);
+  const appTargetDeploymentTarget = getAppTargetDeploymentTarget(
+    project,
+    appTargetName
+  );
+
+  return appTargetDeploymentTarget ?? '15.0';
+}
+
 /**
  * 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/src/expo-config-plugin/template/android/build.gradle.kts

@@ -1,4 +1,3 @@
-import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 
 plugins {
@@ -9,6 +8,24 @@ plugins {
     id("com.facebook.react")
 }
 
+fun resolveRootProjectInt(name: String): Int {
+    val extraProperties = rootProject.extensions.extraProperties
+    val value =
+        when {
+            extraProperties.has(name) -> extraProperties.get(name)
+            rootProject.findProperty(name) != null -> rootProject.findProperty(name)
+            rootProject.findProperty("android.$name") != null -> rootProject.findProperty("android.$name")
+            else -> error("Unable to resolve root project property '$name' for Brownfield Android packaging.")
+        }
+
+    return when (value) {
+        is Int -> value
+        is Number -> value.toInt()
+        is String -> value.toInt()
+        else -> value.toString().toInt()
+    }
+}
+
 publishing {
     publications {
         create<MavenPublication>("mavenAar") {
@@ -36,6 +53,7 @@ android {
 
     defaultConfig {
         minSdk = {{MIN_SDK_VERSION}}
+        targetSdk = {{TARGET_SDK_VERSION}}
 
         buildConfigField(
             "boolean",

package/src/expo-config-plugin/types/android/BrownfieldPluginAndroidConfig.ts

@@ -22,13 +22,13 @@ export interface BrownfieldPluginAndroidConfig {
 
   /**
    * 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;
 
@@ -61,5 +61,7 @@ export interface BrownfieldPluginAndroidConfig {
 /**
  * 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'>;

package/src/expo-config-plugin/types/ios/BrownfieldPluginIosConfig.ts

@@ -22,7 +22,7 @@ export interface BrownfieldPluginIosConfig {
 
   /**
    * Minimum iOS deployment target
-   * @default "15.0"
+   * @default inherited from the generated Expo app target when available
    */
   deploymentTarget?: string;
 
@@ -37,5 +37,7 @@ 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'>;