Skip to content

Commit 002ab81

Browse files
committed
fix: resolve post-merge CI failures for pigeon upgrade
1 parent 68052ec commit 002ab81

File tree

19 files changed

+7592
-4486
lines changed

19 files changed

+7592
-4486
lines changed

melos.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ scripts:
239239
melos exec -- "flutter pub run pigeon --input ./pigeons/messages.dart" && \
240240
melos run generate:pigeon:macos --no-select && \
241241
melos run generate:pigeon:android --no-select && \
242+
melos run generate:pigeon:windows --no-select && \
242243
melos run format-ci --no-select
243244
packageFilters:
244245
fileExists: 'pigeons/messages.dart'
@@ -259,6 +260,13 @@ scripts:
259260
dirExists: 'android'
260261
description: Transform the method toList() into a public one to be used in EventChannel
261262

263+
generate:pigeon:windows:
264+
run: |
265+
melos exec -- "perl -i -pe 's{^(\s+::flutter::EncodableList ToEncodableList\(\) const;)\n}{ public:\n\$1\n private:\n}' ./windows/messages.g.h"
266+
packageFilters:
267+
fileExists: 'windows/messages.g.h'
268+
description: Make ToEncodableList public so it can be called from plugin code.
269+
262270
# Additional cleanup lifecycle script, executed when `melos clean` is run.
263271
postclean: >
264272
melos exec -c 6 -- "flutter clean"

