Skip to content

Commit 63ba6a4

Browse files
authored
chore: drop dependency on pkg:equitable (#235)
* chore: drop dependency on pkg:equitable A trivial replacment * version!
1 parent ef185d4 commit 63ba6a4

5 files changed

Lines changed: 25 additions & 10 deletions

File tree

packages/firebase_admin_sdk/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.2-wip
2+
3+
- Remove dependency on `package:equatable`.
4+
15
## 0.5.1
26

37
- Reformatted CHANGELOG.md.

packages/firebase_admin_sdk/lib/src/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'dart:convert';
1717
import 'dart:io';
1818
import 'dart:typed_data';
1919

20-
import 'package:equatable/equatable.dart';
20+
import 'package:collection/collection.dart';
2121
import 'package:google_cloud/constants.dart' as google_cloud;
2222
import 'package:google_cloud/google_cloud.dart' as google_cloud;
2323
import 'package:google_cloud_firestore/google_cloud_firestore.dart'

packages/firebase_admin_sdk/lib/src/app/app_options.dart

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ part of '../app.dart';
1818
///
1919
/// Only [credential] is required. All other fields are optional and will be
2020
/// auto-discovered or use defaults when not provided.
21-
class AppOptions extends Equatable {
21+
class AppOptions {
2222
const AppOptions({
2323
this.credential,
2424
this.projectId,
@@ -135,13 +135,25 @@ class AppOptions extends Equatable {
135135
final Map<String, dynamic>? databaseAuthVariableOverride;
136136

137137
@override
138-
List<Object?> get props => [
139-
// Exclude credential and httpClient from comparison
140-
// (they're instances that can't be meaningfully compared)
138+
bool operator ==(Object other) =>
139+
identical(this, other) ||
140+
other is AppOptions &&
141+
runtimeType == other.runtimeType &&
142+
projectId == other.projectId &&
143+
databaseURL == other.databaseURL &&
144+
storageBucket == other.storageBucket &&
145+
serviceAccountId == other.serviceAccountId &&
146+
const MapEquality<String, dynamic>().equals(
147+
databaseAuthVariableOverride,
148+
other.databaseAuthVariableOverride,
149+
);
150+
151+
@override
152+
int get hashCode => Object.hash(
141153
projectId,
142154
databaseURL,
143155
storageBucket,
144156
serviceAccountId,
145-
databaseAuthVariableOverride,
146-
];
157+
const MapEquality<String, dynamic>().hash(databaseAuthVariableOverride),
158+
);
147159
}

packages/firebase_admin_sdk/lib/src/version.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firebase_admin_sdk/pubspec.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: >-
33
Firebase Admin SDK implementation for Dart -
44
Firestore, Cloud Storage, Auth, and FCM
55
resolution: workspace
6-
version: 0.5.1
6+
version: 0.5.2-wip
77
repository: https://github.com/firebase/firebase-admin-dart/tree/main/packages/firebase_admin_sdk
88

99
environment:
@@ -13,7 +13,6 @@ dependencies:
1313
asn1lib: ^1.6.0
1414
collection: ^1.19.1
1515
dart_jsonwebtoken: ^3.2.0
16-
equatable: ^2.0.7
1716
ffi: ^2.2.0
1817
google_cloud: ^0.4.0
1918
google_cloud_firestore: ^0.5.0

0 commit comments

Comments
 (0)