From 1705c1f0b03c6bfb419459037227391c300824d1 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Fri, 27 Jan 2023 13:17:23 -0800 Subject: [PATCH] removes raw ArrayLists --- packages/pigeon/CHANGELOG.md | 4 + packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/lib/java_generator.dart | 5 +- .../mock_handler_tester/test/message.dart | 2 +- .../pigeon/mock_handler_tester/test/test.dart | 2 +- .../CoreTests.java | 82 +++++++++---------- .../ios/Classes/CoreTests.gen.h | 2 +- .../ios/Classes/CoreTests.gen.m | 2 +- .../lib/core_tests.gen.dart | 2 +- .../lib/flutter_unittests.gen.dart | 2 +- .../lib/multiple_arity.gen.dart | 2 +- .../lib/non_null_fields.gen.dart | 2 +- .../lib/null_fields.gen.dart | 2 +- .../lib/nullable_returns.gen.dart | 2 +- .../lib/primitive.gen.dart | 2 +- .../lib/src/generated/core_tests.gen.dart | 2 +- .../com/example/test_plugin/CoreTests.gen.kt | 4 +- .../ios/Classes/CoreTests.gen.swift | 30 +++---- .../macos/Classes/CoreTests.gen.swift | 30 +++---- .../windows/pigeon/core_tests.gen.cpp | 2 +- .../windows/pigeon/core_tests.gen.h | 2 +- packages/pigeon/pubspec.yaml | 2 +- packages/pigeon/test/java_generator_test.dart | 2 + 23 files changed, 98 insertions(+), 91 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 891bce4382b..79bf2faae93 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 7.1.2 + +* [java] Fixes raw types lint issues. + ## 7.1.1 * [c++] Fixes handling of the `cpp*` options in `@ConfigurePigeon` annotations. diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 784b2011dd0..1d263c1fbe4 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -11,7 +11,7 @@ import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '7.1.1'; +const String pigeonVersion = '7.1.2'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java_generator.dart index 9facc2642db..c11845281e1 100644 --- a/packages/pigeon/lib/java_generator.dart +++ b/packages/pigeon/lib/java_generator.dart @@ -604,7 +604,8 @@ class JavaGenerator extends StructuredGenerator { final String returnType = method.returnType.isVoid ? 'Void' : _javaTypeForDartType(method.returnType); - indent.writeln('ArrayList wrapped = new ArrayList<>();'); + indent.writeln( + 'ArrayList wrapped = new ArrayList();'); indent.write('try '); indent.addScoped('{', '}', () { final List methodArgument = []; @@ -768,7 +769,7 @@ Result<$returnType> $resultName = indent.format(''' @NonNull private static ArrayList wrapError(@NonNull Throwable exception) { -\tArrayList errorList = new ArrayList<>(3); +\tArrayList errorList = new ArrayList(3); \terrorList.add(exception.toString()); \terrorList.add(exception.getClass().getSimpleName()); \terrorList.add( diff --git a/packages/pigeon/mock_handler_tester/test/message.dart b/packages/pigeon/mock_handler_tester/test/message.dart index 9cd02367e12..3d6f8860097 100644 --- a/packages/pigeon/mock_handler_tester/test/message.dart +++ b/packages/pigeon/mock_handler_tester/test/message.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/mock_handler_tester/test/test.dart b/packages/pigeon/mock_handler_tester/test/test.dart index 152a0763473..7dd3a292160 100644 --- a/packages/pigeon/mock_handler_tester/test/test.dart +++ b/packages/pigeon/mock_handler_tester/test/test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import // ignore_for_file: avoid_relative_lib_imports diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java index 3c8cb333e99..35ffd0ce5b9 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.example.alternate_language_test_plugin; @@ -27,7 +27,7 @@ public class CoreTests { @NonNull private static ArrayList wrapError(@NonNull Throwable exception) { - ArrayList errorList = new ArrayList<>(3); + ArrayList errorList = new ArrayList(3); errorList.add(exception.toString()); errorList.add(exception.getClass().getSimpleName()); errorList.add( @@ -884,7 +884,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { api.noop(); wrapped.add(0, null); @@ -907,7 +907,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -936,7 +936,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -962,7 +962,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { api.throwError(); wrapped.add(0, null); @@ -983,7 +983,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1012,7 +1012,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1039,7 +1039,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1068,7 +1068,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1097,7 +1097,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1126,7 +1126,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1155,7 +1155,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1184,7 +1184,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1211,7 +1211,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1243,7 +1243,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1271,7 +1271,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1297,7 +1297,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1323,7 +1323,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1349,7 +1349,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1375,7 +1375,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1399,7 +1399,7 @@ static void setup(BinaryMessenger binaryMessenger, HostIntegrationCoreApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { Result resultCallback = new Result() { @@ -1433,7 +1433,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1473,7 +1473,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { Result resultCallback = new Result() { @@ -1507,7 +1507,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1547,7 +1547,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1590,7 +1590,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1630,7 +1630,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1671,7 +1671,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1711,7 +1711,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1751,7 +1751,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1791,7 +1791,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1831,7 +1831,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1871,7 +1871,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1908,7 +1908,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1946,7 +1946,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -1983,7 +1983,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -2020,7 +2020,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -2057,7 +2057,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -2094,7 +2094,7 @@ public void error(Throwable error) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { ArrayList args = (ArrayList) message; assert args != null; @@ -2473,7 +2473,7 @@ static void setup(BinaryMessenger binaryMessenger, HostTrivialApi api) { if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList<>(); + ArrayList wrapped = new ArrayList(); try { api.noop(); wrapped.add(0, null); diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h index 24cccf7e6eb..8bc97a63b78 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m index 1a5bf692a9a..193eb8dd2b0 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "CoreTests.gen.h" diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart index 6fb1023d19b..14e26165bd7 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart index 8b416c495ff..e3f3774c5ac 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart index 1d0d98e53b1..fc368e01c86 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart index aea9caa9c95..1dba9814b61 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart index ee30169b714..0959a91fa61 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart index 9e2d4b6ddae..05e9e5b568e 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart index 0051028506f..cb5c01db073 100644 --- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart +++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.0.5), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index 4db24a864a5..14e26165bd7 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt index 81ddf7f965d..decb7ae76a0 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt @@ -1,8 +1,8 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.example.test_plugin diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift index 5bf806ea7c0..573f5b382c8 100644 --- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift @@ -1,8 +1,8 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -110,23 +110,23 @@ struct AllNullableTypes { var aNullableString: String? = nil static func fromList(_ list: [Any?]) -> AllNullableTypes? { - let aNullableBool = list[0] as? Bool - let aNullableInt = list[1] as? Int32 - let aNullableDouble = list[2] as? Double - let aNullableByteArray = list[3] as? FlutterStandardTypedData - let aNullable4ByteArray = list[4] as? FlutterStandardTypedData - let aNullable8ByteArray = list[5] as? FlutterStandardTypedData - let aNullableFloatArray = list[6] as? FlutterStandardTypedData - let aNullableList = list[7] as? [Any?] - let aNullableMap = list[8] as? [AnyHashable: Any?] - let nullableNestedList = list[9] as? [[Bool?]?] - let nullableMapWithAnnotations = list[10] as? [String?: String?] - let nullableMapWithObject = list[11] as? [String?: Any?] + let aNullableBool = list[0] as? Bool + let aNullableInt = list[1] as? Int32 + let aNullableDouble = list[2] as? Double + let aNullableByteArray = list[3] as? FlutterStandardTypedData + let aNullable4ByteArray = list[4] as? FlutterStandardTypedData + let aNullable8ByteArray = list[5] as? FlutterStandardTypedData + let aNullableFloatArray = list[6] as? FlutterStandardTypedData + let aNullableList = list[7] as? [Any?] + let aNullableMap = list[8] as? [AnyHashable: Any?] + let nullableNestedList = list[9] as? [[Bool?]?] + let nullableMapWithAnnotations = list[10] as? [String?: String?] + let nullableMapWithObject = list[11] as? [String?: Any?] var aNullableEnum: AnEnum? = nil if let aNullableEnumRawValue = list[12] as? Int { aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue) } - let aNullableString = list[13] as? String + let aNullableString = list[13] as? String return AllNullableTypes( aNullableBool: aNullableBool, diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift index 5bf806ea7c0..573f5b382c8 100644 --- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift @@ -1,8 +1,8 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -110,23 +110,23 @@ struct AllNullableTypes { var aNullableString: String? = nil static func fromList(_ list: [Any?]) -> AllNullableTypes? { - let aNullableBool = list[0] as? Bool - let aNullableInt = list[1] as? Int32 - let aNullableDouble = list[2] as? Double - let aNullableByteArray = list[3] as? FlutterStandardTypedData - let aNullable4ByteArray = list[4] as? FlutterStandardTypedData - let aNullable8ByteArray = list[5] as? FlutterStandardTypedData - let aNullableFloatArray = list[6] as? FlutterStandardTypedData - let aNullableList = list[7] as? [Any?] - let aNullableMap = list[8] as? [AnyHashable: Any?] - let nullableNestedList = list[9] as? [[Bool?]?] - let nullableMapWithAnnotations = list[10] as? [String?: String?] - let nullableMapWithObject = list[11] as? [String?: Any?] + let aNullableBool = list[0] as? Bool + let aNullableInt = list[1] as? Int32 + let aNullableDouble = list[2] as? Double + let aNullableByteArray = list[3] as? FlutterStandardTypedData + let aNullable4ByteArray = list[4] as? FlutterStandardTypedData + let aNullable8ByteArray = list[5] as? FlutterStandardTypedData + let aNullableFloatArray = list[6] as? FlutterStandardTypedData + let aNullableList = list[7] as? [Any?] + let aNullableMap = list[8] as? [AnyHashable: Any?] + let nullableNestedList = list[9] as? [[Bool?]?] + let nullableMapWithAnnotations = list[10] as? [String?: String?] + let nullableMapWithObject = list[11] as? [String?: Any?] var aNullableEnum: AnEnum? = nil if let aNullableEnumRawValue = list[12] as? Int { aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue) } - let aNullableString = list[13] as? String + let aNullableString = list[13] as? String return AllNullableTypes( aNullableBool: aNullableBool, diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp index 85afe61cac0..834fc0da547 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #undef _HAS_EXCEPTIONS diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h index eab4bddd461..081dd22718d 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Autogenerated from Pigeon (v7.1.1), do not edit directly. +// Autogenerated from Pigeon (v7.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #ifndef PIGEON_CORE_TESTS_GEN_H_ diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 351b71b7589..c5359830586 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%3Apigeon -version: 7.1.1 # This must match the version in lib/generator_tools.dart +version: 7.1.2 # This must match the version in lib/generator_tools.dart environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart index 2e5b2642a8f..42a5536c480 100644 --- a/packages/pigeon/test/java_generator_test.dart +++ b/packages/pigeon/test/java_generator_test.dart @@ -38,6 +38,8 @@ void main() { code, contains(RegExp( r'@NonNull\s*private static ArrayList wrapError\(@NonNull Throwable exception\)'))); + expect(code, isNot(contains('ArrayList '))); + expect(code, isNot(contains('ArrayList<>'))); }); test('gen one enum', () {