From 6ab3e7bdd77ee00f571fb7bcc72333f0b6b26b1e Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Tue, 12 Nov 2024 12:27:43 -0600 Subject: [PATCH 1/5] Revert "chore(ci): Update to Xcode 16 (#2207)" This reverts commit 9bf6051fa79c4e748fbe1ee1b7736b2a2436aaab. --- .ado/variables/vars.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ado/variables/vars.yml b/.ado/variables/vars.yml index 16e13cfa6b678d..e976033d97f3a4 100644 --- a/.ado/variables/vars.yml +++ b/.ado/variables/vars.yml @@ -1,6 +1,6 @@ variables: VmImageApple: macos-latest-internal - xcode_friendly_name: 'Xcode 16.0' - xcode_version: '/Applications/Xcode_16.0.app' - ios_version: '18.0' - ios_simulator: 'iPhone 16' + xcode_friendly_name: 'Xcode 15.2' + xcode_version: '/Applications/Xcode_15.2.app' + ios_version: '17.2' + ios_simulator: 'iPhone 15' From 3e39786046f6ddf9c88811d473b51f5b4bbf922d Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Tue, 12 Nov 2024 12:52:58 -0600 Subject: [PATCH 2/5] Update generate-macos.js --- packages/react-native/local-cli/generate-macos.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/react-native/local-cli/generate-macos.js b/packages/react-native/local-cli/generate-macos.js index 3a01420a80aa3c..2de8b18ca5986c 100644 --- a/packages/react-native/local-cli/generate-macos.js +++ b/packages/react-native/local-cli/generate-macos.js @@ -30,8 +30,6 @@ function generateMacOS (projectDir, name, options) { { overwrite: options.overwrite } ); - installPods(options); - printFinishMessage(name); } From 903cf7364e6f7a62accf8de60ae7853b77daafef Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Tue, 12 Nov 2024 12:54:28 -0600 Subject: [PATCH 3/5] Update index.js --- .../react-native/local-cli/generator-macos/index.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/react-native/local-cli/generator-macos/index.js b/packages/react-native/local-cli/generator-macos/index.js index 9b6cc63e8c7d3a..674acd78824ce0 100644 --- a/packages/react-native/local-cli/generator-macos/index.js +++ b/packages/react-native/local-cli/generator-macos/index.js @@ -122,21 +122,13 @@ function installDependencies(options) { childProcess.execSync(isYarn ? 'yarn' : 'npm i', execOptions); } -/** - * @param {{ verbose?: boolean }=} options - */ -function installPods(options) { - const cwd = path.join(process.cwd(), macOSDir); - const quietFlag = options && options.verbose ? '' : '--quiet'; - childProcess.execSync(`npx ${quietFlag} pod-install --non-interactive ${quietFlag}`, { stdio: 'inherit', cwd }); -} - /** * @param {string} newProjectName */ function printFinishMessage(newProjectName) { console.log(` ${chalk.blue(`Run instructions for ${chalk.bold('macOS')}`)}: + • pod install --project-directory=macos • npx react-native run-macos ${chalk.dim('- or -')} • Open ${xcworkspacePath(newProjectName)} in Xcode or run "xed -b ${macOSDir}" @@ -148,6 +140,5 @@ function printFinishMessage(newProjectName) { module.exports = { copyProjectTemplateAndReplace, installDependencies, - installPods, printFinishMessage, }; From 6c18e1d073390fe5b056c6899e6e4b83b9bf23d0 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Tue, 12 Nov 2024 13:48:00 -0600 Subject: [PATCH 4/5] Update test-react-native-macos-init.yml --- .ado/jobs/test-react-native-macos-init.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/jobs/test-react-native-macos-init.yml b/.ado/jobs/test-react-native-macos-init.yml index 430c8076d33078..5a7031689b84b1 100644 --- a/.ado/jobs/test-react-native-macos-init.yml +++ b/.ado/jobs/test-react-native-macos-init.yml @@ -38,6 +38,7 @@ jobs: # We need to set the npm registry here otherwise it won't stick $(Build.Repository.LocalPath)/.ado/scripts/verdaccio.sh configure node $(Build.Repository.LocalPath)/packages/react-native-macos-init/bin.js --verbose --version latest --overwrite --prerelease + pod install --project-directory=macos workingDirectory: $(Agent.BuildDirectory)/testcli displayName: Apply macOS template (new project) From b1c723e0924979305a7ee55a1124013dd83f8ca5 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Tue, 12 Nov 2024 19:40:39 -0600 Subject: [PATCH 5/5] Update index.js --- packages/react-native/local-cli/generator-macos/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/react-native/local-cli/generator-macos/index.js b/packages/react-native/local-cli/generator-macos/index.js index 674acd78824ce0..119c432bbfa18f 100644 --- a/packages/react-native/local-cli/generator-macos/index.js +++ b/packages/react-native/local-cli/generator-macos/index.js @@ -130,10 +130,7 @@ function printFinishMessage(newProjectName) { ${chalk.blue(`Run instructions for ${chalk.bold('macOS')}`)}: • pod install --project-directory=macos • npx react-native run-macos - ${chalk.dim('- or -')} - • Open ${xcworkspacePath(newProjectName)} in Xcode or run "xed -b ${macOSDir}" • yarn start:macos - • Hit the Run button `); }