From 2bbe87a185460acdccf9907093b28ed3621925c8 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Dec 2024 13:00:28 -0500 Subject: [PATCH 1/6] Update min Flutter version --- packages/go_router/example/pubspec.yaml | 4 ++-- packages/go_router/pubspec.yaml | 4 ++-- packages/pigeon/example/app/pubspec.yaml | 2 +- .../alternate_language_test_plugin/example/pubspec.yaml | 2 +- .../alternate_language_test_plugin/pubspec.yaml | 4 ++-- .../platform_tests/shared_test_plugin_code/pubspec.yaml | 4 ++-- .../pigeon/platform_tests/test_plugin/example/pubspec.yaml | 2 +- packages/pigeon/platform_tests/test_plugin/pubspec.yaml | 4 ++-- packages/pigeon/pubspec.yaml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/go_router/example/pubspec.yaml b/packages/go_router/example/pubspec.yaml index 40a65efc431..5bcef78c499 100644 --- a/packages/go_router/example/pubspec.yaml +++ b/packages/go_router/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 3.0.1 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" dependencies: adaptive_navigation: ^0.0.4 diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 4215e95dfda..d698f5ca522 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22 environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" dependencies: collection: ^1.15.0 diff --git a/packages/pigeon/example/app/pubspec.yaml b/packages/pigeon/example/app/pubspec.yaml index ab11f4fa829..afdc8a9ba37 100644 --- a/packages/pigeon/example/app/pubspec.yaml +++ b/packages/pigeon/example/app/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0 environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: flutter: diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml index d40ce1efd99..4839db95cc0 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Pigeon test harness for alternate plugin languages. publish_to: 'none' environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: alternate_language_test_plugin: diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml b/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml index eefdc514fd1..9e4625dd037 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" flutter: plugin: diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml index f0ab70f8071..a345c4c7d30 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" dependencies: build_runner: ^2.1.10 diff --git a/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml b/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml index f37ef3a035f..9b5f46bcb78 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml +++ b/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Pigeon test harness for primary plugin languages. publish_to: 'none' environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: flutter: diff --git a/packages/pigeon/platform_tests/test_plugin/pubspec.yaml b/packages/pigeon/platform_tests/test_plugin/pubspec.yaml index 2a06f09d03f..f7a7075da11 100644 --- a/packages/pigeon/platform_tests/test_plugin/pubspec.yaml +++ b/packages/pigeon/platform_tests/test_plugin/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" flutter: plugin: diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 76b8cecce38..2dd7a11cc68 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ version: 22.6.2 # This must match the version in lib/generator_tools.dart environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: analyzer: ">=5.13.0 <7.0.0" From a199e5663d8cdc78b0dacb2a4ff5ded95922ece6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Dec 2024 13:03:41 -0500 Subject: [PATCH 2/6] Version bump --- packages/go_router/CHANGELOG.md | 4 ++++ packages/go_router/pubspec.yaml | 2 +- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index b1487a22f6c..abc8852c16f 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## 14.6.2 + +* Replaces deprecated collection method usage. + ## 14.6.1 - Fixed `PopScope`, and `WillPopScop` was not handled properly in the Root routes. diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index d698f5ca522..1113c4cbea9 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -1,7 +1,7 @@ name: go_router description: A declarative router for Flutter based on Navigation 2 supporting deep linking, data-driven routes and more -version: 14.6.1 +version: 14.6.2 repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22 diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 4b1c34f0825..cd80620dadd 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 22.6.3 + +* Replaces deprecated collection method usage. + ## 22.6.2 * Removes the `@protected` annotation from the InstanceManager field of the diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 117cf8d6d94..6c468902eda 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -14,7 +14,7 @@ import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '22.6.2'; +const String pigeonVersion = '22.6.3'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 2dd7a11cc68..ad513920f5a 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 22.6.2 # This must match the version in lib/generator_tools.dart +version: 22.6.3 # This must match the version in lib/generator_tools.dart environment: sdk: ^3.4.0 From b9aa8a23489b6e689dd9e05657df06f4365d03a6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Dec 2024 13:04:14 -0500 Subject: [PATCH 3/6] Replace usage --- packages/go_router/lib/src/route.dart | 2 +- packages/pigeon/lib/swift_generator.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/go_router/lib/src/route.dart b/packages/go_router/lib/src/route.dart index c22a33170c0..703e470e9a6 100644 --- a/packages/go_router/lib/src/route.dart +++ b/packages/go_router/lib/src/route.dart @@ -978,7 +978,7 @@ class StatefulShellRoute extends ShellRouteBase { String? restorationScopeId, List branches) { if (branches .map((StatefulShellBranch e) => e.restorationScopeId) - .whereNotNull() + .nonNulls .isNotEmpty) { assert( restorationScopeId != null, diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index 289c50dbd88..f23ba52d998 100644 --- a/packages/pigeon/lib/swift_generator.dart +++ b/packages/pigeon/lib/swift_generator.dart @@ -158,7 +158,7 @@ class SwiftGenerator extends StructuredGenerator { final Iterable proxyApiImports = root.apis .whereType() .map((AstProxyApi proxyApi) => proxyApi.swiftOptions?.import) - .whereNotNull() + .nonNulls .toSet(); for (final String import in proxyApiImports) { indent.writeln('import $import'); @@ -404,7 +404,7 @@ static func fromList(_ ${varNamePrefix}list: [Any?]) -> Any? { type: type, wrapped: wrapped ) - + return wrapper.unwrap() } '''); From 2d5a7307a7f76ff2e17d5c917cf6efc3cc1978e7 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Dec 2024 13:10:33 -0500 Subject: [PATCH 4/6] Remove unnecessary import --- packages/pigeon/lib/swift_generator.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index f23ba52d998..596ae405015 100644 --- a/packages/pigeon/lib/swift_generator.dart +++ b/packages/pigeon/lib/swift_generator.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:collection/collection.dart' as collection; import 'package:graphs/graphs.dart'; import 'package:pub_semver/pub_semver.dart'; From 52d5161d728cf6c6aab4550cdbc07a5f1bef3d5f Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Dec 2024 13:11:15 -0500 Subject: [PATCH 5/6] Revert "Update min Flutter version" This reverts commit 2bbe87a185460acdccf9907093b28ed3621925c8. --- packages/go_router/example/pubspec.yaml | 4 ++-- packages/go_router/pubspec.yaml | 4 ++-- packages/pigeon/example/app/pubspec.yaml | 2 +- .../alternate_language_test_plugin/example/pubspec.yaml | 2 +- .../alternate_language_test_plugin/pubspec.yaml | 4 ++-- .../platform_tests/shared_test_plugin_code/pubspec.yaml | 4 ++-- .../pigeon/platform_tests/test_plugin/example/pubspec.yaml | 2 +- packages/pigeon/platform_tests/test_plugin/pubspec.yaml | 4 ++-- packages/pigeon/pubspec.yaml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/go_router/example/pubspec.yaml b/packages/go_router/example/pubspec.yaml index 5bcef78c499..40a65efc431 100644 --- a/packages/go_router/example/pubspec.yaml +++ b/packages/go_router/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 3.0.1 publish_to: none environment: - sdk: ^3.4.0 - flutter: ">=3.22.0" + sdk: ^3.3.0 + flutter: ">=3.19.0" dependencies: adaptive_navigation: ^0.0.4 diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 1113c4cbea9..a5e2e26b3cf 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22 environment: - sdk: ^3.4.0 - flutter: ">=3.22.0" + sdk: ^3.3.0 + flutter: ">=3.19.0" dependencies: collection: ^1.15.0 diff --git a/packages/pigeon/example/app/pubspec.yaml b/packages/pigeon/example/app/pubspec.yaml index afdc8a9ba37..ab11f4fa829 100644 --- a/packages/pigeon/example/app/pubspec.yaml +++ b/packages/pigeon/example/app/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0 environment: - sdk: ^3.4.0 + sdk: ^3.3.0 dependencies: flutter: diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml index 4839db95cc0..d40ce1efd99 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Pigeon test harness for alternate plugin languages. publish_to: 'none' environment: - sdk: ^3.4.0 + sdk: ^3.3.0 dependencies: alternate_language_test_plugin: diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml b/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml index 9e4625dd037..eefdc514fd1 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.4.0 - flutter: ">=3.22.0" + sdk: ^3.3.0 + flutter: ">=3.19.0" flutter: plugin: diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml index a345c4c7d30..f0ab70f8071 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.4.0 - flutter: ">=3.22.0" + sdk: ^3.3.0 + flutter: ">=3.19.0" dependencies: build_runner: ^2.1.10 diff --git a/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml b/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml index 9b5f46bcb78..f37ef3a035f 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml +++ b/packages/pigeon/platform_tests/test_plugin/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Pigeon test harness for primary plugin languages. publish_to: 'none' environment: - sdk: ^3.4.0 + sdk: ^3.3.0 dependencies: flutter: diff --git a/packages/pigeon/platform_tests/test_plugin/pubspec.yaml b/packages/pigeon/platform_tests/test_plugin/pubspec.yaml index f7a7075da11..2a06f09d03f 100644 --- a/packages/pigeon/platform_tests/test_plugin/pubspec.yaml +++ b/packages/pigeon/platform_tests/test_plugin/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.4.0 - flutter: ">=3.22.0" + sdk: ^3.3.0 + flutter: ">=3.19.0" flutter: plugin: diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index ad513920f5a..192770b714d 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ version: 22.6.3 # This must match the version in lib/generator_tools.dart environment: - sdk: ^3.4.0 + sdk: ^3.3.0 dependencies: analyzer: ">=5.13.0 <7.0.0" From 13f527285903b919a2457b4e2e6935ddcd672693 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 3 Dec 2024 13:12:53 -0500 Subject: [PATCH 6/6] Match changelog style --- packages/go_router/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index abc8852c16f..e2f174dbef0 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,6 +1,6 @@ ## 14.6.2 -* Replaces deprecated collection method usage. +- Replaces deprecated collection method usage. ## 14.6.1