Skip to content

Commit fa0a12a

Browse files
authored
Merge branch 'main' into fix-issue-79772
2 parents 35a4890 + b4d134e commit fa0a12a

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cb26a01a40e98d867ae9b45cf13ae9e11d085a68
1+
a1a33e63b911bfe0b58dc1b2710f6eddb2cb6e4e

packages/go_router/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 14.1.4
2+
3+
- Fixes a URL in `navigation.md`.
4+
15
## 14.1.3
26

37
- Improves the logging of routes when `debugLogDiagnostics` is enabled or `debugKnownRoutes() is called. Explains the position of shell routes in the route tree. Prints the widget name of the routes it is building.

packages/go_router/doc/navigation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ screen along with the shell is placed entirely on top of the current screen.
8686
![An animation shows pushing a new screen with the different shell as current screen](https://flutter.github.io/assets-for-api-docs/assets/go_router/push_different_shell.gif)
8787

8888
To try out the behavior yourself, see
89-
[push_with_shell_route.dart](https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/extra_codec.dart).
90-
89+
[push_with_shell_route.dart](https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/push_with_shell_route.dart).
9190

9291
## Returning values
9392
Waiting for a value to be returned:

packages/go_router/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: go_router
22
description: A declarative router for Flutter based on Navigation 2 supporting
33
deep linking, data-driven routes and more
4-
version: 14.1.3
4+
version: 14.1.4
55
repository: https://github.com/flutter/packages/tree/main/packages/go_router
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22
77

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.16.3
2+
3+
* Bumps androidx.webkit:webkit from 1.10.0 to 1.11.0.
4+
15
## 3.16.2
26

37
* Bumps androidx.webkit:webkit from 1.7.0 to 1.10.0.

packages/webview_flutter/webview_flutter_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141

4242
dependencies {
4343
implementation 'androidx.annotation:annotation:1.7.1'
44-
implementation 'androidx.webkit:webkit:1.10.0'
44+
implementation 'androidx.webkit:webkit:1.11.0'
4545
testImplementation 'junit:junit:4.13.2'
4646
testImplementation 'org.mockito:mockito-inline:5.1.0'
4747
testImplementation 'androidx.test:core:1.3.0'

packages/webview_flutter/webview_flutter_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: webview_flutter_android
22
description: A Flutter plugin that provides a WebView widget on Android.
33
repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
5-
version: 3.16.2
5+
version: 3.16.3
66

77
environment:
88
sdk: ^3.2.0

0 commit comments

Comments
 (0)