From 4e854455011f19a888f575bf5388403445588150 Mon Sep 17 00:00:00 2001
From: Zixuan James Li <zixuan@zulip.com>
Date: Fri, 24 Jan 2025 11:44:44 -0500
Subject: [PATCH 1/2] deps: Upgrade Flutter to 3.29.0-1.0.pre.105

And update Flutter's supporting libraries to match.
---
 pubspec.lock | 8 ++++----
 pubspec.yaml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 4d5f5d63df..4ee3317f8d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1044,10 +1044,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec"
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
@@ -1360,5 +1360,5 @@ packages:
     source: path
     version: "0.0.1"
 sdks:
-  dart: ">=3.7.0-312.0.dev <4.0.0"
-  flutter: ">=3.28.0-2.0.pre.38699"
+  dart: ">=3.8.0-24.0.dev <4.0.0"
+  flutter: ">=3.29.0-1.0.pre.105"
diff --git a/pubspec.yaml b/pubspec.yaml
index 0d637ee9ec..27b7519334 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,8 +14,8 @@ environment:
   # We use a recent version of Flutter from its main channel, and
   # the corresponding recent version of the Dart SDK.
   # Feel free to update these regularly; see README.md for instructions.
-  sdk: '>=3.7.0-312.0.dev <4.0.0'
-  flutter: '>=3.28.0-2.0.pre.38699'  # d14140f85439c517c98b0c40f8eaf942fcb46c74
+  sdk: '>=3.8.0-24.0.dev <4.0.0'
+  flutter: '>=3.29.0-1.0.pre.105'  # c1ffaa9d9deb3e0853176271922e0b1c1356d21f
 
 # To update dependencies, see instructions in README.md.
 dependencies:

From 7b25db0bf30f7e63ccf1c07365ae8b4cce5a8034 Mon Sep 17 00:00:00 2001
From: Zixuan James Li <zixuan@zulip.com>
Date: Fri, 24 Jan 2025 11:48:50 -0500
Subject: [PATCH 2/2] Revert "ci: Remove --depth=1000 in doing Flutter clone,
 to be added back later"

This reverts commit 2b99578b0cc40d8abe961629ab5b63142c17fbb3.

Fixes: #1204

Signed-off-by: Zixuan James Li <zixuan@zulip.com>
---
 .github/workflows/ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38767975c1..6ae781c17d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,9 +18,12 @@ jobs:
         distribution: temurin
 
     - name: Clone Flutter SDK
-      # TODO(#1204) reinstate shallow clone with --depth=1000 and its corresponding comment here
+      # We can't do a depth-1 clone, because we need the most recent tag
+      # so that Flutter knows its version and sees the constraint in our
+      # pubspec is satisfied.  It's uncommon for flutter/flutter to go
+      # more than 100 commits between tags.  Fetch 1000 for good measure.
       run: |
-        git clone -b main https://github.com/flutter/flutter ~/flutter
+        git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter
         TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
         echo ~/flutter/bin >> "$GITHUB_PATH"