Skip to content

Commit

Permalink
deps: Update Flutter to latest 3.21.0-12.0.pre.26, and intl to match
Browse files Browse the repository at this point in the history
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 (#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: #575
  • Loading branch information
chrisbobbe authored and gnprice committed Mar 21, 2024
1 parent c4c1a61 commit 9044a9a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion lib/widgets/compose_box.dart
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ class _SendButtonState extends State<_SendButton> {
tooltip: zulipLocalizations.composeBoxSendTooltip,
style: const ButtonStyle(
// Match the height of the content input.
minimumSize: MaterialStatePropertyAll(Size.square(_sendButtonSize)),
minimumSize: WidgetStatePropertyAll(Size.square(_sendButtonSize)),
// With the default of [MaterialTapTargetSize.padded], not just the
// tap target but the visual button would get padded to 48px square.
// It would be nice if the tap target extended invisibly out from the
Expand Down
12 changes: 6 additions & 6 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
version: "0.18.1"
version: "0.19.0"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -1197,10 +1197,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
sha256: a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48
url: "https://pub.dev"
source: hosted
version: "14.0.0"
version: "14.2.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -1282,5 +1282,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.4.0-140.0.dev <4.0.0"
flutter: ">=3.20.0-7.0.pre.63"
dart: ">=3.4.0-256.0.dev <4.0.0"
flutter: ">=3.21.0-12.0.pre.26"
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ environment:
# that by the time we want to release, these will have become stable.
# TODO: Before general release, switch to stable Flutter and Dart versions,
# or pin exact versions: https://github.com/zulip/zulip-flutter/issues/15
sdk: '>=3.4.0-140.0.dev <4.0.0'
flutter: '>=3.20.0-7.0.pre.63'
sdk: '>=3.4.0-256.0.dev <4.0.0'
flutter: '>=3.21.0-12.0.pre.26'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down Expand Up @@ -54,7 +54,7 @@ dependencies:
html: ^0.15.1
http: ^1.0.0
image_picker: ^1.0.0
intl: ^0.18.0
intl: ^0.19.0
json_annotation: ^4.8.1
package_info_plus: ^5.0.1
path: ^1.8.3
Expand Down

0 comments on commit 9044a9a

Please sign in to comment.