Skip to content

chore: bump minimum Dart SDK to 3.10.0 / Flutter to 3.38.0 #18634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
russellwheatley wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore: bump minimum Dart SDK to 3.10.0 / Flutter to 3.38.0 #18634

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc106ca
chore: bump minimum Dart SDK to 3.10.0 / Flutter to 3.38.0
russellwheatley Sep 1, 2026
d4b51af
style: reformat with dart_style tall style for Dart 3.10 language ver…
russellwheatley Sep 1, 2026
797baf6
style: catch remaining dart_style diffs from CI's newer Dart toolchain
russellwheatley Sep 1, 2026
cc91970
fix: move misplaced ignore comment after tall-style reformat
russellwheatley Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style: catch remaining dart_style diffs from CI's newer Dart toolchain 
CI runs Flutter stable (bundling a newer dart_style than the one used
locally for the previous formatting pass), which flagged 21 more files.
  • Loading branch information
@russellwheatley
russellwheatley committed Sep 1, 2026
commit 797baf6366e322732695926665a2f884b6737328
106 changes: 51 additions & 55 deletions ...es/cloud_firestore/cloud_firestore/example/integration_test/collection_reference_e2e.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,62 +43,58 @@ void runCollectionReferenceTests() {
expect(randNum, equals(snapshot.data()!['value']));
});

test(
'snapshots() can be reused',
() async {
final foo = await initializeTest('foo');

final snapshot = foo.snapshots();
final snapshot2 = foo.snapshots();

expect(
await snapshot.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[],
),
);
expect(
await snapshot2.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[],
),
);

await foo.add({'value': 42});
test('snapshots() can be reused', () async {
final foo = await initializeTest('foo');

final snapshot = foo.snapshots();
final snapshot2 = foo.snapshots();

expect(
await snapshot.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[],
),
);
expect(
await snapshot2.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[],
),
);

expect(
await snapshot.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[
isA<QueryDocumentSnapshot>().having((e) => e.data(), 'data', {
'value': 42,
}),
],
),
);
expect(
await snapshot2.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[
isA<QueryDocumentSnapshot<Map<String, dynamic>>>().having(
(e) => e.data(),
'data',
{'value': 42},
),
],
),
);
},
skip: defaultTargetPlatform == TargetPlatform.windows,
);
await foo.add({'value': 42});

expect(
await snapshot.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[
isA<QueryDocumentSnapshot>().having((e) => e.data(), 'data', {
'value': 42,
}),
],
),
);
expect(
await snapshot2.first,
isA<QuerySnapshot<Map<String, dynamic>>>().having(
(e) => e.docs,
'docs',
[
isA<QueryDocumentSnapshot<Map<String, dynamic>>>().having(
(e) => e.data(),
'data',
{'value': 42},
),
],
),
);
}, skip: defaultTargetPlatform == TargetPlatform.windows);

