diff --git a/analysis_options.yaml b/analysis_options.yaml
index d79ad7336..a9ce6e107 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -22,8 +22,6 @@
 # in sync with this file.
 
 analyzer:
-  language:
-    enableSuperMixins: true
   strong-mode:
     implicit-dynamic: false
   errors:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 81e517607..765987e79 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.5'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart
index d8e60d32f..7ca6eab0a 100644
--- a/lib/data/models/client_model.dart
+++ b/lib/data/models/client_model.dart
@@ -51,8 +51,7 @@ class ClientFields {
   static const String currency = 'currency';
 }
 
-abstract class ClientEntity extends Object
-    with BaseEntity
+abstract class ClientEntity extends BaseEntity
     implements Built<ClientEntity, ClientEntityBuilder> {
   static int counter = 0;
 
@@ -400,8 +399,7 @@ class ContactFields {
   static const String phone = 'phone';
 }
 
-abstract class ContactEntity extends Object
-    with BaseEntity
+abstract class ContactEntity extends BaseEntity
     implements Built<ContactEntity, ContactEntityBuilder> {
   static int counter = 0;
 
diff --git a/lib/data/models/credit_model.dart b/lib/data/models/credit_model.dart
index 25e0b7bf6..4df4ad320 100644
--- a/lib/data/models/credit_model.dart
+++ b/lib/data/models/credit_model.dart
@@ -41,7 +41,7 @@ class CreditFields {
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class CreditEntity extends Object with BaseEntity implements Built<CreditEntity, CreditEntityBuilder> {
+abstract class CreditEntity extends BaseEntity implements Built<CreditEntity, CreditEntityBuilder> {
 
   static int counter = 0;
   factory CreditEntity() {
diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index 8da1c3030..b905454c8 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -62,8 +62,7 @@ class ExpenseFields {
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class ExpenseEntity extends Object
-    with BaseEntity
+abstract class ExpenseEntity extends BaseEntity
     implements Built<ExpenseEntity, ExpenseEntityBuilder> {
 
   static int counter = 0;
@@ -210,8 +209,7 @@ abstract class ExpenseEntity extends Object
   static Serializer<ExpenseEntity> get serializer => _$expenseEntitySerializer;
 }
 
-abstract class ExpenseCategoryEntity extends Object
-    with BaseEntity
+abstract class ExpenseCategoryEntity extends BaseEntity
     implements Built<ExpenseCategoryEntity, ExpenseCategoryEntityBuilder> {
 
   factory ExpenseCategoryEntity([void updates(ExpenseCategoryEntityBuilder b)]) =
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 8bb9de25f..3613fbf95 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -83,8 +83,8 @@ class InvoiceFields {
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class InvoiceEntity extends Object
-    with BaseEntity, CalculateInvoiceTotal
+abstract class InvoiceEntity extends BaseEntity
+    with CalculateInvoiceTotal
     implements Built<InvoiceEntity, InvoiceEntityBuilder> {
   static int counter = 0;
 
@@ -483,8 +483,7 @@ abstract class InvoiceEntity extends Object
   static Serializer<InvoiceEntity> get serializer => _$invoiceEntitySerializer;
 }
 
-abstract class InvoiceItemEntity extends Object
-    with BaseEntity
+abstract class InvoiceItemEntity extends BaseEntity
     implements Built<InvoiceItemEntity, InvoiceItemEntityBuilder> {
   static int counter = 0;
 
@@ -596,8 +595,7 @@ abstract class InvoiceItemEntity extends Object
       _$invoiceItemEntitySerializer;
 }
 
-abstract class InvitationEntity extends Object
-    with BaseEntity
+abstract class InvitationEntity extends BaseEntity
     implements Built<InvitationEntity, InvitationEntityBuilder> {
   static int counter = 0;
 
diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart
index 48df35613..e445cf080 100644
--- a/lib/data/models/payment_model.dart
+++ b/lib/data/models/payment_model.dart
@@ -51,8 +51,7 @@ class PaymentFields {
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class PaymentEntity extends Object
-    with BaseEntity
+abstract class PaymentEntity extends BaseEntity
     implements Built<PaymentEntity, PaymentEntityBuilder> {
   static int counter = 0;
 
diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
index 6b184fc60..315dc2150 100644
--- a/lib/data/models/product_model.dart
+++ b/lib/data/models/product_model.dart
@@ -43,8 +43,8 @@ class ProductFields {
   static const String customValue2 = 'customValue2';
 }
 
-abstract class ProductEntity extends Object
-    with BaseEntity, ConvertToInvoiceItem
+abstract class ProductEntity extends BaseEntity
+    with ConvertToInvoiceItem
     implements Built<ProductEntity, ProductEntityBuilder> {
   static int counter = 0;
   factory ProductEntity() {
diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart
index 89b14255f..eab766291 100644
--- a/lib/data/models/project_model.dart
+++ b/lib/data/models/project_model.dart
@@ -6,24 +6,30 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
 
 part 'project_model.g.dart';
 
-abstract class ProjectListResponse implements Built<ProjectListResponse, ProjectListResponseBuilder> {
+abstract class ProjectListResponse
+    implements Built<ProjectListResponse, ProjectListResponseBuilder> {
+  factory ProjectListResponse([void updates(ProjectListResponseBuilder b)]) =
+      _$ProjectListResponse;
 
-  factory ProjectListResponse([void updates(ProjectListResponseBuilder b)]) = _$ProjectListResponse;
   ProjectListResponse._();
 
   BuiltList<ProjectEntity> get data;
 
-  static Serializer<ProjectListResponse> get serializer => _$projectListResponseSerializer;
+  static Serializer<ProjectListResponse> get serializer =>
+      _$projectListResponseSerializer;
 }
 
-abstract class ProjectItemResponse implements Built<ProjectItemResponse, ProjectItemResponseBuilder> {
+abstract class ProjectItemResponse
+    implements Built<ProjectItemResponse, ProjectItemResponseBuilder> {
+  factory ProjectItemResponse([void updates(ProjectItemResponseBuilder b)]) =
+      _$ProjectItemResponse;
 
-  factory ProjectItemResponse([void updates(ProjectItemResponseBuilder b)]) = _$ProjectItemResponse;
   ProjectItemResponse._();
 
   ProjectEntity get data;
 
-  static Serializer<ProjectItemResponse> get serializer => _$projectItemResponseSerializer;
+  static Serializer<ProjectItemResponse> get serializer =>
+      _$projectItemResponseSerializer;
 }
 
 class ProjectFields {
@@ -35,36 +41,36 @@ class ProjectFields {
   static const String budgetedHours = 'budgetedHours';
   static const String customValue1 = 'customValue1';
   static const String customValue2 = 'customValue2';
-  
+
   static const String updatedAt = 'updatedAt';
   static const String archivedAt = 'archivedAt';
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class ProjectEntity extends Object with BaseEntity implements Built<ProjectEntity, ProjectEntityBuilder> {
-
+abstract class ProjectEntity extends BaseEntity
+    implements Built<ProjectEntity, ProjectEntityBuilder> {
   static int counter = 0;
+
   factory ProjectEntity() {
     return _$ProjectEntity._(
-        id: --ProjectEntity.counter,
-        name: '',
-        clientId: 0,
-        taskRate: 0.0,
-        dueDate: '',
-        privateNotes: '',
-        budgetedHours: 0.0,
-        customValue1: '',
-        customValue2: '',
-        
-        updatedAt: 0,
-        archivedAt: 0,
-        isDeleted: false,
+      id: --ProjectEntity.counter,
+      name: '',
+      clientId: 0,
+      taskRate: 0.0,
+      dueDate: '',
+      privateNotes: '',
+      budgetedHours: 0.0,
+      customValue1: '',
+      customValue2: '',
+      updatedAt: 0,
+      archivedAt: 0,
+      isDeleted: false,
     );
   }
+
   ProjectEntity._();
-  ProjectEntity get clone => rebuild((b) => b
-    ..id = --ProjectEntity.counter
-  );
+
+  ProjectEntity get clone => rebuild((b) => b..id = --ProjectEntity.counter);
 
   @override
   EntityType get entityType {
@@ -75,7 +81,7 @@ abstract class ProjectEntity extends Object with BaseEntity implements Built<Pro
 
   @BuiltValueField(wireName: 'client_id')
   int get clientId;
-  
+
   @BuiltValueField(wireName: 'task_rate')
   double get taskRate;
 
@@ -97,7 +103,7 @@ abstract class ProjectEntity extends Object with BaseEntity implements Built<Pro
   int compareTo(ProjectEntity project, String sortField, bool sortAscending) {
     int response = 0;
     final ProjectEntity projectA = sortAscending ? this : project;
-    final ProjectEntity projectB = sortAscending ? project: this;
+    final ProjectEntity projectB = sortAscending ? project : this;
 
     switch (sortField) {
       case ProjectFields.taskRate:
diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 49267edd0..51c1b9661 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -6,24 +6,30 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
 
 part 'task_model.g.dart';
 
-abstract class TaskListResponse implements Built<TaskListResponse, TaskListResponseBuilder> {
+abstract class TaskListResponse
+    implements Built<TaskListResponse, TaskListResponseBuilder> {
+  factory TaskListResponse([void updates(TaskListResponseBuilder b)]) =
+      _$TaskListResponse;
 
-  factory TaskListResponse([void updates(TaskListResponseBuilder b)]) = _$TaskListResponse;
   TaskListResponse._();
 
   BuiltList<TaskEntity> get data;
 
-  static Serializer<TaskListResponse> get serializer => _$taskListResponseSerializer;
+  static Serializer<TaskListResponse> get serializer =>
+      _$taskListResponseSerializer;
 }
 
-abstract class TaskItemResponse implements Built<TaskItemResponse, TaskItemResponseBuilder> {
+abstract class TaskItemResponse
+    implements Built<TaskItemResponse, TaskItemResponseBuilder> {
+  factory TaskItemResponse([void updates(TaskItemResponseBuilder b)]) =
+      _$TaskItemResponse;
 
-  factory TaskItemResponse([void updates(TaskItemResponseBuilder b)]) = _$TaskItemResponse;
   TaskItemResponse._();
 
   TaskEntity get data;
 
-  static Serializer<TaskItemResponse> get serializer => _$taskItemResponseSerializer;
+  static Serializer<TaskItemResponse> get serializer =>
+      _$taskItemResponseSerializer;
 }
 
 class TaskFields {
@@ -36,38 +42,37 @@ class TaskFields {
   static const String isRunning = 'isRunning';
   static const String customValue1 = 'customValue1';
   static const String customValue2 = 'customValue2';
-  
+
   static const String updatedAt = 'updatedAt';
   static const String archivedAt = 'archivedAt';
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class TaskEntity extends Object with BaseEntity implements Built<TaskEntity, TaskEntityBuilder> {
-
-
+abstract class TaskEntity extends BaseEntity
+    implements Built<TaskEntity, TaskEntityBuilder> {
   static int counter = 0;
+
   factory TaskEntity() {
     return _$TaskEntity._(
-        id: --TaskEntity.counter,
-        description: '',
-        duration: 0,
-        invoiceId: 0,
-        clientId: 0,
-        projectId: 0,
-        timeLog: '',
-        isRunning: false,
-        customValue1: '',
-        customValue2: '',
-        
-        updatedAt: 0,
-        archivedAt: 0,
-        isDeleted: false,
+      id: --TaskEntity.counter,
+      description: '',
+      duration: 0,
+      invoiceId: 0,
+      clientId: 0,
+      projectId: 0,
+      timeLog: '',
+      isRunning: false,
+      customValue1: '',
+      customValue2: '',
+      updatedAt: 0,
+      archivedAt: 0,
+      isDeleted: false,
     );
   }
+
   TaskEntity._();
-  TaskEntity get clone => rebuild((b) => b
-    ..id = --TaskEntity.counter
-  );
+
+  TaskEntity get clone => rebuild((b) => b..id = --TaskEntity.counter);
 
   @override
   EntityType get entityType {
@@ -80,7 +85,7 @@ abstract class TaskEntity extends Object with BaseEntity implements Built<TaskEn
 
   @BuiltValueField(wireName: 'invoice_id')
   int get invoiceId;
-  
+
   @BuiltValueField(wireName: 'client_id')
   int get clientId;
 
@@ -102,7 +107,7 @@ abstract class TaskEntity extends Object with BaseEntity implements Built<TaskEn
   int compareTo(TaskEntity task, String sortField, bool sortAscending) {
     int response = 0;
     final TaskEntity taskA = sortAscending ? this : task;
-    final TaskEntity taskB = sortAscending ? task: this;
+    final TaskEntity taskB = sortAscending ? task : this;
 
     switch (sortField) {
       case TaskFields.duration:
diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart
index f0e88a928..bb4dab7bb 100644
--- a/lib/data/models/vendor_model.dart
+++ b/lib/data/models/vendor_model.dart
@@ -6,27 +6,32 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
 
 part 'vendor_model.g.dart';
 
-abstract class VendorListResponse implements Built<VendorListResponse, VendorListResponseBuilder> {
+abstract class VendorListResponse
+    implements Built<VendorListResponse, VendorListResponseBuilder> {
+  factory VendorListResponse([void updates(VendorListResponseBuilder b)]) =
+      _$VendorListResponse;
 
-  factory VendorListResponse([void updates(VendorListResponseBuilder b)]) = _$VendorListResponse;
   VendorListResponse._();
 
   BuiltList<VendorEntity> get data;
 
-  static Serializer<VendorListResponse> get serializer => _$vendorListResponseSerializer;
+  static Serializer<VendorListResponse> get serializer =>
+      _$vendorListResponseSerializer;
 }
 
-abstract class VendorItemResponse implements Built<VendorItemResponse, VendorItemResponseBuilder> {
+abstract class VendorItemResponse
+    implements Built<VendorItemResponse, VendorItemResponseBuilder> {
+  factory VendorItemResponse([void updates(VendorItemResponseBuilder b)]) =
+      _$VendorItemResponse;
 
-  factory VendorItemResponse([void updates(VendorItemResponseBuilder b)]) = _$VendorItemResponse;
   VendorItemResponse._();
 
   VendorEntity get data;
 
-  static Serializer<VendorItemResponse> get serializer => _$vendorItemResponseSerializer;
+  static Serializer<VendorItemResponse> get serializer =>
+      _$vendorItemResponseSerializer;
 }
 
-
 class VendorFields {
   static const String name = 'name';
   static const String balance = 'balance';
@@ -46,47 +51,47 @@ class VendorFields {
   static const String currencyId = 'currencyId';
   static const String customValue1 = 'customValue1';
   static const String customValue2 = 'customValue2';
-  
+
   static const String updatedAt = 'updatedAt';
   static const String archivedAt = 'archivedAt';
   static const String isDeleted = 'isDeleted';
 }
 
-abstract class VendorEntity extends Object with BaseEntity implements Built<VendorEntity, VendorEntityBuilder> {
-
+abstract class VendorEntity extends BaseEntity
+    implements Built<VendorEntity, VendorEntityBuilder> {
   static int counter = 0;
+
   factory VendorEntity() {
     return _$VendorEntity._(
-        id: --VendorEntity.counter,
-        name: '',
-        balance: 0.0,
-        paidToDate: 0.0,
-        address1: '',
-        address2: '',
-        city: '',
-        state: '',
-        postalCode: '',
-        countryId: 0,
-        workPhone: '',
-        privateNotes: '',
-        lastLogin: '',
-        website: '',
-        vatNumber: '',
-        idNumber: '',
-        currencyId: 0,
-        customValue1: '',
-        customValue2: '',
-        vendorContacts: BuiltList<VendorContactEntity>(),
-
-        updatedAt: 0,
-        archivedAt: 0,
-        isDeleted: false,
+      id: --VendorEntity.counter,
+      name: '',
+      balance: 0.0,
+      paidToDate: 0.0,
+      address1: '',
+      address2: '',
+      city: '',
+      state: '',
+      postalCode: '',
+      countryId: 0,
+      workPhone: '',
+      privateNotes: '',
+      lastLogin: '',
+      website: '',
+      vatNumber: '',
+      idNumber: '',
+      currencyId: 0,
+      customValue1: '',
+      customValue2: '',
+      vendorContacts: BuiltList<VendorContactEntity>(),
+      updatedAt: 0,
+      archivedAt: 0,
+      isDeleted: false,
     );
   }
+
   VendorEntity._();
-  VendorEntity get clone => rebuild((b) => b
-    ..id = --VendorEntity.counter
-  );
+
+  VendorEntity get clone => rebuild((b) => b..id = --VendorEntity.counter);
 
   @override
   EntityType get entityType {
@@ -143,17 +148,16 @@ abstract class VendorEntity extends Object with BaseEntity implements Built<Vend
   @BuiltValueField(wireName: 'vendor_contacts')
   BuiltList<VendorContactEntity> get vendorContacts;
 
-
   int compareTo(VendorEntity vendor, String sortField, bool sortAscending) {
     int response = 0;
     final VendorEntity vendorA = sortAscending ? this : vendor;
-    final VendorEntity vendorB = sortAscending ? vendor: this;
+    final VendorEntity vendorB = sortAscending ? vendor : this;
 
     switch (sortField) {
       case VendorFields.name:
         response = vendorA.name.compareTo(vendorB.name);
     }
-    
+
     return response;
   }
 
@@ -189,23 +193,24 @@ abstract class VendorEntity extends Object with BaseEntity implements Built<Vend
   static Serializer<VendorEntity> get serializer => _$vendorEntitySerializer;
 }
 
-abstract class VendorContactEntity extends Object with BaseEntity implements Built<VendorContactEntity, VendorContactEntityBuilder> {
-
+abstract class VendorContactEntity extends BaseEntity
+    implements Built<VendorContactEntity, VendorContactEntityBuilder> {
   static int counter = 0;
+
   factory VendorContactEntity() {
     return _$VendorContactEntity._(
-        id: --VendorContactEntity.counter,
-        firstName: '',
-        lastName: '',
-        email: '',
-        isPrimary: false,
-        phone: '',
-        
-        updatedAt: 0,
-        archivedAt: 0,
-        isDeleted: false,
+      id: --VendorContactEntity.counter,
+      firstName: '',
+      lastName: '',
+      email: '',
+      isPrimary: false,
+      phone: '',
+      updatedAt: 0,
+      archivedAt: 0,
+      isDeleted: false,
     );
   }
+
   VendorContactEntity._();
 
   @BuiltValueField(wireName: 'first_name')
@@ -250,5 +255,6 @@ abstract class VendorContactEntity extends Object with BaseEntity implements Bui
   @override
   FormatNumberType get listDisplayAmountType => FormatNumberType.money;
 
-  static Serializer<VendorContactEntity> get serializer => _$vendorContactEntitySerializer;
-}
\ No newline at end of file
+  static Serializer<VendorContactEntity> get serializer =>
+      _$vendorContactEntitySerializer;
+}
diff --git a/pubspec.lock b/pubspec.lock
index 230e5854b..f343e3a70 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.32.4"
+    version: "0.32.6"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   async:
     dependency: transitive
     description:
@@ -49,14 +49,14 @@ packages:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1+3"
+    version: "0.3.1+4"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2+5"
+    version: "0.2.2+6"
   build_runner:
     dependency: "direct dev"
     description:
@@ -84,7 +84,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.4"
+    version: "6.1.6"
   built_value_generator:
     dependency: "direct dev"
     description:
@@ -154,7 +154,7 @@ packages:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.5"
+    version: "0.14.6"
   dart_style:
     dependency: transitive
     description:
@@ -175,14 +175,14 @@ packages:
       name: firebase_auth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.20"
+    version: "0.6.2+1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.8"
+    version: "0.10.9"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -218,7 +218,7 @@ packages:
       name: flutter_slidable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.7"
+    version: "0.4.9"
   flutter_test:
     dependency: transitive
     description: flutter
@@ -230,14 +230,19 @@ packages:
       name: font_awesome_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.1"
+    version: "8.2.0"
   front_end:
     dependency: transitive
     description:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.4+2"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   glob:
     dependency: transitive
     description:
@@ -251,14 +256,14 @@ packages:
       name: google_sign_in
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.4"
   graphs:
     dependency: transitive
     description:
       name: graphs
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+1"
+    version: "0.1.3+1"
   html:
     dependency: transitive
     description:
@@ -328,7 +333,7 @@ packages:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.4+2"
   logging:
     dependency: transitive
     description:
@@ -364,20 +369,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.6+2"
-  multi_server_socket:
-    dependency: transitive
-    description:
-      name: multi_server_socket
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.4"
   package_config:
     dependency: transitive
     description:
@@ -385,13 +376,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
-  package_resolver:
-    dependency: transitive
-    description:
-      name: package_resolver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
   path:
     dependency: transitive
     description:
@@ -412,7 +396,14 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
   plugin:
     dependency: transitive
     description:
@@ -427,6 +418,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.6"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.8"
   pub_semver:
     dependency: transitive
     description:
@@ -440,14 +438,14 @@ packages:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+2"
+    version: "0.1.2+3"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0+1"
+    version: "2.0.1"
   redux:
     dependency: transitive
     description:
@@ -483,20 +481,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.3+3"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.8"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -515,21 +499,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.1+2"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.5"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.7"
+    version: "0.9.1+3"
   source_span:
     dependency: transitive
     description:
@@ -579,20 +549,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
-  test:
+  test_api:
     dependency: transitive
     description:
-      name: test
+      name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "0.2.1"
   timing:
     dependency: transitive
     description:
       name: timing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.1+1"
   typed_data:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c8d5b2f1a..d21d77050 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,8 +25,8 @@ dependencies:
   intl: ^0.15.7
   flutter_slidable: ^0.4.6
   charts_flutter: ^0.4.0
-  google_sign_in: ^3.0.5
-  firebase_auth: ^0.5.20
+  google_sign_in: ^3.2.4
+  firebase_auth: ^0.6.2+1
   #quick_actions: ^0.2.1
   #flutter_html_view: ^0.5.8
   #flutter_html: ^0.5.3