From 4cc3dd67b3e7ebd0acbc9b12c27519e9668d3c75 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 12 Mar 2026 23:41:23 -0700 Subject: [PATCH 1/2] ios build: Opt out of SwiftPM, newly enabled by default This seems like a fine migration to take, but I'm not aware that it'll make any additional packages available that we've been waiting for. Opt out for now, with a TODO, to unblock using the latest Flutter. Related: #2218 --- pubspec.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pubspec.yaml b/pubspec.yaml index 74b8f2dbc8..09900e69a1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -113,6 +113,10 @@ dev_dependencies: # Keep list sorted when adding dependencies; it helps prevent merge conflicts. flutter: + config: + # TODO(#2218) re-enable + enable-swift-package-manager: false + generate: true uses-material-design: true From a9bd403de2a60bb1770c1c9cb2a99505281f2b96 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 12 Mar 2026 23:42:12 -0700 Subject: [PATCH 2/2] deps: Upgrade Flutter to 3.43.0-1.0.pre-118 And update Flutter's supporting libraries to match. This brings in a Flutter engine bugfix, https://github.com/flutter/flutter/pull/182661 which the AutoRoller landed today. It fixes an annoying iOS keyboard-animation glitch when switching focus between the topic and content inputs in the compose box. Fixes: #1974 --- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 89fcaa7a62..09e1dedd6d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -714,10 +714,10 @@ packages: dependency: transitive description: name: matcher - sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.18" + version: "0.12.19" material_color_utilities: dependency: transitive description: @@ -1151,26 +1151,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a" + sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7" url: "https://pub.dev" source: hosted - version: "1.29.0" + version: "1.30.0" test_api: dependency: "direct dev" description: name: test_api - sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" + sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" url: "https://pub.dev" source: hosted - version: "0.7.9" + version: "0.7.10" test_core: dependency: transitive description: name: test_core - sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943" + sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51" url: "https://pub.dev" source: hosted - version: "0.6.15" + version: "0.6.16" typed_data: dependency: transitive description: @@ -1427,5 +1427,5 @@ packages: source: path version: "0.0.1" sdks: - dart: ">=3.12.0-198.0.dev <4.0.0" - flutter: ">=3.42.0-1.0.pre-347" + dart: ">=3.12.0-243.0.dev <4.0.0" + flutter: ">=3.43.0-1.0.pre-118" diff --git a/pubspec.yaml b/pubspec.yaml index 09900e69a1..9c410873ac 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.12.0-198.0.dev <4.0.0' - flutter: '>=3.42.0-1.0.pre-347' # a567e329b090226c160c60464fba46e798973cb7 + sdk: '>=3.12.0-243.0.dev <4.0.0' + flutter: '>=3.43.0-1.0.pre-118' # 21edbc8423679b3fc0d923ca31b14f101c4e25c4 # To update dependencies, see instructions in README.md. dependencies: