From 29d5f53b81a4a5e3ba703841ec28a3293fa197b5 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Nov 2025 14:20:55 -0500 Subject: [PATCH 1/5] Fix deprecations with 8 --- packages/pigeon/lib/src/pigeon_lib.dart | 14 +++++++------- packages/pigeon/lib/src/pigeon_lib_internal.dart | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/pigeon/lib/src/pigeon_lib.dart b/packages/pigeon/lib/src/pigeon_lib.dart index 676c0e42815..2bb976475b9 100644 --- a/packages/pigeon/lib/src/pigeon_lib.dart +++ b/packages/pigeon/lib/src/pigeon_lib.dart @@ -14,7 +14,7 @@ import 'package:analyzer/dart/analysis/analysis_context_collection.dart' import 'package:analyzer/dart/analysis/results.dart' show ParsedUnitResult; import 'package:analyzer/dart/analysis/session.dart' show AnalysisSession; import 'package:analyzer/dart/ast/ast.dart' as dart_ast; -import 'package:analyzer/error/error.dart' show AnalysisError; +import 'package:analyzer/diagnostic/diagnostic.dart' show Diagnostic; import 'package:args/args.dart'; import 'package:meta/meta.dart' show visibleForTesting; import 'package:path/path.dart' as path; @@ -467,18 +467,18 @@ class Pigeon { final AnalysisSession session = context.currentSession; final ParsedUnitResult result = session.getParsedUnit(path) as ParsedUnitResult; - if (result.errors.isEmpty) { + if (result.diagnostics.isEmpty) { final dart_ast.CompilationUnit unit = result.unit; unit.accept(rootBuilder); } else { - for (final AnalysisError error in result.errors) { + for (final Diagnostic diagnostic in result.diagnostics) { compilationErrors.add( Error( - message: error.message, - filename: error.source.fullName, + message: diagnostic.message, + filename: diagnostic.source.fullName, lineNumber: calculateLineNumber( - error.source.contents.data, - error.offset, + diagnostic.source.contents.data, + diagnostic.offset, ), ), ); diff --git a/packages/pigeon/lib/src/pigeon_lib_internal.dart b/packages/pigeon/lib/src/pigeon_lib_internal.dart index 3c5c67946e3..7690f5696f5 100644 --- a/packages/pigeon/lib/src/pigeon_lib_internal.dart +++ b/packages/pigeon/lib/src/pigeon_lib_internal.dart @@ -1656,7 +1656,7 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor { ); } else if (node.extendsClause != null) { superClass = TypeDeclaration( - baseName: node.extendsClause!.superclass.name2.lexeme, + baseName: node.extendsClause!.superclass.name.lexeme, isNullable: false, ); } @@ -1666,7 +1666,7 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor { for (final dart_ast.NamedType type in node.implementsClause!.interfaces) { interfaces.add( - TypeDeclaration(baseName: type.name2.lexeme, isNullable: false), + TypeDeclaration(baseName: type.name.lexeme, isNullable: false), ); } } @@ -1777,8 +1777,8 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor { name: node.name.lexeme, fields: [], superClassName: - node.implementsClause?.interfaces.first.name2.toString() ?? - node.extendsClause?.superclass.name2.toString(), + node.implementsClause?.interfaces.first.name.toString() ?? + node.extendsClause?.superclass.name.toString(), isSealed: node.sealedKeyword != null, isSwiftClass: _hasMetadata(node.metadata, 'SwiftClass'), documentationComments: _documentationCommentsParser( @@ -2137,9 +2137,9 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor { static String _getNamedTypeQualifiedName(dart_ast.NamedType node) { final dart_ast.ImportPrefixReference? importPrefix = node.importPrefix; if (importPrefix != null) { - return '${importPrefix.name.lexeme}.${node.name2.lexeme}'; + return '${importPrefix.name.lexeme}.${node.name.lexeme}'; } - return node.name2.lexeme; + return node.name.lexeme; } void _addProxyApiField( From 50384e622b6d8c9063d85f62ba09f0dc0d5e8a7c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Nov 2025 14:22:20 -0500 Subject: [PATCH 2/5] Require 8 for the new methods --- packages/pigeon/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 5dde01163aa..1f0b3456d3d 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ^3.8.0 dependencies: - analyzer: ">=6.0.0 <9.0.0" + analyzer: ">=8.0.0 <9.0.0" args: ^2.1.0 code_builder: ^4.10.0 collection: ^1.15.0 From f595c7f0b827eba770caee843d981658ebeb7895 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Nov 2025 14:25:01 -0500 Subject: [PATCH 3/5] Add compatibility with analyzer 9 --- packages/pigeon/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 1f0b3456d3d..1decc88c549 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ^3.8.0 dependencies: - analyzer: ">=8.0.0 <9.0.0" + analyzer: ">=8.0.0 <10.0.0" args: ^2.1.0 code_builder: ^4.10.0 collection: ^1.15.0 From 7494f040de7920fd6dc89414d145d38534cbfdfa Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Nov 2025 14:26:52 -0500 Subject: [PATCH 4/5] Version bump --- packages/pigeon/CHANGELOG.md | 3 ++- packages/pigeon/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 895e3790bf3..8eea8378b28 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 26.1.1 +* Updates supported `analyzer` versions to 8.x or 9.x. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 26.1.0 diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 1decc88c549..44fa849c60c 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: 26.1.0 # This must match the version in lib/src/generator_tools.dart +version: 26.1.1 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.8.0 From aff21fbf6fc86ca6cc6db7341aa1b51107ddb2bd Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Nov 2025 14:35:50 -0500 Subject: [PATCH 5/5] Missing version bump --- packages/pigeon/lib/src/generator_tools.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index 73ced7b3134..e75bdfcd1ae 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '26.1.0'; +const String pigeonVersion = '26.1.1'; /// Read all the content from [stdin] to a String. String readStdin() {