From 780fc634dcbf72f7e4b02e2a207ad070b61374e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sharma?=
 <737941+loic-sharma@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:34:53 -0700
Subject: [PATCH 1/2] Update minimum recommended CocoaPods version to support
 Xcode 16 (#11346)

Xcode 16 introduced new types to its project format. Customers should
update to CocoaPods 1.16 or higher to support this new project format.

Part of https://github.com/flutter/flutter/issues/157737
---
 src/_data/site.yml                                     |  4 ++--
 .../docs/add-to-app/ios-project/embed-cocoapods.md     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/_data/site.yml b/src/_data/site.yml
index 897464a158..87f25f3947 100644
--- a/src/_data/site.yml
+++ b/src/_data/site.yml
@@ -71,7 +71,7 @@ appmin:
   android_sdk: 21
   powershell: 5.0
   xcode: '14'
-  cocoapods: '1.10'
+  cocoapods: '1.16'
 devmin:
   windows: '64-bit version of Microsoft Windows 10'
   macos: '11 (Big Sur)'
@@ -98,4 +98,4 @@ appnow:
   powershell: 5.1
   xcode: '15'
   ios: '17'
-  cocoapods: '1.15'
+  cocoapods: '1.16'
diff --git a/src/_includes/docs/add-to-app/ios-project/embed-cocoapods.md b/src/_includes/docs/add-to-app/ios-project/embed-cocoapods.md
index eb025cce77..c674a9dd8d 100644
--- a/src/_includes/docs/add-to-app/ios-project/embed-cocoapods.md
+++ b/src/_includes/docs/add-to-app/ios-project/embed-cocoapods.md
@@ -54,13 +54,9 @@ This section presumes you called your Swift app `MyApp`.
    navigate to the root of your app directory.
    Use the `pod init` command to create the `Podfile` file.
 
-   :::warning
-   CocoaPods (as of version 1.15.2) does not support Xcode 16.
-   If the `pod init` command errors, consider re-creating your Xcode project
-   using Xcode 15 or older.
-
-   To learn more about the CocoaPods issue, check out
-   [CocoaPods#12456](https://github.com/CocoaPods/CocoaPods/issues/12456).
+   :::tip
+   If the `pod init` command errors,
+   check that you're on the latest version of CocoaPods.
    :::
 
 1. Update your `Podfile` config file.

From 6ab52d1a6b9d8dc641eb67c13a9b4fa50db2a50f Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:10:18 -0700
Subject: [PATCH 2/2] Add `/to` short links for `et` and `engine-tool`.
 (#11344)

I.e. to make
https://github.com/flutter/engine/blob/main/tools/engine_tool/README.md
more discoverable/linkable.
---
 firebase.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/firebase.json b/firebase.json
index ea950d9708..020e02637b 100644
--- a/firebase.json
+++ b/firebase.json
@@ -677,8 +677,10 @@
       { "source": "/to/edit-plugins", "destination": "/packages-and-plugins/developing-packages#edit-plugin-package", "type": 301 },
       { "source": "/to/editor-setup", "destination": "/get-started/editor", "type": 301 },
       { "source": "/to/engine-rbe", "destination": "https://github.com/flutter/engine/blob/main/docs/rbe/rbe.md", "type": 301 },
+      { "source": "/to/engine-tool", "destination": "https://github.com/flutter/engine/blob/main/tools/engine_tool/README.md", "type": 301 },
       { "source": "/to/engine-tool-bug", "destination": "https://github.com/flutter/flutter/issues/new?labels=e:%20engine-tool", "type": 301 },
       { "source": "/to/endorsed-federated-plugin", "destination": "/packages-and-plugins/developing-packages#endorsed-federated-plugin", "type": 301 },
+      { "source": "/to/et", "destination": "https://flutter.dev/to/engine-tool", "type": 301 },
       { "source": "/to/federated-plugins", "destination": "/packages-and-plugins/developing-packages#federated-plugins", "type": 301 },
       { "source": "/to/ffi-package", "destination": "/packages-and-plugins/developing-packages#plugin-ffi", "type": 301 },
       { "source": "/to/flutter-plugins-configuration", "destination": "/release/breaking-changes/flutter-plugins-configuration", "type": 301 },