Skip to content

Commit 59707ba

Browse files
authored
[pigeon] requires analyzer 5.2.0 (flutter#3090)
* analyzer 5.0.0 * fix changelog * 5.2 * ^
1 parent a510db7 commit 59707ba

File tree

22 files changed

+33
-29
lines changed

22 files changed

+33
-29
lines changed

packages/pigeon/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 7.0.5
2+
3+
* Requires analyzer 5.0.0 and replaces use of deprecated APIs.
4+
15
## 7.0.4
26

37
* [c++] Fixes minor output formatting issues.

packages/pigeon/lib/generator_tools.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'ast.dart';
1111
/// The current version of pigeon.
1212
///
1313
/// This must match the version in pubspec.yaml.
14-
const String pigeonVersion = '7.0.4';
14+
const String pigeonVersion = '7.0.5';
1515

1616
/// Read all the content from [stdin] to a String.
1717
String readStdin() {

packages/pigeon/lib/pigeon_lib.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
927927
}
928928
}
929929
_currentApi = Api(
930-
name: node.name2.lexeme,
930+
name: node.name.lexeme,
931931
location: ApiLocation.host,
932932
methods: <Method>[],
933933
dartHostTestHandler: dartHostTestHandler,
@@ -936,7 +936,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
936936
);
937937
} else if (_hasMetadata(node.metadata, 'FlutterApi')) {
938938
_currentApi = Api(
939-
name: node.name2.lexeme,
939+
name: node.name.lexeme,
940940
location: ApiLocation.flutter,
941941
methods: <Method>[],
942942
documentationComments:
@@ -945,7 +945,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
945945
}
946946
} else {
947947
_currentClass = Class(
948-
name: node.name2.lexeme,
948+
name: node.name.lexeme,
949949
fields: <NamedType>[],
950950
documentationComments:
951951
_documentationCommentsParser(node.documentationComment?.tokens),
@@ -1045,7 +1045,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
10451045
getFirstChildOfType<dart_ast.SimpleIdentifier>(returnType)!;
10461046
_currentApi!.methods.add(
10471047
Method(
1048-
name: node.name2.lexeme,
1048+
name: node.name.lexeme,
10491049
returnType: TypeDeclaration(
10501050
baseName: returnTypeIdentifier.name,
10511051
typeArguments: typeAnnotationsToTypeArguments(
@@ -1063,7 +1063,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
10631063
} else if (_currentClass != null) {
10641064
_errors.add(Error(
10651065
message:
1066-
'Methods aren\'t supported in Pigeon data classes ("${node.name2.lexeme}").',
1066+
'Methods aren\'t supported in Pigeon data classes ("${node.name.lexeme}").',
10671067
lineNumber: _calculateLineNumber(source, node.offset)));
10681068
}
10691069
node.visitChildren(this);
@@ -1073,10 +1073,10 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
10731073
@override
10741074
Object? visitEnumDeclaration(dart_ast.EnumDeclaration node) {
10751075
_enums.add(Enum(
1076-
name: node.name2.lexeme,
1076+
name: node.name.lexeme,
10771077
members: node.constants
10781078
.map((dart_ast.EnumConstantDeclaration e) => EnumMember(
1079-
name: e.name2.lexeme,
1079+
name: e.name.lexeme,
10801080
documentationComments: _documentationCommentsParser(
10811081
e.documentationComment?.tokens),
10821082
))
@@ -1129,7 +1129,7 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
11291129
isNullable: type.question != null,
11301130
typeArguments: typeAnnotationsToTypeArguments(typeArguments),
11311131
),
1132-
name: node.fields.variables[0].name2.lexeme,
1132+
name: node.fields.variables[0].name.lexeme,
11331133
offset: node.offset,
11341134
documentationComments:
11351135
_documentationCommentsParser(node.documentationComment?.tokens),

packages/pigeon/mock_handler_tester/test/message.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/mock_handler_tester/test/test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import
88
// ignore_for_file: avoid_relative_lib_imports

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
package com.example.alternate_language_test_plugin;

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
#import <Foundation/Foundation.h>

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
#import "CoreTests.gen.h"

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.3), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
88

packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
package com.example.test_plugin

packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
import Foundation

packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
import Foundation

packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
#undef _HAS_EXCEPTIONS

packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
//
5-
// Autogenerated from Pigeon (v7.0.4), do not edit directly.
5+
// Autogenerated from Pigeon (v7.0.5), do not edit directly.
66
// See also: https://pub.dev/packages/pigeon
77

88
#ifndef PIGEON_CORE_TESTS_GEN_H_

packages/pigeon/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: pigeon
22
description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
33
repository: https://github.com/flutter/packages/tree/main/packages/pigeon
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apigeon
5-
version: 7.0.4 # This must match the version in lib/generator_tools.dart
5+
version: 7.0.5 # This must match the version in lib/generator_tools.dart
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"
99
flutter: ">=3.0.0"
1010

1111
dependencies:
12-
analyzer: ">=4.4.0 <5.0.0"
12+
analyzer: "^5.2.0"
1313
args: ^2.0.0
1414
collection: ^1.15.0
1515
meta: ^1.7.0

0 commit comments

Comments
 (0)