Skip to content

Commit a9019f9

Browse files
Merge tag 'go_router-v4.1.1' into go-router/replace
# Conflicts: # packages/go_router/CHANGELOG.md # packages/go_router/pubspec.yaml
2 parents 33f7424 + ecbb67c commit a9019f9

40 files changed

+506
-455
lines changed

.ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ targets:
6969
add_recipes_cq: "true"
7070
target_file: windows_build_and_platform_tests.yaml
7171
channel: stable
72+
version_file: flutter_stable.version
7273
dependencies: >
7374
[
7475
{"dependency": "vs_build", "version": "version:vs2019"}

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f935af31574417a3628262eadd6a93fc284aa3bd
1+
bbec650b64bc50e6141c293cbe8415a4abf7fa40

.ci/flutter_stable.version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f1875d570e39de09040c8f79aa13cc56baab8db1

.ci/scripts/prepare_tool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ git fetch origin main
88

99
# Pinned version of the plugin tools, to avoid breakage in this repository
1010
# when pushing updates from flutter/plugins.
11-
dart pub global activate flutter_plugin_tools 0.8.5
11+
dart pub global activate flutter_plugin_tools 0.8.7

.cirrus.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ macos_template: &MACOS_TEMPLATE
3030

3131
flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
3232
upgrade_flutter_script:
33-
# Master uses a pinned, auto-rolled version to prevent out-of-band CI
34-
# failures due to changes in Flutter.
35-
# TODO(stuartmorgan): Investigate an autoroller for stable as well.
33+
# Channels that are part of our normal test matrix use a pinned,
34+
# auto-rolled version to prevent out-of-band CI failures due to changes in
35+
# Flutter.
3636
- TARGET_TREEISH=$CHANNEL
37-
- if [[ "$CHANNEL" == "master" ]]; then
37+
- if [[ "$CHANNEL" == "master" || "$CHANNEL" == "stable" ]]; then
3838
- TARGET_TREEISH=$(< .ci/flutter_$CHANNEL.version)
3939
- fi
4040
# Ensure that the repository has all the branches.
@@ -104,15 +104,15 @@ task:
104104
# version comes out.
105105
- name: legacy-version-analyze
106106
depends_on: format+analyze
107-
env:
108-
matrix:
107+
matrix:
108+
env:
109109
CHANNEL: "2.10.5"
110+
DART_VERSION: "2.16.2"
111+
env:
110112
CHANNEL: "2.8.1"
113+
DART_VERSION: "2.15.1"
111114
analyze_script:
112-
# Exclude:
113-
# - flutter_lints: does not depend on flutter, is only constrained by
114-
# Dart SDK version.
115-
- ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml --exclude=flutter_lints
115+
- ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --skip-if-not-supporting-dart-version="$DART_VERSION" --custom-analysis=script/configs/custom_analysis.yaml
116116
- name: publishable
117117
env:
118118
# TODO(stuartmorgan): Remove once the fix for https://github.com/dart-lang/pub/issues/3152

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ updates:
1111
- "stuartmorgan"
1212
- "ditman"
1313
labels:
14-
- "waiting for tree to go green"
14+
- "autosubmit"
1515
- package-ecosystem: "github-actions"
1616
directory: "/"
1717
schedule:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
3333
- name: Set up tools
34-
run: dart pub global activate flutter_plugin_tools 0.8.5
34+
run: dart pub global activate flutter_plugin_tools 0.8.7
3535

3636
# # This workflow should be the last to run. So wait for all the other tests to succeed.
3737
- name: Wait on all tests

packages/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.6
2+
3+
* Drops support for Flutter <2.8.
4+
15
## 2.0.5
26

37
* Updates README to reference the correct github URL.
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
# extension_google_sign_in_example
22

33
Demonstrates how to use the google_sign_in plugin with the `googleapis` package.
4-
5-
## Getting Started
6-
7-
For help getting started with Flutter, view our online
8-
[documentation](https://flutter.dev/).

packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: none
44

55
environment:
66
sdk: ">=2.12.0 <3.0.0"
7-
flutter: ">=1.20.0"
7+
flutter: ">=2.8.0"
88

99
dependencies:
1010
extension_google_sign_in_as_googleapis_auth:

0 commit comments

Comments
 (0)