From d44156691131583f6cddf47d23655a3471ff2634 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 3 Dec 2024 13:52:21 -0500 Subject: [PATCH] [various] Replaces deprecated `whereNotNull()` (#8215) Replaces the `whereNotNull()` method from `pkg:collection` with the Dart core `nonNulls`. `nonNulls` has been available in Dart since 3.0, so no dependency or SDK requirement changes are necessary. Fixes https://github.com/flutter/flutter/issues/159738 --- packages/go_router/CHANGELOG.md | 4 ++++ packages/go_router/lib/src/route.dart | 2 +- packages/go_router/pubspec.yaml | 2 +- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/lib/swift_generator.dart | 5 ++--- packages/pigeon/pubspec.yaml | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index b1487a22f6c3..e2f174dbef07 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/lib/src/route.dart b/packages/go_router/lib/src/route.dart index c22a33170c0c..703e470e9a65 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/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 4215e95dfdac..a5e2e26b3cf6 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 4b1c34f08252..cd80620dadde 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 117cf8d6d946..6c468902eda9 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/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index 289c50dbd887..596ae4050155 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'; @@ -158,7 +157,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 +403,7 @@ static func fromList(_ ${varNamePrefix}list: [Any?]) -> Any? { type: type, wrapped: wrapped ) - + return wrapper.unwrap() } '''); diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 76b8cecce380..192770b714d9 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.3.0