diff --git a/.changeset/hip-flies-guess.md b/.changeset/hip-flies-guess.md new file mode 100644 index 00000000..3db5bf85 --- /dev/null +++ b/.changeset/hip-flies-guess.md @@ -0,0 +1,8 @@ +--- +'@callstack/react-native-brownfield': minor +'@callstack/brownfield-navigation': minor +'@callstack/brownie': minor +'@callstack/brownfield-cli': minor +--- + +Expo SDK 56 support diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72e09b95..78d0539d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: outputs: packages: ${{ steps.filter.outputs.packages }} rnapp: ${{ steps.filter.outputs.rnapp }} - expo54: ${{ steps.filter.outputs.expo54 }} expo55: ${{ steps.filter.outputs.expo55 }} + expo56: ${{ steps.filter.outputs.expo56 }} androidapp: ${{ steps.filter.outputs.androidapp }} appleapp: ${{ steps.filter.outputs.appleapp }} ci: ${{ steps.filter.outputs.ci }} @@ -41,12 +41,12 @@ jobs: rnapp: - 'apps/RNApp/**' - 'apps/brownfield-example-shared-tests/**' - expo54: - - 'apps/ExpoApp54/**' - - 'apps/brownfield-example-shared-tests/**' expo55: - 'apps/ExpoApp55/**' - 'apps/brownfield-example-shared-tests/**' + expo56: + - 'apps/ExpoApp56/**' + - 'apps/brownfield-example-shared-tests/**' androidapp: - 'apps/AndroidApp/**' appleapp: @@ -130,8 +130,8 @@ jobs: if: | always() && ( - needs.filter.outputs.expo54 == 'true' || needs.filter.outputs.expo55 == 'true' || + needs.filter.outputs.expo56 == 'true' || needs.filter.outputs.androidapp == 'true' || needs.filter.outputs.packages == 'true' || needs.filter.outputs.ci == 'true' @@ -140,8 +140,8 @@ jobs: strategy: matrix: include: - - version: '54' - version: '55' + - version: '56' steps: - name: Checkout @@ -214,8 +214,8 @@ jobs: if: | always() && ( - needs.filter.outputs.expo54 == 'true' || needs.filter.outputs.expo55 == 'true' || + needs.filter.outputs.expo56 == 'true' || needs.filter.outputs.appleapp == 'true' || needs.filter.outputs.packages == 'true' || needs.filter.outputs.ci == 'true' @@ -224,10 +224,10 @@ jobs: strategy: matrix: include: - - version: '54' - run-e2e: 'false' - version: '55' run-e2e: 'true' + - version: '56' + run-e2e: 'true' steps: - name: Checkout diff --git a/.yarn/patches/@rock-js-platform-apple-helpers-npm-0.13.5-faad2245ce.patch b/.yarn/patches/@rock-js-platform-apple-helpers-npm-0.13.5-faad2245ce.patch new file mode 100644 index 00000000..116c03d9 --- /dev/null +++ b/.yarn/patches/@rock-js-platform-apple-helpers-npm-0.13.5-faad2245ce.patch @@ -0,0 +1,257 @@ +diff --git a/dist/src/lib/utils/mergeFrameworks.js b/dist/src/lib/utils/mergeFrameworks.js +index 31aa95bf419abdc80cad6c2518816414e2068333..cfca8190c51e919a3edb68f9369f6b99e6f730db 100644 +--- a/dist/src/lib/utils/mergeFrameworks.js ++++ b/dist/src/lib/utils/mergeFrameworks.js +@@ -1,33 +1,238 @@ + import fs, { existsSync } from 'node:fs'; ++import os from 'node:os'; + import path from 'node:path'; + import { color, logger } from '@rock-js/tools'; + import { runXcodebuild } from './runXcodebuild.js'; ++function ensureDirectory(targetPath) { ++ fs.mkdirSync(targetPath, { recursive: true }); ++} ++function copyFile(sourcePath, destinationPath) { ++ ensureDirectory(path.dirname(destinationPath)); ++ fs.copyFileSync(sourcePath, destinationPath); ++} ++function copyDirectory(sourcePath, destinationPath) { ++ ensureDirectory(path.dirname(destinationPath)); ++ fs.cpSync(sourcePath, destinationPath, { recursive: true, force: true }); ++} ++function createFrameworkInfoPlist(frameworkName) { ++ return ` ++ ++ ++ ++ CFBundleExecutable ++ ${frameworkName} ++ CFBundleIdentifier ++ dev.rock.generated.${frameworkName} ++ CFBundleName ++ ${frameworkName} ++ CFBundlePackageType ++ FMWK ++ CFBundleShortVersionString ++ 1.0 ++ CFBundleVersion ++ 1 ++ ++ ++`; ++} ++function createFrameworkModuleMap({ frameworkName, umbrellaHeaderName, swiftHeaderName, }) { ++ const swiftModuleBlock = swiftHeaderName ++ ? ` ++ ++module ${frameworkName}.Swift { ++ header "../Headers/${swiftHeaderName}" ++ requires objc ++} ++` ++ : ''; ++ return `framework module ${frameworkName} { ++ umbrella header "../Headers/${umbrellaHeaderName}" ++ ++ export * ++ module * { export * } ++}${swiftModuleBlock} ++`; ++} ++function createGeneratedUmbrellaHeader({ frameworkName, headerNames, }) { ++ const imports = headerNames ++ .filter((headerName) => headerName !== `${frameworkName}-Swift.h`) ++ .map((headerName) => `#import "${headerName}"`) ++ .join('\n'); ++ return `${imports}${imports ? '\n\n' : ''}FOUNDATION_EXPORT double ${frameworkName}VersionNumber; ++FOUNDATION_EXPORT const unsigned char ${frameworkName}VersionString[]; ++`; ++} ++function collectLocalUmbrellaImports(umbrellaHeader, frameworkName) { ++ const imports = []; ++ const importPattern = /^\s*#import\s+(?:"([^"]+)"|<([^>]+)>)/gm; ++ let match; ++ while ((match = importPattern.exec(umbrellaHeader)) !== null) { ++ const quotedImport = match[1]; ++ const angledImport = match[2]; ++ if (quotedImport) { ++ imports.push(path.basename(quotedImport)); ++ continue; ++ } ++ if (!angledImport) { ++ continue; ++ } ++ const [moduleName, headerName] = angledImport.split('/'); ++ if (moduleName === frameworkName && headerName) { ++ imports.push(path.basename(headerName)); ++ } ++ } ++ return imports; ++} ++function collectFoundationExports(umbrellaHeader) { ++ return umbrellaHeader.match(/^\s*FOUNDATION_EXPORT\b.*$/gm)?.map((line) => line.trim()) ?? []; ++} ++function renderSanitizedUmbrellaHeader({ frameworkName, headerNames, foundationExports, }) { ++ const imports = headerNames.map((headerName) => `#import "${headerName}"`).join('\n'); ++ const foundationExportPrelude = `#ifndef FOUNDATION_EXPORT ++#if defined(__cplusplus) ++#define FOUNDATION_EXPORT extern "C" ++#else ++#define FOUNDATION_EXPORT extern ++#endif ++#endif`; ++ const exports = foundationExports.length > 0 ++ ? foundationExports.join('\n') ++ : `FOUNDATION_EXPORT double ${frameworkName}VersionNumber;\nFOUNDATION_EXPORT const unsigned char ${frameworkName}VersionString[];`; ++ return `${imports}${imports ? '\n\n' : ''}${foundationExportPrelude}\n\n${exports}\n`; ++} ++function sanitizeUmbrellaHeader({ frameworkName, headersDir, umbrellaHeaderName, }) { ++ const umbrellaHeaderPath = path.join(headersDir, umbrellaHeaderName); ++ if (!existsSync(umbrellaHeaderPath)) { ++ return; ++ } ++ const umbrellaHeader = fs.readFileSync(umbrellaHeaderPath, 'utf8'); ++ const localImports = collectLocalUmbrellaImports(umbrellaHeader, frameworkName); ++ if (localImports.length === 0) { ++ return; ++ } ++ const availableImports = localImports.filter((headerName) => existsSync(path.join(headersDir, headerName))); ++ if (availableImports.length === localImports.length) { ++ return; ++ } ++ fs.writeFileSync(umbrellaHeaderPath, renderSanitizedUmbrellaHeader({ ++ frameworkName, ++ headerNames: availableImports, ++ foundationExports: collectFoundationExports(umbrellaHeader), ++ }), 'utf8'); ++} ++function resolveFrameworkName(frameworkPath) { ++ return path.basename(frameworkPath, '.framework'); ++} ++function createFrameworkWrapper(frameworkPath) { ++ const frameworkName = resolveFrameworkName(frameworkPath); ++ const buildProductPath = path.dirname(frameworkPath); ++ const staticLibraryPath = path.join(buildProductPath, `lib${frameworkName}.a`); ++ if (!existsSync(staticLibraryPath)) { ++ throw new Error(`Could not find framework or static library for ${frameworkName} at ${frameworkPath}`); ++ } ++ const frameworkTempDir = fs.mkdtempSync(path.join(os.tmpdir(), `${frameworkName.toLowerCase()}-framework-`)); ++ const frameworkDir = path.join(frameworkTempDir, `${frameworkName}.framework`); ++ const headersDir = path.join(frameworkDir, 'Headers'); ++ const modulesDir = path.join(frameworkDir, 'Modules'); ++ const swiftModuleSourceDir = path.join(buildProductPath, `${frameworkName}.swiftmodule`); ++ const swiftCompatibilityHeaderPath = path.join(buildProductPath, 'Swift Compatibility Header', `${frameworkName}-Swift.h`); ++ const umbrellaHeaderPath = path.join(buildProductPath, `${frameworkName}-umbrella.h`); ++ const moduleMapPath = path.join(buildProductPath, `${frameworkName}.modulemap`); ++ ensureDirectory(headersDir); ++ ensureDirectory(modulesDir); ++ copyFile(staticLibraryPath, path.join(frameworkDir, frameworkName)); ++ const copiedHeaderNames = []; ++ const copiedHeaders = new Set(); ++ const copyHeaderIfPresent = (sourcePath, destinationName = path.basename(sourcePath)) => { ++ if (!existsSync(sourcePath) || copiedHeaders.has(destinationName)) { ++ return; ++ } ++ copyFile(sourcePath, path.join(headersDir, destinationName)); ++ copiedHeaders.add(destinationName); ++ copiedHeaderNames.push(destinationName); ++ }; ++ if (existsSync(buildProductPath)) { ++ for (const entry of fs.readdirSync(buildProductPath, { withFileTypes: true })) { ++ if (entry.isFile() && entry.name.endsWith('.h')) { ++ copyHeaderIfPresent(path.join(buildProductPath, entry.name), entry.name); ++ } ++ } ++ } ++ copyHeaderIfPresent(umbrellaHeaderPath, `${frameworkName}-umbrella.h`); ++ copyHeaderIfPresent(moduleMapPath, `${frameworkName}.modulemap`); ++ copyHeaderIfPresent(swiftCompatibilityHeaderPath, `${frameworkName}-Swift.h`); ++ if (existsSync(swiftModuleSourceDir)) { ++ copyDirectory(swiftModuleSourceDir, path.join(modulesDir, `${frameworkName}.swiftmodule`)); ++ } ++ let umbrellaHeaderName = `${frameworkName}-umbrella.h`; ++ if (!copiedHeaders.has(umbrellaHeaderName)) { ++ umbrellaHeaderName = `${frameworkName}-generated-umbrella.h`; ++ fs.writeFileSync(path.join(headersDir, umbrellaHeaderName), createGeneratedUmbrellaHeader({ ++ frameworkName, ++ headerNames: copiedHeaderNames, ++ }), 'utf8'); ++ } ++ else { ++ sanitizeUmbrellaHeader({ ++ frameworkName, ++ headersDir, ++ umbrellaHeaderName, ++ }); ++ } ++ const swiftHeaderName = copiedHeaders.has(`${frameworkName}-Swift.h`) ++ ? `${frameworkName}-Swift.h` ++ : undefined; ++ fs.writeFileSync(path.join(modulesDir, 'module.modulemap'), createFrameworkModuleMap({ ++ frameworkName, ++ umbrellaHeaderName, ++ swiftHeaderName, ++ }), 'utf8'); ++ fs.writeFileSync(path.join(frameworkDir, 'Info.plist'), createFrameworkInfoPlist(frameworkName), 'utf8'); ++ return frameworkDir; ++} ++function resolveFrameworkInputPath(frameworkPath, temporaryFrameworkPaths) { ++ if (existsSync(frameworkPath)) { ++ return frameworkPath; ++ } ++ const synthesizedFrameworkPath = createFrameworkWrapper(frameworkPath); ++ temporaryFrameworkPaths.push(path.dirname(synthesizedFrameworkPath)); ++ return synthesizedFrameworkPath; ++} + /** + * Xcode emits different `.framework` file based on the destination (simulator arm64/x86_64, iphone arm64 etc.) + * This takes those `.frameworks` files and merges them to a single `.xcframework` file for easier distribution. + */ + export async function mergeFrameworks({ frameworkPaths, outputPath, sourceDir, }) { + const xcframeworkName = path.basename(outputPath); ++ const temporaryFrameworkPaths = []; + if (existsSync(outputPath)) { + logger.debug(`Removing existing merged framework output at ${outputPath}`); + fs.rmSync(outputPath, { recursive: true, force: true }); + } +- const xcodebuildArgs = [ +- '-create-xcframework', +- ...frameworkPaths.flatMap((frameworkPath) => ['-framework', frameworkPath]), +- '-output', +- outputPath, +- ]; +- const { errorSummary } = await runXcodebuild(xcodebuildArgs, { +- cwd: sourceDir, +- }); +- if (errorSummary) { +- throw new Error('Running xcodebuild failed', { +- cause: errorSummary, ++ try { ++ const resolvedFrameworkPaths = frameworkPaths.map((frameworkPath) => resolveFrameworkInputPath(frameworkPath, temporaryFrameworkPaths)); ++ const xcodebuildArgs = [ ++ '-create-xcframework', ++ ...resolvedFrameworkPaths.flatMap((frameworkPath) => ['-framework', frameworkPath]), ++ '-output', ++ outputPath, ++ ]; ++ const { errorSummary } = await runXcodebuild(xcodebuildArgs, { ++ cwd: sourceDir, + }); ++ if (errorSummary) { ++ throw new Error('Running xcodebuild failed', { ++ cause: errorSummary, ++ }); ++ } ++ else { ++ logger.success(`Created ${color.bold(xcframeworkName)}`); ++ } + } +- else { +- logger.success(`Created ${color.bold(xcframeworkName)}`); ++ finally { ++ for (const temporaryFrameworkPath of temporaryFrameworkPaths) { ++ fs.rmSync(temporaryFrameworkPath, { recursive: true, force: true }); ++ } + } + } + //# sourceMappingURL=mergeFrameworks.js.map diff --git a/apps/AndroidApp/app/build.gradle.kts b/apps/AndroidApp/app/build.gradle.kts index ce3fd9b8..d6f7866c 100644 --- a/apps/AndroidApp/app/build.gradle.kts +++ b/apps/AndroidApp/app/build.gradle.kts @@ -36,6 +36,9 @@ android { create("expo55") { dimension = "app" } + create("expo56") { + dimension = "app" + } create("expobeta") { dimension = "app" } @@ -76,8 +79,9 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.appcompat) add("expo55Implementation", libs.brownfieldlib.expo55) - add("expobetaImplementation", libs.brownfieldlib.expobeta) + add("expo56Implementation", libs.brownfieldlib.expo56) add("expo54Implementation", libs.brownfieldlib.expo54) + add("expobetaImplementation", libs.brownfieldlib.expobeta) add("vanillaImplementation", libs.brownfieldlib.vanilla) implementation(libs.androidx.fragment.compose) diff --git a/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/BrownfieldStore.kt b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/BrownfieldStore.kt new file mode 100644 index 00000000..c9e8fa11 --- /dev/null +++ b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/BrownfieldStore.kt @@ -0,0 +1,4 @@ +package com.callstack.brownfield.android.example + +typealias BrownfieldStore = com.callstack.rnbrownfield.demo.expoapp56.BrownfieldStore +typealias User = com.callstack.rnbrownfield.demo.expoapp56.User diff --git a/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeConstants.kt b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeConstants.kt new file mode 100644 index 00000000..dfd59f51 --- /dev/null +++ b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeConstants.kt @@ -0,0 +1,6 @@ +package com.callstack.brownfield.android.example + +object ReactNativeConstants { + const val MAIN_MODULE_NAME = "main" + const val APP_NAME = "Android (Expo 56)" +} diff --git a/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeHostManager.kt b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeHostManager.kt new file mode 100644 index 00000000..c317ce58 --- /dev/null +++ b/apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeHostManager.kt @@ -0,0 +1,3 @@ +package com.callstack.brownfield.android.example + +typealias ReactNativeHostManager = com.callstack.rnbrownfield.demo.expoapp56.ReactNativeHostManager diff --git a/apps/AndroidApp/gradle/libs.versions.toml b/apps/AndroidApp/gradle/libs.versions.toml index f52bd562..b72dcfc6 100644 --- a/apps/AndroidApp/gradle/libs.versions.toml +++ b/apps/AndroidApp/gradle/libs.versions.toml @@ -16,6 +16,7 @@ gson = "2.13.2" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +brownfieldlib-expo56 = { module = "com.callstack.rnbrownfield.demo.expoapp56:brownfieldlib", version.ref = "brownfieldlib" } brownfieldlib-expo55 = { module = "com.callstack.rnbrownfield.demo.expoapp55:brownfieldlib", version.ref = "brownfieldlib" } brownfieldlib-expobeta = { module = "com.callstack.rnbrownfield.demo.expobeta:brownfieldlib", version.ref = "brownfieldlib" } brownfieldlib-expo54 = { module = "com.callstack.rnbrownfield.demo.expoapp54:brownfieldlib", version.ref = "brownfieldlib" } @@ -41,4 +42,3 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } - diff --git a/apps/AndroidApp/package.json b/apps/AndroidApp/package.json index 8ee08845..af635291 100644 --- a/apps/AndroidApp/package.json +++ b/apps/AndroidApp/package.json @@ -3,7 +3,8 @@ "version": "0.0.1", "private": true, "scripts": { - "build:example:android-consumer:expo": "./gradlew assembleExpo55Release", + "build:example:android-consumer:expo": "./gradlew assembleExpo56Release", + "build:example:android-consumer:expo56": "./gradlew assembleExpo56Release", "build:example:android-consumer:expo55": "./gradlew assembleExpo55Release", "build:example:android-consumer:expobeta": "./gradlew assembleExpobetaRelease", "build:example:android-consumer:expo54": "./gradlew assembleExpo54Release", diff --git a/apps/AppleApp/.detoxrc.expo56.cjs b/apps/AppleApp/.detoxrc.expo56.cjs new file mode 100644 index 00000000..dc21d80f --- /dev/null +++ b/apps/AppleApp/.detoxrc.expo56.cjs @@ -0,0 +1,17 @@ +const { + createAppleAppIosSimDebugDetoxConfig, +} = require('../brownfield-example-shared-tests/detox-rc-appleapp-ios-sim-debug.cjs'); +const { + getAppleAppDetoxVariant, +} = require('../brownfield-example-shared-tests/detox-appleapp-variants.cjs'); + +const variant = getAppleAppDetoxVariant('expo56'); + +/** @type {import('detox').DetoxConfig} */ +module.exports = createAppleAppIosSimDebugDetoxConfig({ + scheme: variant.scheme, + configuration: variant.configuration, + appBinaryName: variant.appBinaryName, + detoxConfiguration: variant.detoxConfiguration, + jestConfigPath: 'e2e/jest.config.expo56.cjs', +}); diff --git a/apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj b/apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj index a8cc22ca..de638d37 100644 --- a/apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj +++ b/apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj @@ -7,6 +7,28 @@ objects = { /* Begin PBXBuildFile section */ + 61591FDB2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDA2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework */; }; + 61591FDC2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDA2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FDF2FF3D71E00BEFE92 /* ExpoFont.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDD2FF3D71E00BEFE92 /* ExpoFont.xcframework */; }; + 61591FE02FF3D71E00BEFE92 /* ExpoFont.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDD2FF3D71E00BEFE92 /* ExpoFont.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FE12FF3D71E00BEFE92 /* ExpoFileSystem.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDE2FF3D71E00BEFE92 /* ExpoFileSystem.xcframework */; }; + 61591FE22FF3D71E00BEFE92 /* ExpoFileSystem.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FDE2FF3D71E00BEFE92 /* ExpoFileSystem.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FE42FF3DC2100BEFE92 /* ExpoModulesCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE32FF3DC2100BEFE92 /* ExpoModulesCore.xcframework */; }; + 61591FE52FF3DC2100BEFE92 /* ExpoModulesCore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE32FF3DC2100BEFE92 /* ExpoModulesCore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FE72FF3DD6700BEFE92 /* ExpoImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE62FF3DD6700BEFE92 /* ExpoImage.xcframework */; }; + 61591FE82FF3DD6700BEFE92 /* ExpoImage.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE62FF3DD6700BEFE92 /* ExpoImage.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FEA2FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE92FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework */; }; + 61591FEB2FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FE92FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FF02FF3E3E200BEFE92 /* SDWebImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FEF2FF3E3E200BEFE92 /* SDWebImage.xcframework */; }; + 61591FF12FF3E3E300BEFE92 /* SDWebImage.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FEF2FF3E3E200BEFE92 /* SDWebImage.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FF52FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF22FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework */; }; + 61591FF62FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF22FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FF72FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF32FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework */; }; + 61591FF82FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF32FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FF92FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF42FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework */; }; + 61591FFA2FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FF42FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 61591FFC2FF3E43500BEFE92 /* libavif.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FFB2FF3E43500BEFE92 /* libavif.xcframework */; }; + 61591FFD2FF3E43500BEFE92 /* libavif.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61591FFB2FF3E43500BEFE92 /* libavif.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 795327712FB4A902008398F3 /* BrownfieldLib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */; }; 795327722FB4A902008398F3 /* BrownfieldLib.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 795327732FB4A904008398F3 /* BrownfieldNavigation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */; }; @@ -45,6 +67,20 @@ 79B8BE932FB7273600B94C6F /* hermesvm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99C2FB4A61400A5F42B /* hermesvm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 79B8BE942FB7273600B94C6F /* BrownfieldLib.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 79B8BE952FB7273600B94C6F /* React.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99D2FB4A61400A5F42B /* React.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEA02FB8000000B94C6F /* Brownie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99B2FB4A61400A5F42B /* Brownie.xcframework */; }; + 79B8BEA12FB8000000B94C6F /* BrownfieldNavigation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */; }; + 79B8BEA22FB8000000B94C6F /* ReactNativeDependencies.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99F2FB4A61400A5F42B /* ReactNativeDependencies.xcframework */; }; + 79B8BEA32FB8000000B94C6F /* hermesvm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99C2FB4A61400A5F42B /* hermesvm.xcframework */; }; + 79B8BEA42FB8000000B94C6F /* ReactBrownfield.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99E2FB4A61400A5F42B /* ReactBrownfield.xcframework */; }; + 79B8BEA52FB8000000B94C6F /* BrownfieldLib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */; }; + 79B8BEA62FB8000000B94C6F /* React.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99D2FB4A61400A5F42B /* React.xcframework */; }; + 79B8BEA72FB8000000B94C6F /* Brownie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99B2FB4A61400A5F42B /* Brownie.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEA82FB8000000B94C6F /* ReactBrownfield.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99E2FB4A61400A5F42B /* ReactBrownfield.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEA92FB8000000B94C6F /* ReactNativeDependencies.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99F2FB4A61400A5F42B /* ReactNativeDependencies.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEAA2FB8000000B94C6F /* BrownfieldNavigation.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEAB2FB8000000B94C6F /* hermesvm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99C2FB4A61400A5F42B /* hermesvm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEAC2FB8000000B94C6F /* BrownfieldLib.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 79B8BEAD2FB8000000B94C6F /* React.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99D2FB4A61400A5F42B /* React.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 7A1B2C3D4E5F60718293A101 /* Brownie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99B2FB4A61400A5F42B /* Brownie.xcframework */; }; 7A1B2C3D4E5F60718293A102 /* BrownfieldNavigation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */; }; 7A1B2C3D4E5F60718293A103 /* ReactNativeDependencies.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B1D99F2FB4A61400A5F42B /* ReactNativeDependencies.xcframework */; }; @@ -111,6 +147,34 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 79B8BEAE2FB8000000B94C6F /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 61591FEB2FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework in Embed Frameworks */, + 79B8BEA72FB8000000B94C6F /* Brownie.xcframework in Embed Frameworks */, + 79B8BEA82FB8000000B94C6F /* ReactBrownfield.xcframework in Embed Frameworks */, + 61591FFA2FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework in Embed Frameworks */, + 79B8BEA92FB8000000B94C6F /* ReactNativeDependencies.xcframework in Embed Frameworks */, + 61591FF62FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework in Embed Frameworks */, + 61591FE82FF3DD6700BEFE92 /* ExpoImage.xcframework in Embed Frameworks */, + 79B8BEAA2FB8000000B94C6F /* BrownfieldNavigation.xcframework in Embed Frameworks */, + 61591FE52FF3DC2100BEFE92 /* ExpoModulesCore.xcframework in Embed Frameworks */, + 61591FFD2FF3E43500BEFE92 /* libavif.xcframework in Embed Frameworks */, + 61591FDC2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework in Embed Frameworks */, + 61591FF82FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework in Embed Frameworks */, + 79B8BEAB2FB8000000B94C6F /* hermesvm.xcframework in Embed Frameworks */, + 61591FE22FF3D71E00BEFE92 /* ExpoFileSystem.xcframework in Embed Frameworks */, + 79B8BEAC2FB8000000B94C6F /* BrownfieldLib.xcframework in Embed Frameworks */, + 79B8BEAD2FB8000000B94C6F /* React.xcframework in Embed Frameworks */, + 61591FE02FF3D71E00BEFE92 /* ExpoFont.xcframework in Embed Frameworks */, + 61591FF12FF3E3E300BEFE92 /* SDWebImage.xcframework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 7A1B2C3D4E5F60718293A201 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -131,6 +195,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 61591FDA2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoModulesJSI.xcframework; path = package/ExpoModulesJSI.xcframework; sourceTree = ""; }; + 61591FDD2FF3D71E00BEFE92 /* ExpoFont.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoFont.xcframework; path = package/ExpoFont.xcframework; sourceTree = ""; }; + 61591FDE2FF3D71E00BEFE92 /* ExpoFileSystem.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoFileSystem.xcframework; path = package/ExpoFileSystem.xcframework; sourceTree = ""; }; + 61591FE32FF3DC2100BEFE92 /* ExpoModulesCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoModulesCore.xcframework; path = package/ExpoModulesCore.xcframework; sourceTree = ""; }; + 61591FE62FF3DD6700BEFE92 /* ExpoImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoImage.xcframework; path = package/ExpoImage.xcframework; sourceTree = ""; }; + 61591FE92FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ExpoModulesWorklets.xcframework; path = package/ExpoModulesWorklets.xcframework; sourceTree = ""; }; + 61591FEF2FF3E3E200BEFE92 /* SDWebImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImage.xcframework; path = "../ExpoApp56/node_modules/expo-image/prebuilds/spm-deps/SDWebImage/debug/SDWebImage.xcframework"; sourceTree = ""; }; + 61591FF22FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImageSVGCoder.xcframework; path = "../ExpoApp56/node_modules/expo-image/prebuilds/spm-deps/SDWebImageSVGCoder/debug/SDWebImageSVGCoder.xcframework"; sourceTree = ""; }; + 61591FF32FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImageWebPCoder.xcframework; path = "../ExpoApp56/node_modules/expo-image/prebuilds/spm-deps/SDWebImageWebPCoder/debug/SDWebImageWebPCoder.xcframework"; sourceTree = ""; }; + 61591FF42FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImageAVIFCoder.xcframework; path = "../ExpoApp56/node_modules/expo-image/prebuilds/spm-deps/SDWebImageAVIFCoder/debug/SDWebImageAVIFCoder.xcframework"; sourceTree = ""; }; + 61591FFB2FF3E43500BEFE92 /* libavif.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libavif.xcframework; path = "../ExpoApp56/node_modules/expo-image/prebuilds/spm-deps/libavif/debug/libavif.xcframework"; sourceTree = ""; }; 793C76A72EEBF938008A2A34 /* Brownfield Apple App (RNApp).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App (RNApp).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BrownfieldLib.xcframework; path = package/BrownfieldLib.xcframework; sourceTree = ""; }; 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BrownfieldNavigation.xcframework; path = package/BrownfieldNavigation.xcframework; sourceTree = ""; }; @@ -141,12 +216,50 @@ 79B1D99F2FB4A61400A5F42B /* ReactNativeDependencies.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReactNativeDependencies.xcframework; path = package/ReactNativeDependencies.xcframework; sourceTree = ""; }; 79B8BE802FB7270E00B94C6F /* Brownfield Apple App (ExpoApp54).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App (ExpoApp54).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 79B8BE9B2FB7273600B94C6F /* Brownfield Apple App (ExpoApp55).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App (ExpoApp55).app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 79B8BEB22FB8000000B94C6F /* Brownfield Apple App (ExpoApp56).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App (ExpoApp56).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 7A1B2C3D4E5F60718293A202 /* Brownfield Apple App (ExpoAppBeta).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App (ExpoAppBeta).app"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 79B8BE822FB7270F00B94C6F /* Exceptions for "Brownfield Apple App" folder in "Brownfield Apple App (ExpoApp54)" target */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Assets.xcassets, + BrownfieldAppleApp.swift, + components/ContentView.swift, + components/GreetingCard.swift, + components/MaterialCard.swift, + components/MessagesView.swift, + components/ReferralsScreen.swift, + components/SettingsScreen.swift, + components/Toast.swift, + ); + target = 79B8BE682FB7270E00B94C6F /* Brownfield Apple App (ExpoApp54) */; + }; + 7A1B2C3D4E5F60718293A203 /* Exceptions for "Brownfield Apple App" folder in "Brownfield Apple App (ExpoAppBeta)" target */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Assets.xcassets, + BrownfieldAppleApp.swift, + components/ContentView.swift, + components/GreetingCard.swift, + components/MaterialCard.swift, + components/MessagesView.swift, + components/ReferralsScreen.swift, + components/SettingsScreen.swift, + components/Toast.swift, + ); + target = 7A1B2C3D4E5F60718293A301 /* Brownfield Apple App (ExpoAppBeta) */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + /* Begin PBXFileSystemSynchronizedRootGroup section */ 793C76A92EEBF938008A2A34 /* Brownfield Apple App */ = { isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + 79B8BE822FB7270F00B94C6F /* Exceptions for "Brownfield Apple App" folder in "Brownfield Apple App (ExpoApp54)" target */, + 7A1B2C3D4E5F60718293A203 /* Exceptions for "Brownfield Apple App" folder in "Brownfield Apple App (ExpoAppBeta)" target */, + ); path = "Brownfield Apple App"; sourceTree = ""; }; @@ -193,6 +306,31 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 79B8BEAF2FB8000000B94C6F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 61591FEA2FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework in Frameworks */, + 79B8BEA02FB8000000B94C6F /* Brownie.xcframework in Frameworks */, + 79B8BEA12FB8000000B94C6F /* BrownfieldNavigation.xcframework in Frameworks */, + 61591FF92FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework in Frameworks */, + 79B8BEA22FB8000000B94C6F /* ReactNativeDependencies.xcframework in Frameworks */, + 61591FF52FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework in Frameworks */, + 61591FE72FF3DD6700BEFE92 /* ExpoImage.xcframework in Frameworks */, + 79B8BEA32FB8000000B94C6F /* hermesvm.xcframework in Frameworks */, + 61591FE42FF3DC2100BEFE92 /* ExpoModulesCore.xcframework in Frameworks */, + 61591FFC2FF3E43500BEFE92 /* libavif.xcframework in Frameworks */, + 61591FDB2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework in Frameworks */, + 61591FF72FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework in Frameworks */, + 79B8BEA42FB8000000B94C6F /* ReactBrownfield.xcframework in Frameworks */, + 61591FE12FF3D71E00BEFE92 /* ExpoFileSystem.xcframework in Frameworks */, + 79B8BEA52FB8000000B94C6F /* BrownfieldLib.xcframework in Frameworks */, + 79B8BEA62FB8000000B94C6F /* React.xcframework in Frameworks */, + 61591FDF2FF3D71E00BEFE92 /* ExpoFont.xcframework in Frameworks */, + 61591FF02FF3E3E200BEFE92 /* SDWebImage.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7A1B2C3D4E5F60718293A204 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -213,6 +351,17 @@ 6108E5322F40A26800EA8FA1 /* Frameworks */ = { isa = PBXGroup; children = ( + 61591FFB2FF3E43500BEFE92 /* libavif.xcframework */, + 61591FF42FF3E41C00BEFE92 /* SDWebImageAVIFCoder.xcframework */, + 61591FF22FF3E41C00BEFE92 /* SDWebImageSVGCoder.xcframework */, + 61591FF32FF3E41C00BEFE92 /* SDWebImageWebPCoder.xcframework */, + 61591FEF2FF3E3E200BEFE92 /* SDWebImage.xcframework */, + 61591FE92FF3DEA600BEFE92 /* ExpoModulesWorklets.xcframework */, + 61591FE62FF3DD6700BEFE92 /* ExpoImage.xcframework */, + 61591FE32FF3DC2100BEFE92 /* ExpoModulesCore.xcframework */, + 61591FDE2FF3D71E00BEFE92 /* ExpoFileSystem.xcframework */, + 61591FDD2FF3D71E00BEFE92 /* ExpoFont.xcframework */, + 61591FDA2FF399EC00BEFE92 /* ExpoModulesJSI.xcframework */, 79B1D9992FB4A61400A5F42B /* BrownfieldLib.xcframework */, 79B1D99A2FB4A61400A5F42B /* BrownfieldNavigation.xcframework */, 79B1D99B2FB4A61400A5F42B /* Brownie.xcframework */, @@ -239,6 +388,7 @@ 793C76A72EEBF938008A2A34 /* Brownfield Apple App (RNApp).app */, 79B8BE802FB7270E00B94C6F /* Brownfield Apple App (ExpoApp54).app */, 79B8BE9B2FB7273600B94C6F /* Brownfield Apple App (ExpoApp55).app */, + 79B8BEB22FB8000000B94C6F /* Brownfield Apple App (ExpoApp56).app */, 7A1B2C3D4E5F60718293A202 /* Brownfield Apple App (ExpoAppBeta).app */, ); name = Products; @@ -316,6 +466,29 @@ productReference = 79B8BE9B2FB7273600B94C6F /* Brownfield Apple App (ExpoApp55).app */; productType = "com.apple.product-type.application"; }; + 79B8BEB42FB8000000B94C6F /* Brownfield Apple App (ExpoApp56) */ = { + isa = PBXNativeTarget; + buildConfigurationList = 79B8BEB92FB8000000B94C6F /* Build configuration list for PBXNativeTarget "Brownfield Apple App (ExpoApp56)" */; + buildPhases = ( + 79B8BEB12FB8000000B94C6F /* Sources */, + 79B8BEAF2FB8000000B94C6F /* Frameworks */, + 79B8BEB02FB8000000B94C6F /* Resources */, + 79B8BEAE2FB8000000B94C6F /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + fileSystemSynchronizedGroups = ( + 793C76A92EEBF938008A2A34 /* Brownfield Apple App */, + ); + name = "Brownfield Apple App (ExpoApp56)"; + packageProductDependencies = ( + ); + productName = "Brownfield Apple App"; + productReference = 79B8BEB22FB8000000B94C6F /* Brownfield Apple App (ExpoApp56).app */; + productType = "com.apple.product-type.application"; + }; 7A1B2C3D4E5F60718293A301 /* Brownfield Apple App (ExpoAppBeta) */ = { isa = PBXNativeTarget; buildConfigurationList = 7A1B2C3D4E5F60718293A405 /* Build configuration list for PBXNativeTarget "Brownfield Apple App (ExpoAppBeta)" */; @@ -352,6 +525,12 @@ 793C76A62EEBF938008A2A34 = { CreatedOnToolsVersion = 26.1.1; }; + 79B8BEB42FB8000000B94C6F = { + CreatedOnToolsVersion = 26.1.1; + }; + 7A1B2C3D4E5F60718293A301 = { + CreatedOnToolsVersion = 26.1.1; + }; }; }; buildConfigurationList = 793C76A22EEBF938008A2A34 /* Build configuration list for PBXProject "Brownfield Apple App" */; @@ -363,17 +542,19 @@ ); mainGroup = 793C769E2EEBF938008A2A34; minimizedProjectReferenceProxies = 1; + packageReferences = ( + ); preferredProjectObjectVersion = 77; productRefGroup = 793C76A82EEBF938008A2A34 /* Products */; projectDirPath = ""; projectRoot = ""; - targets = ( - 793C76A62EEBF938008A2A34 /* Brownfield Apple App (RNApp) */, - 79B8BE682FB7270E00B94C6F /* Brownfield Apple App (ExpoApp54) */, - 79B8BE832FB7273600B94C6F /* Brownfield Apple App (ExpoApp55) */, - 7A1B2C3D4E5F60718293A301 /* Brownfield Apple App (ExpoAppBeta) */, - ); - + targets = ( + 793C76A62EEBF938008A2A34 /* Brownfield Apple App (RNApp) */, + 79B8BE682FB7270E00B94C6F /* Brownfield Apple App (ExpoApp54) */, + 79B8BE832FB7273600B94C6F /* Brownfield Apple App (ExpoApp55) */, + 79B8BEB42FB8000000B94C6F /* Brownfield Apple App (ExpoApp56) */, + 7A1B2C3D4E5F60718293A301 /* Brownfield Apple App (ExpoAppBeta) */, + ); }; /* End PBXProject section */ @@ -399,6 +580,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 79B8BEB02FB8000000B94C6F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7A1B2C3D4E5F60718293A303 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -430,6 +618,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 79B8BEB12FB8000000B94C6F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7A1B2C3D4E5F60718293A302 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1028,6 +1223,194 @@ }; name = "Release Vanilla"; }; + 79B8BEB52FB8000000B94C6F /* Debug Expo */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "Brownfield-Apple-App-Info.plist"; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance = "$(USE_EXPO_HOST_STATUS_BAR_APPEARANCE)"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.callstack.brownfield.ios.example.Brownfield-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + REGISTER_APP_GROUPS = YES; + SDKROOT = auto; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) USE_EXPO_HOST"; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + USE_EXPO_HOST_STATUS_BAR_APPEARANCE = NO; + XROS_DEPLOYMENT_TARGET = 2.0; + }; + name = "Debug Expo"; + }; + 79B8BEB62FB8000000B94C6F /* Release Expo */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "Brownfield-Apple-App-Info.plist"; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance = "$(USE_EXPO_HOST_STATUS_BAR_APPEARANCE)"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.callstack.brownfield.ios.example.Brownfield-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + REGISTER_APP_GROUPS = YES; + SDKROOT = auto; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) USE_EXPO_HOST"; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + USE_EXPO_HOST_STATUS_BAR_APPEARANCE = NO; + XROS_DEPLOYMENT_TARGET = 2.0; + }; + name = "Release Expo"; + }; + 79B8BEB72FB8000000B94C6F /* Debug Vanilla */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "Brownfield-Apple-App-Info.plist"; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance = "$(USE_EXPO_HOST_STATUS_BAR_APPEARANCE)"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.callstack.brownfield.ios.example.Brownfield-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + REGISTER_APP_GROUPS = YES; + SDKROOT = auto; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + USE_EXPO_HOST_STATUS_BAR_APPEARANCE = YES; + XROS_DEPLOYMENT_TARGET = 2.0; + }; + name = "Debug Vanilla"; + }; + 79B8BEB82FB8000000B94C6F /* Release Vanilla */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "Brownfield-Apple-App-Info.plist"; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance = "$(USE_EXPO_HOST_STATUS_BAR_APPEARANCE)"; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.callstack.brownfield.ios.example.Brownfield-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + REGISTER_APP_GROUPS = YES; + SDKROOT = auto; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + USE_EXPO_HOST_STATUS_BAR_APPEARANCE = YES; + XROS_DEPLOYMENT_TARGET = 2.0; + }; + name = "Release Vanilla"; + }; 7A1B2C3D4E5F60718293A401 /* Debug Vanilla */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1475,6 +1858,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "Release Expo"; }; + 79B8BEB92FB8000000B94C6F /* Build configuration list for PBXNativeTarget "Brownfield Apple App (ExpoApp56)" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 79B8BEB52FB8000000B94C6F /* Debug Expo */, + 79B8BEB62FB8000000B94C6F /* Release Expo */, + 79B8BEB72FB8000000B94C6F /* Debug Vanilla */, + 79B8BEB82FB8000000B94C6F /* Release Vanilla */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "Release Expo"; + }; 7A1B2C3D4E5F60718293A405 /* Build configuration list for PBXNativeTarget "Brownfield Apple App (ExpoAppBeta)" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/Brownfield Apple App Expo 56.xcscheme b/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/Brownfield Apple App Expo 56.xcscheme new file mode 100644 index 00000000..0db5f92f --- /dev/null +++ b/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/Brownfield Apple App Expo 56.xcscheme @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + diff --git a/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist index 87fb27c8..7c4a606b 100644 --- a/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist +++ b/apps/AppleApp/Brownfield Apple App.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist @@ -14,6 +14,11 @@ orderHint 1 + Brownfield Apple App Expo 56.xcscheme + + orderHint + 0 + Brownfield Apple App Vanilla.xcscheme orderHint @@ -37,6 +42,11 @@ primary + 79B8BEB42FB8000000B94C6F + + primary + + diff --git a/apps/AppleApp/Brownfield Apple App/components/ContentView.swift b/apps/AppleApp/Brownfield Apple App/components/ContentView.swift index 035111ae..a8a7167b 100644 --- a/apps/AppleApp/Brownfield Apple App/components/ContentView.swift +++ b/apps/AppleApp/Brownfield Apple App/components/ContentView.swift @@ -91,7 +91,3 @@ struct ContentView: View { } } } - -#Preview { - ContentView() -} diff --git a/apps/AppleApp/e2e/jest.config.expo56.cjs b/apps/AppleApp/e2e/jest.config.expo56.cjs new file mode 100644 index 00000000..4823f092 --- /dev/null +++ b/apps/AppleApp/e2e/jest.config.expo56.cjs @@ -0,0 +1,19 @@ +const path = require('node:path'); +const { + createDetoxJestConfig, +} = require('../../brownfield-example-shared-tests/e2e/createDetoxJestConfig.cjs'); +const { + getAppleAppDetoxVariant, +} = require('../../brownfield-example-shared-tests/detox-appleapp-variants.cjs'); + +const variant = getAppleAppDetoxVariant('expo56'); + +module.exports = createDetoxJestConfig({ + e2eDir: __dirname, + testMatch: [ + path.join( + __dirname, + `../../brownfield-example-shared-tests/e2e/${variant.e2eTestFile}` + ), + ], +}); diff --git a/apps/AppleApp/package.json b/apps/AppleApp/package.json index 4f732cb0..2f5968e2 100644 --- a/apps/AppleApp/package.json +++ b/apps/AppleApp/package.json @@ -4,7 +4,8 @@ "private": true, "type": "module", "scripts": { - "build:example:ios-consumer:expo": "yarn build:example:ios-consumer:expo55", + "build:example:ios-consumer:expo": "yarn build:example:ios-consumer:expo56", + "build:example:ios-consumer:expo56": "node prepareXCFrameworks.js --appName ExpoApp56 && yarn internal::build::common -scheme \"Brownfield Apple App Expo 56\" -configuration Release", "build:example:ios-consumer:expo54": "node prepareXCFrameworks.js --appName ExpoApp54 && yarn internal::build::common -scheme \"Brownfield Apple App Expo 54\" -configuration Release", "build:example:ios-consumer:expo55": "node prepareXCFrameworks.js --appName ExpoApp55 && yarn internal::build::common -scheme \"Brownfield Apple App Expo 55\" -configuration Release", "build:example:ios-consumer:expobeta": "node prepareXCFrameworks.js --appName ExpoAppBeta && yarn internal::build::common -scheme \"Brownfield Apple App Expo Beta\" -configuration Release", @@ -14,8 +15,11 @@ "e2e:test:ios": "detox test --configuration ios.sim.debug", "e2e:build:ios:expo55": "detox build --config-path .detoxrc.expo55.cjs --configuration ios.sim.debug.expo55", "e2e:test:ios:expo55": "detox test --config-path .detoxrc.expo55.cjs --configuration ios.sim.debug.expo55", + "e2e:build:ios:expo56": "detox build --config-path .detoxrc.expo56.cjs --configuration ios.sim.debug.expo56", + "e2e:test:ios:expo56": "detox test --config-path .detoxrc.expo56.cjs --configuration ios.sim.debug.expo56", "ci:local:e2e:ios": "bash ../../scripts/ci-local-appleapp-ios-e2e.sh", - "ci:local:e2e:ios:expo55": "bash ../../scripts/ci-local-appleapp-ios-e2e.sh --variant expo55" + "ci:local:e2e:ios:expo55": "bash ../../scripts/ci-local-appleapp-ios-e2e.sh --variant expo55", + "ci:local:e2e:ios:expo56": "bash ../../scripts/ci-local-appleapp-ios-e2e.sh --variant expo56" }, "devDependencies": { "@callstack/brownfield-example-shared-tests": "workspace:^", diff --git a/apps/AppleApp/prepareXCFrameworks.js b/apps/AppleApp/prepareXCFrameworks.js index c7a0efd1..bb65bc06 100644 --- a/apps/AppleApp/prepareXCFrameworks.js +++ b/apps/AppleApp/prepareXCFrameworks.js @@ -1,6 +1,5 @@ import path from 'node:path'; import fs from 'node:fs'; -import { execFileSync } from 'node:child_process'; import { fileURLToPath } from 'url'; import { dirname } from 'path'; @@ -40,11 +39,6 @@ const sourcePackagePath = path.join( const targetPackagePath = path.join(__dirname, 'package'); -const prebuiltRnCoreArtifacts = [ - 'React.xcframework', - 'ReactNativeDependencies.xcframework', -]; - /** * The Xcode project is configured to link the following frameworks: * - BrownfieldLib (constant) @@ -59,17 +53,6 @@ const prebuiltRnCoreArtifacts = [ * */ -const validNames = [ - 'BrownfieldLib.xcframework', - 'Brownie.xcframework', - 'hermesvm.xcframework', - 'ReactBrownfield.xcframework', - 'BrownfieldNavigation.xcframework', - // below: optional, emitted when RN is packaged with prebuilt iOS pods - 'React.xcframework', - 'ReactNativeDependencies.xcframework', -]; - if (fs.existsSync(targetPackagePath)) { logger.info(`Removing ${targetPackagePath}\n`); fs.rmSync(targetPackagePath, { recursive: true, force: true }); @@ -86,15 +69,17 @@ const preferredArtifactSourcePath = fs.existsSync(spmArtifactsPath) : sourcePackagePath; for (const file of fs.readdirSync(preferredArtifactSourcePath)) { + const sourcePath = path.join(preferredArtifactSourcePath, file); + if ( - !validNames.includes(file) && - !['hermes.xcframework', 'hermesvm.xcframework'].includes(file) + !fs.statSync(sourcePath).isDirectory() || + !file.endsWith('.xcframework') ) { continue; } fs.cpSync( - path.join(preferredArtifactSourcePath, file), + sourcePath, path.join(targetPackagePath, file), { recursive: true, @@ -104,10 +89,19 @@ for (const file of fs.readdirSync(preferredArtifactSourcePath)) { // handle hermesvm.xcframework / hermes.xcframework let hermesArtifactFound = false; -for (const candidateDir of ['hermes.xcframework', 'hermesvm.xcframework']) { - if (fs.existsSync(path.join(targetPackagePath, candidateDir))) { +if (fs.existsSync(path.join(targetPackagePath, 'hermesvm.xcframework'))) { + hermesArtifactFound = true; +} + +if (fs.existsSync(path.join(targetPackagePath, 'hermes.xcframework'))) { + if (hermesArtifactFound) { + fs.rmSync(path.join(targetPackagePath, 'hermes.xcframework'), { + recursive: true, + force: true, + }); + } else { fs.renameSync( - path.join(targetPackagePath, candidateDir), + path.join(targetPackagePath, 'hermes.xcframework'), path.join(targetPackagePath, 'hermesvm.xcframework') ); hermesArtifactFound = true; @@ -118,23 +112,8 @@ if (!hermesArtifactFound) { throw new Error('Hermes artifact not found'); } -for (const artifact of prebuiltRnCoreArtifacts) { - const xcframeworkPath = path.join(targetPackagePath, artifact); - if (!fs.existsSync(xcframeworkPath)) { - continue; - } - - // RN prebuilts ship with a sealed signature that CocoaPods/brownfield packaging - // can invalidate (module.modulemap drift). Re-sign locally so Xcode can embed them. - logger.info(`Re-signing ${artifact} for AppleApp consumer build`); - execFileSync('codesign', ['--force', '--sign', '-', '--deep', xcframeworkPath], { - stdio: 'inherit', - }); - logger.success(`${artifact} re-signed`); -} - for (const file of fs.readdirSync(targetPackagePath)) { - if (!validNames.includes(file)) { + if (!file.endsWith('.xcframework')) { throw new Error(`Invalid file name: ${file}`); } diff --git a/apps/ExpoApp56/.gitignore b/apps/ExpoApp56/.gitignore new file mode 100644 index 00000000..4b00baf3 --- /dev/null +++ b/apps/ExpoApp56/.gitignore @@ -0,0 +1,43 @@ +# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files + +# dependencies +node_modules/ + +# Expo +.expo/ +dist/ +web-build/ +expo-env.d.ts + +# Native +.kotlin/ +*.orig.* +*.jks +*.p8 +*.p12 +*.key +*.mobileprovision + +# Metro +.metro-health-check* + +# debug +npm-debug.* +yarn-debug.* +yarn-error.* + +# macOS +.DS_Store +*.pem + +# local env files +.env*.local + +# typescript +*.tsbuildinfo + +example + +# generated native folders +/ios +/android diff --git a/apps/ExpoApp56/BrownfieldStore.brownie.ts b/apps/ExpoApp56/BrownfieldStore.brownie.ts new file mode 100644 index 00000000..94e22c72 --- /dev/null +++ b/apps/ExpoApp56/BrownfieldStore.brownie.ts @@ -0,0 +1,21 @@ +import type { BrownieStore } from '@callstack/brownie'; + +export interface BrownfieldStore extends BrownieStore { + counter: number; + user: { + name: string; + }; +} + +export interface SettingsStore extends BrownieStore { + theme: 'light' | 'dark'; + notificationsEnabled: boolean; + privacyMode: boolean; +} + +declare module '@callstack/brownie' { + interface BrownieStores { + BrownfieldStore: BrownfieldStore; + SettingsStore: SettingsStore; + } +} diff --git a/apps/ExpoApp56/README.md b/apps/ExpoApp56/README.md new file mode 100644 index 00000000..4d67aec2 --- /dev/null +++ b/apps/ExpoApp56/README.md @@ -0,0 +1,56 @@ +# Welcome to your Expo app 👋 + +This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app). + +## Get started + +1. Install dependencies + + ```bash + npm install + ``` + +2. Start the app + + ```bash + npx expo start + ``` + +In the output, you'll find options to open the app in a + +- [development build](https://docs.expo.dev/develop/development-builds/introduction/) +- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/) +- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/) +- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo + +You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction). + +## Get a fresh project + +When you're ready, run: + +```bash +npm run reset-project +``` + +This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing. + +### Other setup steps + +- To set up ESLint for linting, run `npx expo lint`, or follow our guide on ["Using ESLint and Prettier"](https://docs.expo.dev/guides/using-eslint/) +- If you'd like to set up unit testing, follow our guide on ["Unit Testing with Jest"](https://docs.expo.dev/develop/unit-testing/) +- Learn more about the TypeScript setup in this template in our guide on ["Using TypeScript"](https://docs.expo.dev/guides/typescript/) + +## Learn more + +To learn more about developing your project with Expo, look at the following resources: + +- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides). +- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web. + +## Join the community + +Join our community of developers creating universal apps. + +- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute. +- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions. diff --git a/apps/ExpoApp56/RNApp.tsx b/apps/ExpoApp56/RNApp.tsx new file mode 100644 index 00000000..5e06ccc1 --- /dev/null +++ b/apps/ExpoApp56/RNApp.tsx @@ -0,0 +1,77 @@ +import { SafeAreaView } from 'react-native-safe-area-context'; +import { Button, StyleSheet, Text, View } from 'react-native'; +import BrownfieldNavigation from '@callstack/brownfield-navigation'; +import { checkAndFetchUpdate } from './src/utils/expo-rn-updates'; + +import Counter from './src/components/counter'; + +type RNAppProps = { + nativeOsVersionLabel?: string; +}; + +export default function RNApp({ nativeOsVersionLabel }: RNAppProps) { + return ( + + Expo React Native Brownfield + + {nativeOsVersionLabel ? ( + + {nativeOsVersionLabel} + + ) : null} + + + + +