group('withConverter', () {
test('add/snapshot', () async {
Expand Down
109 changes: 52 additions & 57 deletions packages/cloud_firestore/cloud_firestore/example/integration_test/document_change_e2e.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,63 +136,58 @@ void runDocumentChangeTests() {
defaultTargetPlatform == TargetPlatform.android,
);

test(
'returns the correct metadata when modifying',
() async {
CollectionReference<Map<String, dynamic>> collection =
await initializeTest('add-modify-document');
DocumentReference<Map<String, dynamic>> doc1 = collection.doc('doc1');
DocumentReference<Map<String, dynamic>> doc2 = collection.doc('doc2');
DocumentReference<Map<String, dynamic>> doc3 = collection.doc('doc3');

await doc1.set({'value': 1});
await doc2.set({'value': 2});
await doc3.set({'value': 3});

final snapshots = <QuerySnapshot<Map<String, dynamic>>>[];
final receivedAll = Completer<void>();

StreamSubscription subscription = collection
.orderBy('value')
.snapshots()
.listen((snapshot) {
snapshots.add(snapshot);
if (snapshots.length >= 2 && !receivedAll.isCompleted) {
receivedAll.complete();
}
});

// Wait for the initial snapshot before modifying
await Future.delayed(const Duration(milliseconds: 500));
await doc1.update({'value': 4});

await receivedAll.future.timeout(const Duration(seconds: 30));
await subscription.cancel();

// Verify first snapshot (all 3 docs added)
expect(snapshots[0].docs.length, equals(3));
expect(snapshots[0].docChanges.length, equals(3));
snapshots[0].docChanges.asMap().forEach((
int index,
DocumentChange<Map<String, dynamic>> change,
) {
expect(change.oldIndex, equals(-1));
expect(change.newIndex, equals(index));
expect(change.type, equals(DocumentChangeType.added));
expect(change.doc.data()!['value'], equals(index + 1));
});
test('returns the correct metadata when modifying', () async {
CollectionReference<Map<String, dynamic>> collection =
await initializeTest('add-modify-document');
DocumentReference<Map<String, dynamic>> doc1 = collection.doc('doc1');
DocumentReference<Map<String, dynamic>> doc2 = collection.doc('doc2');
DocumentReference<Map<String, dynamic>> doc3 = collection.doc('doc3');

await doc1.set({'value': 1});
await doc2.set({'value': 2});
await doc3.set({'value': 3});

final snapshots = <QuerySnapshot<Map<String, dynamic>>>[];
final receivedAll = Completer<void>();

StreamSubscription subscription = collection
.orderBy('value')
.snapshots()
.listen((snapshot) {
snapshots.add(snapshot);
if (snapshots.length >= 2 && !receivedAll.isCompleted) {
receivedAll.complete();
}
});

// Wait for the initial snapshot before modifying
await Future.delayed(const Duration(milliseconds: 500));
await doc1.update({'value': 4});

await receivedAll.future.timeout(const Duration(seconds: 30));
await subscription.cancel();

// Verify first snapshot (all 3 docs added)
expect(snapshots[0].docs.length, equals(3));
expect(snapshots[0].docChanges.length, equals(3));
snapshots[0].docChanges.asMap().forEach((
int index,
DocumentChange<Map<String, dynamic>> change,
) {
expect(change.oldIndex, equals(-1));
expect(change.newIndex, equals(index));
expect(change.type, equals(DocumentChangeType.added));
expect(change.doc.data()!['value'], equals(index + 1));
});

// Verify second snapshot (doc1 modified, moved to end)
expect(snapshots[1].docs.length, equals(3));
expect(snapshots[1].docChanges.length, equals(1));
DocumentChange<Map<String, dynamic>> change =
snapshots[1].docChanges[0];
expect(change.oldIndex, equals(0));
expect(change.newIndex, equals(2));
expect(change.type, equals(DocumentChangeType.modified));
expect(change.doc.id, equals('doc1'));
},
skip: defaultTargetPlatform == TargetPlatform.windows,
);
// Verify second snapshot (doc1 modified, moved to end)
expect(snapshots[1].docs.length, equals(3));
expect(snapshots[1].docChanges.length, equals(1));
DocumentChange<Map<String, dynamic>> change = snapshots[1].docChanges[0];
expect(change.oldIndex, equals(0));
expect(change.newIndex, equals(2));
expect(change.type, equals(DocumentChangeType.modified));
expect(change.doc.id, equals('doc1'));
}, skip: defaultTargetPlatform == TargetPlatform.windows);
});
}
52 changes: 24 additions & 28 deletions packages/cloud_firestore/cloud_firestore/example/integration_test/instance_e2e.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,34 +161,30 @@ void runInstanceTests() {
await instance.terminate();
}, skip: kIsWeb);

test(
'setIndexConfigurationFromJSON()',
() async {
final json = jsonEncode({
'indexes': [
{
'collectionGroup': 'posts',
'queryScope': 'COLLECTION',
'fields': [
{'fieldPath': 'author', 'arrayConfig': 'CONTAINS'},
{'fieldPath': 'timestamp', 'order': 'DESCENDING'},
],
},
],
'fieldOverrides': [
{
'collectionGroup': 'posts',
'fieldPath': 'myBigMapField',
'indexes': [],
},
],
});

// ignore: experimental_member_use
await firestore.setIndexConfigurationFromJSON(json);
},
skip: defaultTargetPlatform == TargetPlatform.windows,
);
test('setIndexConfigurationFromJSON()', () async {
final json = jsonEncode({
'indexes': [
{
'collectionGroup': 'posts',
'queryScope': 'COLLECTION',
'fields': [
{'fieldPath': 'author', 'arrayConfig': 'CONTAINS'},
{'fieldPath': 'timestamp', 'order': 'DESCENDING'},
],
},
],
'fieldOverrides': [
{
'collectionGroup': 'posts',
'fieldPath': 'myBigMapField',
'indexes': [],
},
],
});

// ignore: experimental_member_use
await firestore.setIndexConfigurationFromJSON(json);
}, skip: defaultTargetPlatform == TargetPlatform.windows);

test('setLoggingEnabled should resolve without issue', () async {
await FirebaseFirestore.setLoggingEnabled(true);
Expand Down
Loading
Loading