Skip to content

Commit 65e5abc

Browse files
gnpricechrisbobbe
authored andcommitted
deps: Switch to getting Flutter from the main channel
In particular this gets us the new scroll curve for Android that fixes several issues with scrolling: flutter/flutter#120420 Also drop the upper bound on Flutter versions from the pubspec.yaml, as it turns out it's ignored.
1 parent a782356 commit 65e5abc

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

README.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,15 @@ samples, guidance on mobile development, and a full API reference.
2828

2929
### Dependencies
3030

31-
While in the prototype phase, we use the latest beta version of Flutter.
32-
Use `flutter channel beta` and `flutter upgrade` to get the right version.
31+
While in the prototype phase, we use the latest Flutter from Flutter's
32+
main branch. Use `flutter channel main` and `flutter upgrade`.
33+
34+
We don't pin a specific version, because Flutter itself doesn't offer
35+
a way to do so. So far that hasn't been a problem. When it becomes one,
36+
we'll figure it out; there are several tools for this in the Flutter
37+
community. See [issue #15][].
38+
39+
[issue #15]: https://github.com/zulip/zulip-flutter/issues/15
3340

3441

3542
### Server credentials
@@ -76,7 +83,15 @@ $ flutter pub run build_runner watch --delete-conflicting-outputs
7683

7784
### Upgrading Flutter
7885

79-
When there's a new Flutter beta, we'll take the upgrade promptly:
86+
We regularly increment our lower bounds on Flutter and Dart versions,
87+
to make sure there's not too much divergence in the versions people
88+
are using.
89+
90+
When there's a new beta (which happens a couple of times per month),
91+
that's a good prompt to do this. We also do this when there's a
92+
new PR merged that we particularly want to take.
93+
94+
To update the version bounds:
8095
* Use `flutter upgrade` to upgrade your local Flutter and Dart.
8196
* Update the lower bounds at `environment` in `pubspec.yaml`
8297
to the new versions, as seen in `flutter --version`.

pubspec.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ packages:
109109
dependency: transitive
110110
description:
111111
name: characters
112-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
112+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "1.2.1"
115+
version: "1.3.0"
116116
checked_yaml:
117117
dependency: transitive
118118
description:
@@ -553,5 +553,5 @@ packages:
553553
source: hosted
554554
version: "3.1.1"
555555
sdks:
556-
dart: ">=3.0.0-218.1.beta <4.0.0"
557-
flutter: ">=3.8.0-10.1.pre"
556+
dart: ">=3.0.0-277.0.dev <4.0.0"
557+
flutter: ">=3.8.0-17.0.pre.49"

pubspec.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 0.0.1+1
2020

2121
environment:
22-
# We use a beta version of Flutter while developing a prototype,
23-
# and the corresponding beta version of the Dart SDK. The hope is
22+
# We use a development version of Flutter while developing a prototype,
23+
# and the corresponding dev version of the Dart SDK. The hope is
2424
# that by the time we want to release, these will have become stable.
25-
# TODO: Switch to stable Flutter and Dart versions before general release.
26-
sdk: '>=3.0.0-218.1.beta <4.0.0'
27-
flutter: '>=3.8.0-10.1.pre <4.0.0'
25+
# TODO: Before general release, switch to stable Flutter and Dart versions,
26+
# or pin exact versions: https://github.com/zulip/zulip-flutter/issues/15
27+
sdk: '>=3.0.0-277.0.dev <4.0.0'
28+
flutter: '>=3.8.0-17.0.pre.49'
2829

2930
# Dependencies specify other packages that your package needs in order to work.
3031
# To automatically upgrade your package dependencies to the latest versions

0 commit comments

Comments
 (0)