Skip to content

Commit 9044a9a

Browse files
chrisbobbegnprice
authored andcommitted
deps: Update Flutter to latest 3.21.0-12.0.pre.26, and intl to match
Recent Flutter versions from main pin a newer version of package:intl, making them incompatible with our current pubspec constraints and causing CI to fail (zulip#575). So we need to upgrade `intl`. That in turn would break things on older Flutter, so we bump the minimum Flutter version at the same time. This also conveniently ensures that we have flutter/flutter@01fc13d9f, a nice upstream improvement from our contributor VatsalBhesaniya. The Flutter bump comes with a small tweak to respond to an API deprecation. The `intl` changelog identifies no potentially breaking changes: https://github.com/dart-lang/i18n/blob/main/pkgs/intl/CHANGELOG.md#0190 Fixes: zulip#575
1 parent c4c1a61 commit 9044a9a

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/widgets/compose_box.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ class _SendButtonState extends State<_SendButton> {
764764
tooltip: zulipLocalizations.composeBoxSendTooltip,
765765
style: const ButtonStyle(
766766
// Match the height of the content input.
767-
minimumSize: MaterialStatePropertyAll(Size.square(_sendButtonSize)),
767+
minimumSize: WidgetStatePropertyAll(Size.square(_sendButtonSize)),
768768
// With the default of [MaterialTapTargetSize.padded], not just the
769769
// tap target but the visual button would get padded to 48px square.
770770
// It would be nice if the tap target extended invisibly out from the

pubspec.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -616,10 +616,10 @@ packages:
616616
dependency: "direct main"
617617
description:
618618
name: intl
619-
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
619+
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
620620
url: "https://pub.dev"
621621
source: hosted
622-
version: "0.18.1"
622+
version: "0.19.0"
623623
io:
624624
dependency: transitive
625625
description:
@@ -1197,10 +1197,10 @@ packages:
11971197
dependency: transitive
11981198
description:
11991199
name: vm_service
1200-
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
1200+
sha256: a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48
12011201
url: "https://pub.dev"
12021202
source: hosted
1203-
version: "14.0.0"
1203+
version: "14.2.0"
12041204
watcher:
12051205
dependency: transitive
12061206
description:
@@ -1282,5 +1282,5 @@ packages:
12821282
source: hosted
12831283
version: "3.1.2"
12841284
sdks:
1285-
dart: ">=3.4.0-140.0.dev <4.0.0"
1286-
flutter: ">=3.20.0-7.0.pre.63"
1285+
dart: ">=3.4.0-256.0.dev <4.0.0"
1286+
flutter: ">=3.21.0-12.0.pre.26"

pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ environment:
2424
# that by the time we want to release, these will have become stable.
2525
# TODO: Before general release, switch to stable Flutter and Dart versions,
2626
# or pin exact versions: https://github.com/zulip/zulip-flutter/issues/15
27-
sdk: '>=3.4.0-140.0.dev <4.0.0'
28-
flutter: '>=3.20.0-7.0.pre.63'
27+
sdk: '>=3.4.0-256.0.dev <4.0.0'
28+
flutter: '>=3.21.0-12.0.pre.26'
2929

3030
# Dependencies specify other packages that your package needs in order to work.
3131
# To automatically upgrade your package dependencies to the latest versions
@@ -54,7 +54,7 @@ dependencies:
5454
html: ^0.15.1
5555
http: ^1.0.0
5656
image_picker: ^1.0.0
57-
intl: ^0.18.0
57+
intl: ^0.19.0
5858
json_annotation: ^4.8.1
5959
package_info_plus: ^5.0.1
6060
path: ^1.8.3

0 commit comments

Comments
 (0)