flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-06-27 21:28:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[pigeon] Fix C++ config handling (#3094)

Browse Source 
* Fix config names

* Version bump
This commit is contained in:
stuartmorgan
2023-01-26 20:41:53 -08:00
committed by GitHub
parent da749434aa
commit f324abb762
13 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/pigeon/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 7.1.1
* [c++] Fixes handling of the `cpp*` options in `@ConfigurePigeon` annotations.
## 7.1.0 ## 7.1.0
* Adds `@SwiftFunction` annotation for specifying custom swift function signature. * Adds `@SwiftFunction` annotation for specifying custom swift function signature.

2
packages/pigeon/lib/generator_tools.dart
View File

@ -11,7 +11,7 @@ import 'ast.dart';
/// The current version of pigeon. /// The current version of pigeon.
/// ///
/// This must match the version in pubspec.yaml. /// This must match the version in pubspec.yaml.
const String pigeonVersion = '7.1.0'; const String pigeonVersion = '7.1.1';
/// Read all the content from [stdin] to a String. /// Read all the content from [stdin] to a String.
String readStdin() { String readStdin() {

15
packages/pigeon/lib/pigeon_lib.dart
View File

@ -274,11 +274,10 @@ class PigeonOptions {
kotlinOptions: map.containsKey('kotlinOptions') kotlinOptions: map.containsKey('kotlinOptions')
? KotlinOptions.fromMap(map['kotlinOptions']! as Map<String, Object>) ? KotlinOptions.fromMap(map['kotlinOptions']! as Map<String, Object>)
: null, : null,
cppHeaderOut: map['experimental_cppHeaderOut'] as String?, cppHeaderOut: map['cppHeaderOut'] as String?,
cppSourceOut: map['experimental_cppSourceOut'] as String?, cppSourceOut: map['cppSourceOut'] as String?,
cppOptions: map.containsKey('experimental_cppOptions') cppOptions: map.containsKey('cppOptions')
? CppOptions.fromMap( ? CppOptions.fromMap(map['cppOptions']! as Map<String, Object>)
map['experimental_cppOptions']! as Map<String, Object>)
: null, : null,
dartOptions: map.containsKey('dartOptions') dartOptions: map.containsKey('dartOptions')
? DartOptions.fromMap(map['dartOptions']! as Map<String, Object>) ? DartOptions.fromMap(map['dartOptions']! as Map<String, Object>)
@ -306,9 +305,9 @@ class PigeonOptions {
if (swiftOptions != null) 'swiftOptions': swiftOptions!.toMap(), if (swiftOptions != null) 'swiftOptions': swiftOptions!.toMap(),
if (kotlinOut != null) 'kotlinOut': kotlinOut!, if (kotlinOut != null) 'kotlinOut': kotlinOut!,
if (kotlinOptions != null) 'kotlinOptions': kotlinOptions!.toMap(), if (kotlinOptions != null) 'kotlinOptions': kotlinOptions!.toMap(),
if (cppHeaderOut != null) 'experimental_cppHeaderOut': cppHeaderOut!, if (cppHeaderOut != null) 'cppHeaderOut': cppHeaderOut!,
if (cppSourceOut != null) 'experimental_cppSourceOut': cppSourceOut!, if (cppSourceOut != null) 'cppSourceOut': cppSourceOut!,
if (cppOptions != null) 'experimental_cppOptions': cppOptions!.toMap(), if (cppOptions != null) 'cppOptions': cppOptions!.toMap(),
if (dartOptions != null) 'dartOptions': dartOptions!.toMap(), if (dartOptions != null) 'dartOptions': dartOptions!.toMap(),
if (copyrightHeader != null) 'copyrightHeader': copyrightHeader!, if (copyrightHeader != null) 'copyrightHeader': copyrightHeader!,
if (astOut != null) 'astOut': astOut!, if (astOut != null) 'astOut': astOut!,

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

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
package com.example.alternate_language_test_plugin; package com.example.alternate_language_test_plugin;

2
packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

2
packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
#import "CoreTests.gen.h" #import "CoreTests.gen.h"

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

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // 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 // 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

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

@ -1,8 +1,8 @@
// Copyright 2013 The Flutter Authors. All rights reserved. // Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
package com.example.test_plugin package com.example.test_plugin

30
packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
View File

@ -1,8 +1,8 @@
// Copyright 2013 The Flutter Authors. All rights reserved. // Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
import Foundation import Foundation
@ -110,23 +110,23 @@ struct AllNullableTypes {
var aNullableString: String? = nil var aNullableString: String? = nil
static func fromList(_ list: [Any?]) -> AllNullableTypes? { static func fromList(_ list: [Any?]) -> AllNullableTypes? {
let aNullableBool = list[0] as? Bool let aNullableBool = list[0] as? Bool
let aNullableInt = list[1] as? Int32 let aNullableInt = list[1] as? Int32
let aNullableDouble = list[2] as? Double let aNullableDouble = list[2] as? Double
let aNullableByteArray = list[3] as? FlutterStandardTypedData let aNullableByteArray = list[3] as? FlutterStandardTypedData
let aNullable4ByteArray = list[4] as? FlutterStandardTypedData let aNullable4ByteArray = list[4] as? FlutterStandardTypedData
let aNullable8ByteArray = list[5] as? FlutterStandardTypedData let aNullable8ByteArray = list[5] as? FlutterStandardTypedData
let aNullableFloatArray = list[6] as? FlutterStandardTypedData let aNullableFloatArray = list[6] as? FlutterStandardTypedData
let aNullableList = list[7] as? [Any?] let aNullableList = list[7] as? [Any?]
let aNullableMap = list[8] as? [AnyHashable: Any?] let aNullableMap = list[8] as? [AnyHashable: Any?]
let nullableNestedList = list[9] as? [[Bool?]?] let nullableNestedList = list[9] as? [[Bool?]?]
let nullableMapWithAnnotations = list[10] as? [String?: String?] let nullableMapWithAnnotations = list[10] as? [String?: String?]
let nullableMapWithObject = list[11] as? [String?: Any?] let nullableMapWithObject = list[11] as? [String?: Any?]
var aNullableEnum: AnEnum? = nil var aNullableEnum: AnEnum? = nil
if let aNullableEnumRawValue = list[12] as? Int { if let aNullableEnumRawValue = list[12] as? Int {
aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue) aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue)
} }
let aNullableString = list[13] as? String let aNullableString = list[13] as? String
return AllNullableTypes( return AllNullableTypes(
aNullableBool: aNullableBool, aNullableBool: aNullableBool,

30
packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
View File

@ -1,8 +1,8 @@
// Copyright 2013 The Flutter Authors. All rights reserved. // Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
import Foundation import Foundation
@ -110,23 +110,23 @@ struct AllNullableTypes {
var aNullableString: String? = nil var aNullableString: String? = nil
static func fromList(_ list: [Any?]) -> AllNullableTypes? { static func fromList(_ list: [Any?]) -> AllNullableTypes? {
let aNullableBool = list[0] as? Bool let aNullableBool = list[0] as? Bool
let aNullableInt = list[1] as? Int32 let aNullableInt = list[1] as? Int32
let aNullableDouble = list[2] as? Double let aNullableDouble = list[2] as? Double
let aNullableByteArray = list[3] as? FlutterStandardTypedData let aNullableByteArray = list[3] as? FlutterStandardTypedData
let aNullable4ByteArray = list[4] as? FlutterStandardTypedData let aNullable4ByteArray = list[4] as? FlutterStandardTypedData
let aNullable8ByteArray = list[5] as? FlutterStandardTypedData let aNullable8ByteArray = list[5] as? FlutterStandardTypedData
let aNullableFloatArray = list[6] as? FlutterStandardTypedData let aNullableFloatArray = list[6] as? FlutterStandardTypedData
let aNullableList = list[7] as? [Any?] let aNullableList = list[7] as? [Any?]
let aNullableMap = list[8] as? [AnyHashable: Any?] let aNullableMap = list[8] as? [AnyHashable: Any?]
let nullableNestedList = list[9] as? [[Bool?]?] let nullableNestedList = list[9] as? [[Bool?]?]
let nullableMapWithAnnotations = list[10] as? [String?: String?] let nullableMapWithAnnotations = list[10] as? [String?: String?]
let nullableMapWithObject = list[11] as? [String?: Any?] let nullableMapWithObject = list[11] as? [String?: Any?]
var aNullableEnum: AnEnum? = nil var aNullableEnum: AnEnum? = nil
if let aNullableEnumRawValue = list[12] as? Int { if let aNullableEnumRawValue = list[12] as? Int {
aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue) aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue)
} }
let aNullableString = list[13] as? String let aNullableString = list[13] as? String
return AllNullableTypes( return AllNullableTypes(
aNullableBool: aNullableBool, aNullableBool: aNullableBool,

2
packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
#undef _HAS_EXCEPTIONS #undef _HAS_EXCEPTIONS

2
packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// Autogenerated from Pigeon (v7.1.0), do not edit directly. // Autogenerated from Pigeon (v7.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
#ifndef PIGEON_CORE_TESTS_GEN_H_ #ifndef PIGEON_CORE_TESTS_GEN_H_

2
packages/pigeon/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: pigeon
description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. 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 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 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apigeon
version: 7.1.0 # This must match the version in lib/generator_tools.dart version: 7.1.1 # This must match the version in lib/generator_tools.dart
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.12.0 <3.0.0"