Changes to hashValues

SunnyApp · Jul 7, 2020 · 7a688ae · 7a688ae
1 parent 6d96587
commit 7a688ae
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 124 deletions.
diff --git a/lib/contact.dart b/lib/contact.dart
@@ -3,9 +3,9 @@ import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_contact/contacts.dart';
-import 'package:sunny_dart/time.dart';
+import 'package:sunny_dart/helpers/hash_codes.dart';
+import 'package:sunny_dart/time/date_components.dart';
 
 class Contact {
   Contact(
@@ -216,7 +216,7 @@ class Contact {
 
   @override
   int get hashCode {
-    return hashValues(identifier, company, displayName, lastModified, givenName,
+    return hashOf(identifier, company, displayName, lastModified, givenName,
         familyName, jobTitle, middleName, note, prefix, suffix);
   }
 }
@@ -244,7 +244,7 @@ class ContactDate {
       other is ContactDate && label == other.label && date == other.date;
 
   @override
-  int get hashCode => hashValues(label, date);
+  int get hashCode => hashOf(label, date);
 }
 
 // ignore: must_be_immutable

diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
diff --git a/pubspec.lock b/pubspec.lock
@@ -1,34 +1,20 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.11"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   built_collection:
     dependency: transitive
     description:
@@ -49,14 +35,21 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   collection:
     dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -92,6 +85,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   fixnum:
     dependency: transitive
     description:
@@ -116,13 +116,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.4"
   inflection2:
     dependency: transitive
     description:
@@ -192,21 +185,14 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.0"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
   platform_detect:
     dependency: transitive
     description:
@@ -246,7 +232,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -278,10 +264,10 @@ packages:
   sunny_dart:
     dependency: "direct main"
     description:
-      name: sunny_dart
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.5"
+      path: "../sunny_dart"
+      relative: true
+    source: path
+    version: "0.5.6"
   term_glyph:
     dependency: transitive
     description:
@@ -295,7 +281,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.2.16"
   timezone:
     dependency: transitive
     description:
@@ -345,13 +331,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.5.2"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.5.0"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.7.0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -34,6 +34,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
+dependency_overrides:
+  sunny_dart:
+    path: ../sunny_dart
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec