Skip to content

Commit d932185

Browse files
committed
Merge branch 'firestore-pipelines-dart-api-v2' into firestore-pipelines-android
2 parents 1bd970e + 6b271c7 commit d932185

18 files changed

Lines changed: 135 additions & 107 deletions

File tree

packages/cloud_firestore/cloud_firestore/pipeline_example/integration_test/pipeline/pipeline_expressions_e2e.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ void runPipelineExpressionsTests() {
9494
.limit(5)
9595
.execute();
9696
expectResultCount(snapshot, 5);
97-
final withTags =
98-
snapshot.result.where((r) => r.data()!['tags_len'] == 2).toList();
97+
final withTags = snapshot.result
98+
.where((r) => r.data()!['tags_len'] == 2)
99+
.toList();
99100
expect(withTags.length, 1);
100101
expect(withTags.first.data()!['score'], 50);
101102
});
@@ -538,7 +539,8 @@ void runPipelineExpressionsTests() {
538539
expect(e.message!, contains('Unsupported expression'));
539540
}
540541
},
541-
skip: defaultTargetPlatform != TargetPlatform.iOS &&
542+
skip:
543+
defaultTargetPlatform != TargetPlatform.iOS &&
542544
defaultTargetPlatform != TargetPlatform.macOS,
543545
);
544546
});

packages/cloud_firestore/cloud_firestore/pipeline_example/integration_test/pipeline/pipeline_filter_sort_e2e.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ void runPipelineFilterSortTests() {
8080
.limit(10)
8181
.execute();
8282
expectResultCount(snapshot, 3);
83-
final categories =
84-
snapshot.result.map((r) => r.data()!['category']).toList();
83+
final categories = snapshot.result
84+
.map((r) => r.data()!['category'])
85+
.toList();
8586
expect(categories..sort(), ['a', 'b', 'c']);
8687
});
8788
});

packages/cloud_firestore/cloud_firestore/pipeline_example/integration_test/pipeline/pipeline_unnest_union_e2e.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ void runPipelineUnnestUnionTests() {
2929
.limit(10)
3030
.execute();
3131
expectResultCount(snapshot, 5);
32-
final tags =
33-
snapshot.result.map((r) => r.data()!['tag'] as String).toList();
32+
final tags = snapshot.result
33+
.map((r) => r.data()!['tag'] as String)
34+
.toList();
3435
expect(tags..sort(), [
3536
'dart',
3637
'dart',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'method_channel_firestore.dart';
88
/// An implementation of [AggregateQueryPlatform] for the [MethodChannel]
99
class MethodChannelAggregateQuery extends AggregateQueryPlatform {
1010
MethodChannelAggregateQuery(
11-
query,
11+
QueryPlatform query,
1212
this._pigeonParameters,
1313
this._path,
1414
this._pigeonApp,

packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task_snapshot.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '../../cloud_firestore_platform_interface.dart';
1010
/// The interface a load bundle task snapshot must extend.
1111
class LoadBundleTaskSnapshotPlatform extends PlatformInterface {
1212
// ignore: public_member_api_docs
13-
LoadBundleTaskSnapshotPlatform(this.taskState, data)
13+
LoadBundleTaskSnapshotPlatform(this.taskState, Map<String, dynamic> data)
1414
: bytesLoaded = data['bytesLoaded'],
1515
documentsLoaded = data['documentsLoaded'],
1616
totalBytes = data['totalBytes'],

packages/cloud_firestore/cloud_firestore_web/lib/src/aggregate_query_web.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AggregateQueryWeb extends AggregateQueryPlatform {
1515
/// without retrieving the actual documents.
1616
AggregateQueryWeb(
1717
QueryPlatform query,
18-
_webQuery,
18+
firestore_interop.Query _webQuery,
1919
this._aggregateQueries,
2020
) : _delegate = firestore_interop.AggregateQuery(_webQuery),
2121
_webQuery = _webQuery,

packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_confirmation_result_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ void main() {
4747
}
4848

4949
class TestConfirmationResultPlatform extends ConfirmationResultPlatform {
50-
TestConfirmationResultPlatform(verificationId) : super(verificationId);
50+
TestConfirmationResultPlatform(String verificationId) : super(verificationId);
5151
}

packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MethodChannelFirebaseApp extends FirebaseAppPlatform {
1818
MethodChannelFirebaseApp(
1919
String name,
2020
FirebaseOptions options, {
21-
isAutomaticDataCollectionEnabled,
21+
bool? isAutomaticDataCollectionEnabled,
2222
}) : _isAutomaticDataCollectionEnabled =
2323
isAutomaticDataCollectionEnabled ?? false,
2424
super(name, options);

packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_http_metric_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class TestFirebasePerformancePlatform extends FirebasePerformancePlatform {
204204

205205
class TestMethodChannelHttpMetric extends MethodChannelHttpMetric {
206206
TestMethodChannelHttpMetric(
207-
url,
208-
method,
207+
String url,
208+
HttpMethod method,
209209
) : super(url, method);
210210
}

packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_trace_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,5 @@ void main() {
166166
}
167167

168168
class TestMethodChannelTrace extends MethodChannelTrace {
169-
TestMethodChannelTrace(name) : super(name);
169+
TestMethodChannelTrace(String name) : super(name);
170170
}

0 commit comments

Comments
 (0)