packages/cloud_firestore/cloud_firestore/windows/messages.g.h

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,13 @@ class InternalFirebaseSettings {
194194
private:
195195
static InternalFirebaseSettings FromEncodableList(
196196
const ::flutter::EncodableList& list);
197+
198+
public:
199+
public:
197200
::flutter::EncodableList ToEncodableList() const;
201+
202+
private:
203+
private:
198204
friend class FirestorePigeonFirebaseApp;
199205
friend class FirebaseFirestoreHostApi;
200206
friend class FirebaseFirestoreHostApiCodecSerializer;
@@ -238,7 +244,13 @@ class FirestorePigeonFirebaseApp {
238244
private:
239245
static FirestorePigeonFirebaseApp FromEncodableList(
240246
const ::flutter::EncodableList& list);
247+
248+
public:
249+
public:
241250
::flutter::EncodableList ToEncodableList() const;
251+
252+
private:
253+
private:
242254
friend class FirebaseFirestoreHostApi;
243255
friend class FirebaseFirestoreHostApiCodecSerializer;
244256
std::string app_name_;
@@ -267,8 +279,13 @@ class InternalSnapshotMetadata {
267279

268280
static InternalSnapshotMetadata FromEncodableList(
269281
const ::flutter::EncodableList& list);
282+
283+
public:
284+
public:
270285
::flutter::EncodableList ToEncodableList() const;
271286

287+
private:
288+
private:
272289
private:
273290
friend class InternalDocumentSnapshot;
274291
friend class InternalQuerySnapshot;
@@ -314,8 +331,13 @@ class InternalDocumentSnapshot {
314331

315332
static InternalDocumentSnapshot FromEncodableList(
316333
const ::flutter::EncodableList& list);
334+
335+
public:
336+
public:
317337
::flutter::EncodableList ToEncodableList() const;
318338

339+
private:
340+
private:
319341
private:
320342
friend class InternalDocumentChange;
321343
friend class FirebaseFirestoreHostApi;
@@ -359,8 +381,13 @@ class InternalDocumentChange {
359381

360382
static InternalDocumentChange FromEncodableList(
361383
const ::flutter::EncodableList& list);
384+
385+
public:
386+
public:
362387
::flutter::EncodableList ToEncodableList() const;
363388

389+
private:
390+
private:
364391
private:
365392
friend class FirebaseFirestoreHostApi;
366393
friend class FirebaseFirestoreHostApiCodecSerializer;
@@ -403,7 +430,13 @@ class InternalQuerySnapshot {
403430
private:
404431
static InternalQuerySnapshot FromEncodableList(
405432
const ::flutter::EncodableList& list);
433+
434+
public:
435+
public:
406436
::flutter::EncodableList ToEncodableList() const;
437+
438+
private:
439+
private:
407440
friend class FirebaseFirestoreHostApi;
408441
friend class FirebaseFirestoreHostApiCodecSerializer;
409442
::flutter::EncodableList documents_;
@@ -449,7 +482,13 @@ class InternalPipelineResult {
449482
private:
450483
static InternalPipelineResult FromEncodableList(
451484
const ::flutter::EncodableList& list);
485+
486+
public:
487+
public:
452488
::flutter::EncodableList ToEncodableList() const;
489+
490+
private:
491+
private:
453492
friend class FirebaseFirestoreHostApi;
454493
friend class FirebaseFirestoreHostApiCodecSerializer;
455494
std::optional<std::string> document_path_;
@@ -480,7 +519,13 @@ class InternalPipelineSnapshot {
480519
private:
481520
static InternalPipelineSnapshot FromEncodableList(
482521
const ::flutter::EncodableList& list);
522+
523+
public:
524+
public:
483525
::flutter::EncodableList ToEncodableList() const;
526+
527+
private:
528+
private:
484529
friend class FirebaseFirestoreHostApi;
485530
friend class FirebaseFirestoreHostApiCodecSerializer;
486531
::flutter::EncodableList results_;
@@ -510,7 +555,13 @@ class InternalGetOptions {
510555
private:
511556
static InternalGetOptions FromEncodableList(
512557
const ::flutter::EncodableList& list);
558+
559+
public:
560+
public:
513561
::flutter::EncodableList ToEncodableList() const;
562+
563+
private:
564+
private:
514565
friend class FirebaseFirestoreHostApi;
515566
friend class FirebaseFirestoreHostApiCodecSerializer;
516567
Source source_;
@@ -544,7 +595,13 @@ class InternalDocumentOption {
544595
private:
545596
static InternalDocumentOption FromEncodableList(
546597
const ::flutter::EncodableList& list);
598+
599+
public:
600+
public:
547601
::flutter::EncodableList ToEncodableList() const;
602+
603+
private:
604+
private:
548605
friend class InternalTransactionCommand;
549606
friend class DocumentReferenceRequest;
550607
friend class FirebaseFirestoreHostApi;
@@ -596,7 +653,13 @@ class InternalTransactionCommand {
596653
private:
597654
static InternalTransactionCommand FromEncodableList(
598655
const ::flutter::EncodableList& list);
656+
657+
public:
658+
public:
599659
::flutter::EncodableList ToEncodableList() const;
660+
661+
private:
662+
private:
600663
friend class FirebaseFirestoreHostApi;
601664
friend class FirebaseFirestoreHostApiCodecSerializer;
602665
InternalTransactionType type_;
@@ -651,7 +714,13 @@ class DocumentReferenceRequest {
651714
private:
652715
static DocumentReferenceRequest FromEncodableList(
653716
const ::flutter::EncodableList& list);
717+
718+
public:
719+
public:
654720
::flutter::EncodableList ToEncodableList() const;
721+
722+
private:
723+
private:
655724
friend class FirebaseFirestoreHostApi;
656725
friend class FirebaseFirestoreHostApiCodecSerializer;
657726
std::string path_;
@@ -723,7 +792,13 @@ class InternalQueryParameters {
723792
private:
724793
static InternalQueryParameters FromEncodableList(
725794
const ::flutter::EncodableList& list);
795+
796+
public:
797+
public:
726798
::flutter::EncodableList ToEncodableList() const;
799+
800+
private:
801+
private:
727802
friend class FirebaseFirestoreHostApi;
728803
friend class FirebaseFirestoreHostApiCodecSerializer;
729804
std::optional<::flutter::EncodableList> where_;
@@ -761,7 +836,13 @@ class AggregateQuery {
761836

762837
private:
763838
static AggregateQuery FromEncodableList(const ::flutter::EncodableList& list);
839+
840+
public:
841+
public:
764842
::flutter::EncodableList ToEncodableList() const;
843+
844+
private:
845+
private:
765846
friend class FirebaseFirestoreHostApi;
766847
friend class FirebaseFirestoreHostApiCodecSerializer;
767848
AggregateType type_;
@@ -799,7 +880,13 @@ class AggregateQueryResponse {
799880
private:
800881
static AggregateQueryResponse FromEncodableList(
801882
const ::flutter::EncodableList& list);
883+
884+
public:
885+
public:
802886
::flutter::EncodableList ToEncodableList() const;
887+
888+
private:
889+
private:
803890
friend class FirebaseFirestoreHostApi;
804891
friend class FirebaseFirestoreHostApiCodecSerializer;
805892
AggregateType type_;

packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/method_channel/method_channel_firestore.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import 'method_channel_pipeline_snapshot.dart';
2020
import 'method_channel_query.dart';
2121
import 'method_channel_transaction.dart';
2222
import 'method_channel_write_batch.dart';
23-
import '../pigeon/messages.pigeon.dart' show PigeonCodec;
2423
import 'utils/exception.dart';
2524

2625
/// The entry point for accessing a Firestore.

packages/firebase_analytics/firebase_analytics/windows/messages.g.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,13 @@ class AnalyticsEvent {
8383

8484
private:
8585
static AnalyticsEvent FromEncodableList(const ::flutter::EncodableList& list);
86+
87+
public:
88+
public:
8689
::flutter::EncodableList ToEncodableList() const;
90+
91+
private:
92+
private:
8793
friend class FirebaseAnalyticsHostApi;
8894
friend class PigeonInternalCodecSerializer;
8995
std::string name_;

0 commit comments

Comments
 (0)