From 5d95b62f3f4d4cb9bcb0efaf3b3aa669d9cd089d Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 15:59:19 -0800 Subject: [PATCH 1/7] fix analyzer warnings --- packages/firebase_performance/CHANGELOG.md | 4 ++++ packages/firebase_performance/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md index 598fdde5d645..9bcfde82f40a 100644 --- a/packages/firebase_performance/CHANGELOG.md +++ b/packages/firebase_performance/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1+3 + +* Fix analyzer warnings + ## 0.3.1+2 * Updated README instructions for contributing for consistency with other Flutterfire plugins. diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml index ec90bc828f4f..ebb50bca838a 100644 --- a/packages/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a iOS. author: Flutter Team homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_performance -version: 0.3.1+2 +version: 0.3.1+3 dependencies: flutter: @@ -28,4 +28,4 @@ flutter: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.9.1+hotfix.5 <2.0.0" \ No newline at end of file + flutter: ">=1.9.1+hotfix.5 <2.0.0" From e406ae1549c24f3fbc308a16dc35c60b84791949 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 15:59:29 -0800 Subject: [PATCH 2/7] fix analyzer warnings --- packages/firebase_performance/lib/src/http_metric.dart | 3 --- .../firebase_performance/lib/src/performance_attributes.dart | 1 - 2 files changed, 4 deletions(-) diff --git a/packages/firebase_performance/lib/src/http_metric.dart b/packages/firebase_performance/lib/src/http_metric.dart index 2586a1455cc5..c96480513156 100644 --- a/packages/firebase_performance/lib/src/http_metric.dart +++ b/packages/firebase_performance/lib/src/http_metric.dart @@ -24,9 +24,6 @@ class HttpMetric extends PerformanceAttributes { final String url; final HttpMethod httpMethod; - @override - bool _hasStarted = false; - @override bool _hasStopped = false; diff --git a/packages/firebase_performance/lib/src/performance_attributes.dart b/packages/firebase_performance/lib/src/performance_attributes.dart index 96a77a009f57..551990eddc38 100644 --- a/packages/firebase_performance/lib/src/performance_attributes.dart +++ b/packages/firebase_performance/lib/src/performance_attributes.dart @@ -17,7 +17,6 @@ abstract class PerformanceAttributes { final Map _attributes = {}; - bool get _hasStarted; bool get _hasStopped; int get _handle; From 90967a9be4ba6b6d5ef46d06c535c01d0178971a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 15:59:29 -0800 Subject: [PATCH 3/7] fix analyzer warnings --- packages/firebase_performance/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md index 9bcfde82f40a..de495c1f7b24 100644 --- a/packages/firebase_performance/CHANGELOG.md +++ b/packages/firebase_performance/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.1+3 -* Fix analyzer warnings +* Fixed analyzer warnings about unused fields. ## 0.3.1+2 From cec64cf4002aa48a33006684d4658aff30e8ea92 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 16:03:30 -0800 Subject: [PATCH 4/7] Fix analyzer warnings for cloud_firestore --- packages/cloud_firestore/CHANGELOG.md | 4 ++++ packages/cloud_firestore/lib/src/document_change.dart | 6 ++---- packages/cloud_firestore/lib/src/query_snapshot.dart | 8 +++----- packages/cloud_firestore/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md index e64aa370bd2e..b0781e266fe0 100644 --- a/packages/cloud_firestore/CHANGELOG.md +++ b/packages/cloud_firestore/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.12.10+2 + +* Fixed analyzer warnings about unused field. + ## 0.12.10+1 * Formatted method documentations. diff --git a/packages/cloud_firestore/lib/src/document_change.dart b/packages/cloud_firestore/lib/src/document_change.dart index 8409d512a43e..02f797a65d24 100644 --- a/packages/cloud_firestore/lib/src/document_change.dart +++ b/packages/cloud_firestore/lib/src/document_change.dart @@ -23,7 +23,7 @@ enum DocumentChangeType { /// It contains the document affected and the type of change that occurred /// (added, modified, or removed). class DocumentChange { - DocumentChange._(Map data, this._firestore) + DocumentChange._(Map data, Firestore firestore) : oldIndex = data['oldIndex'], newIndex = data['newIndex'], document = DocumentSnapshot._( @@ -31,14 +31,12 @@ class DocumentChange { _asStringKeyedMap(data['document']), SnapshotMetadata._(data["metadata"]["hasPendingWrites"], data["metadata"]["isFromCache"]), - _firestore, + firestore, ), type = DocumentChangeType.values.firstWhere((DocumentChangeType type) { return type.toString() == data['type']; }); - final Firestore _firestore; - /// The type of change that occurred (added, modified, or removed). final DocumentChangeType type; diff --git a/packages/cloud_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/lib/src/query_snapshot.dart index 1ecb0bd54fe1..9d6a53fb6f2d 100644 --- a/packages/cloud_firestore/lib/src/query_snapshot.dart +++ b/packages/cloud_firestore/lib/src/query_snapshot.dart @@ -6,7 +6,7 @@ part of cloud_firestore; /// A QuerySnapshot contains zero or more DocumentSnapshot objects. class QuerySnapshot { - QuerySnapshot._(Map data, this._firestore) + QuerySnapshot._(Map data, Firestore firestore) : documents = List.generate(data['documents'].length, (int index) { return DocumentSnapshot._( @@ -16,14 +16,14 @@ class QuerySnapshot { data['metadatas'][index]['hasPendingWrites'], data['metadatas'][index]['isFromCache'], ), - _firestore, + firestore, ); }), documentChanges = List.generate( data['documentChanges'].length, (int index) { return DocumentChange._( data['documentChanges'][index], - _firestore, + firestore, ); }), metadata = SnapshotMetadata._( @@ -39,6 +39,4 @@ class QuerySnapshot { final List documentChanges; final SnapshotMetadata metadata; - - final Firestore _firestore; } diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml index 0f4178699fb9..eeb1f8a2405e 100755 --- a/packages/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database live synchronization and offline support on Android and iOS. author: Flutter Team homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore -version: 0.12.10+1 +version: 0.12.10+2 flutter: plugin: From 770db17cd7bc61b5d57978f29ab505fea9813d45 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 16:04:31 -0800 Subject: [PATCH 5/7] CHANGELOG --- packages/cloud_firestore/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md index b0781e266fe0..d1f544cd5b50 100644 --- a/packages/cloud_firestore/CHANGELOG.md +++ b/packages/cloud_firestore/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.12.10+2 -* Fixed analyzer warnings about unused field. +* Fixed analyzer warnings about unused fields. ## 0.12.10+1 From b81c988da7771ac1a51277d4007b206440421847 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 16:09:08 -0800 Subject: [PATCH 6/7] Fix more analyzer issues --- packages/firebase_performance/lib/src/http_metric.dart | 1 - packages/firebase_performance/lib/src/trace.dart | 3 --- 2 files changed, 4 deletions(-) diff --git a/packages/firebase_performance/lib/src/http_metric.dart b/packages/firebase_performance/lib/src/http_metric.dart index c96480513156..e2e47f854126 100644 --- a/packages/firebase_performance/lib/src/http_metric.dart +++ b/packages/firebase_performance/lib/src/http_metric.dart @@ -124,7 +124,6 @@ class HttpMetric extends PerformanceAttributes { Future start() { if (_hasStopped) return Future.value(null); - _hasStarted = true; return FirebasePerformance.channel.invokeMethod( 'HttpMetric#start', {'handle': _handle}, diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart index 873a138c7392..ede81b088c11 100644 --- a/packages/firebase_performance/lib/src/trace.dart +++ b/packages/firebase_performance/lib/src/trace.dart @@ -29,9 +29,6 @@ class Trace extends PerformanceAttributes { final Map _metrics = {}; - @override - bool _hasStarted = false; - @override bool _hasStopped = false; From 3e00b02b136bf693d464c41d62a60022824b3533 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 18 Nov 2019 16:29:45 -0800 Subject: [PATCH 7/7] bring back hasStarted --- packages/firebase_performance/lib/src/trace.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart index ede81b088c11..0c6d7803b272 100644 --- a/packages/firebase_performance/lib/src/trace.dart +++ b/packages/firebase_performance/lib/src/trace.dart @@ -29,6 +29,8 @@ class Trace extends PerformanceAttributes { final Map _metrics = {}; + bool _hasStarted = false; + @override bool _hasStopped = false;