@callstack/react-native-brownfield 3.13.1 → 3.14.0

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;
 
@@ -49,10 +49,19 @@ 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'>;

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

package/src/expo-config-plugin/withBrownfield.ts

@@ -4,7 +4,12 @@ import {
   type ConfigPlugin,
   type StaticPlugin,
 } from '@expo/config-plugins';
-import type { ExpoConfig } from '@expo/config-types';
+
+import {
+  assertNoConfigFilePluginOverlap,
+  loadBrownfieldConfig,
+  resolveBrownfieldPluginConfig,
+} from '@callstack/brownfield-cli/expo-plugin-config';
 
 import { withBrownfieldIos } from './ios/withBrownfieldIos';
 import { withBrownfieldAndroid } from './android/withBrownfieldAndroid';
@@ -15,49 +20,6 @@ import type {
 
 import { Logger } from './logging';
 
-/**
- * Resolves the plugin configuration using provided config and config defaults.
- * @param config The user-provided Brownfield configuration.
- * @param expoConfig The Expo configuration object.
- * @returns The resolved Brownfield configuration.
- */
-function resolveConfig(
-  config: BrownfieldPluginConfig = {},
-  expoConfig: ExpoConfig
-): ResolvedBrownfieldPluginConfig {
-  Logger.setIsDebug(config.debug ?? false);
-
-  const androidPackage = expoConfig.android?.package;
-  const androidModuleName = config.android?.moduleName ?? 'brownfieldlib';
-
-  return {
-    ios: expoConfig.ios
-      ? {
-          frameworkName: config.ios?.frameworkName ?? 'BrownfieldLib',
-          bundleIdentifier:
-            config.ios?.bundleIdentifier ??
-            `${expoConfig.ios.bundleIdentifier}.brownfield`,
-          buildSettings: config.ios?.buildSettings ?? {},
-          deploymentTarget: config.ios?.deploymentTarget ?? '15.0',
-          frameworkVersion: config.ios?.frameworkVersion ?? '1',
-        }
-      : null,
-    android: androidPackage
-      ? {
-          moduleName: androidModuleName,
-          packageName: config.android?.packageName ?? androidPackage,
-          minSdkVersion: config.android?.minSdkVersion ?? 24,
-          targetSdkVersion: config.android?.targetSdkVersion ?? 35,
-          compileSdkVersion: config.android?.compileSdkVersion ?? 35,
-          groupId: config.android?.groupId ?? androidPackage,
-          artifactId: config.android?.artifactId ?? androidModuleName,
-          version: config.android?.version ?? '0.0.1-SNAPSHOT',
-        }
-      : null,
-    debug: config.debug ?? false,
-  };
-}
-
 /**
  * React Native Brownfield - Expo Config Plugin.
  *
@@ -90,7 +52,15 @@ const withBrownfield: ConfigPlugin<BrownfieldPluginConfig | void> = (
   config,
   props = {}
 ) => {
-  const resolvedConfig = resolveConfig(props ?? {}, config);
+  const pluginProps = props ?? {};
+  const fileConfig = loadBrownfieldConfig();
+
+  assertNoConfigFilePluginOverlap(fileConfig, pluginProps);
+
+  const resolvedConfig: ResolvedBrownfieldPluginConfig =
+    resolveBrownfieldPluginConfig(pluginProps, fileConfig, config);
+
+  Logger.setIsDebug(resolvedConfig.debug);
 
   const plugins: (ConfigPlugin | StaticPlugin)[] = [];