Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/expo-go/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ target 'Expo Go' do
# Expo modules
use_expo_modules!({
exclude: [
'expo-app-metrics',
'expo-module-template',
'expo-dev-launcher',
'expo-dev-client',
Expand All @@ -58,7 +59,8 @@ target 'Expo Go' do
'expo-splash-screen',
'@expo/app-integrity',
'expo-brownfield',
'expo-widgets'
'expo-widgets',
'expo-observe'
],
includeTests: true,
flags: {
Expand Down
2 changes: 1 addition & 1 deletion apps/expo-go/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4847,6 +4847,6 @@ SPEC CHECKSUMS:
Yoga: 2fe23f676416a73cb4be2c15929e352c9395b9cf
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: 620498ff1ae46c9e3a34535dd3dcc2129b61d2b9
PODFILE CHECKSUM: 330a7a37788c690eb6d1485a7c5003375ee538b2

COCOAPODS: 1.16.2
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ export interface VersionInfo {

export const ExpoVersionMappings: VersionInfo[] = [
// Please keep sdk versions in sorted order (latest sdk first)
{
expoPackageVersion: '~56.0.0',
sdkVersion: '56.0.0',
iosDeploymentTarget: '16.4',
reactNativeVersionRange: '~0.85.0',
supportCliIntegration: true,
},
{
expoPackageVersion: '~55.0.0',
sdkVersion: '55.0.0',
Expand Down
3 changes: 2 additions & 1 deletion tools/src/generate-docs-api-data/docsInline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ import path from 'node:path';
import {
Application,
Configuration,
normalizePath,
ReflectionKind,
TSConfigReader,
TypeDocReader,
Expand Down Expand Up @@ -241,7 +242,7 @@ async function collectTaggedDeclarations(

const result = new Map<string, JSONOutput.DeclarationReflection>();
if (project) {
const json = app.serializer.projectToObject(project, process.cwd()) as unknown;
const json = app.serializer.projectToObject(project, normalizePath(process.cwd())) as unknown;
walk(json, (node) => {
if (isObject(node) && typeof node.name === 'string' && taggedTypes.has(node.name)) {
result.set(node.name, node as unknown as JSONOutput.DeclarationReflection);
Expand Down
15 changes: 12 additions & 3 deletions tools/src/prebuilds/CustomBuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,14 @@ async function stagePodsRootAsync(

async function spawnScriptAsync(
scriptPath: string,
args: string[],
cwd: string,
env: NodeJS.ProcessEnv,
label: string
): Promise<void> {
const spinner = createAsyncSpinner(label);
return new Promise((resolve, reject) => {
const child = spawn(scriptPath, [], { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
const child = spawn(scriptPath, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
let stderr = '';
const pipe = (data: Buffer) => {
for (const line of data.toString().split('\n')) {
Expand Down Expand Up @@ -157,7 +158,8 @@ export async function runCustomBuildAsync(
product: SPMProduct,
artifacts: DownloadedDependencies,
platformFilter: BuildPlatform | undefined,
alreadyBuiltProducts?: Set<string>
alreadyBuiltProducts?: Set<string>,
clean?: boolean
): Promise<void> {
const cb = product.customBuild!;
const key = customBuildKey(pkg, product);
Expand All @@ -173,7 +175,14 @@ export async function runCustomBuildAsync(
if (sdk) env.PLATFORM_NAME = sdk;
else delete env.PLATFORM_NAME;

await spawnScriptAsync(scriptPath, path.dirname(scriptPath), env, `🛠 Building ${product.name}`);
const args = clean ? ['--clean'] : [];
await spawnScriptAsync(
scriptPath,
args,
path.dirname(scriptPath),
env,
`🛠 Building ${product.name}`
);
alreadyBuiltProducts?.add(key);
}

Expand Down
3 changes: 2 additions & 1 deletion tools/src/prebuilds/pipeline/ProductSteps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ export const buildStep: Step<PrebuildContext> = {
product,
artifacts,
ctx.request.platformFilter,
ctx.customBuiltProducts
ctx.customBuiltProducts,
ctx.request.clean
);
setStage(ctx, 'build', 'success');
return;
Expand Down
Loading