From b41f1a2ac789e97390666c508390d2f774d7de45 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 29 Jul 2021 16:08:44 +1000
Subject: [PATCH] Update package_info and device_info

---
 lib/inventree/sentry.dart  |  4 +--
 lib/settings/about.dart    |  2 +-
 lib/settings/settings.dart |  2 +-
 pubspec.lock               | 59 ++++++++++++++++++++++++++------------
 pubspec.yaml               |  4 +--
 5 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/lib/inventree/sentry.dart b/lib/inventree/sentry.dart
index 3d21160e..50ae4ee4 100644
--- a/lib/inventree/sentry.dart
+++ b/lib/inventree/sentry.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
-import 'package:package_info/package_info.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'package:inventree/api.dart';
diff --git a/lib/settings/about.dart b/lib/settings/about.dart
index 22196ed2..de208666 100644
--- a/lib/settings/about.dart
+++ b/lib/settings/about.dart
@@ -6,7 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 import 'package:inventree/l10.dart';
 
diff --git a/lib/settings/settings.dart b/lib/settings/settings.dart
index d3a58113..8a0556cd 100644
--- a/lib/settings/settings.dart
+++ b/lib/settings/settings.dart
@@ -14,7 +14,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import 'login.dart';
 
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class InvenTreeSettingsWidget extends StatefulWidget {
   // InvenTree settings view
diff --git a/pubspec.lock b/pubspec.lock
index 36087b02..074151d8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -113,20 +113,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
-  device_info:
+  device_info_plus:
     dependency: "direct main"
     description:
-      name: device_info
+      name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
-  device_info_platform_interface:
+    version: "2.1.0"
+  device_info_plus_linux:
     dependency: transitive
     description:
-      name: device_info_platform_interface
+      name: device_info_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
+  device_info_plus_macos:
+    dependency: transitive
+    description:
+      name: device_info_plus_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  device_info_plus_web:
+    dependency: transitive
+    description:
+      name: device_info_plus_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  device_info_plus_windows:
+    dependency: transitive
+    description:
+      name: device_info_plus_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
   dropdown_search:
     dependency: "direct main"
     description:
@@ -322,27 +350,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
-  package_info:
-    dependency: "direct main"
-    description:
-      name: package_info
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
   package_info_plus:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: package_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   package_info_plus_linux:
     dependency: transitive
     description:
       name: package_info_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   package_info_plus_macos:
     dependency: transitive
     description:
@@ -356,21 +377,21 @@ packages:
       name: package_info_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   package_info_plus_web:
     dependency: transitive
     description:
       name: package_info_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   package_info_plus_windows:
     dependency: transitive
     description:
       name: package_info_plus_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   path:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8e6901aa..df1344ed 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,8 +25,8 @@ dependencies:
   http: ^0.13.0
   cached_network_image: ^3.0.0            # Download and cache remote images
   qr_code_scanner: ^0.5.1                 # Barcode scanning
-  package_info: ^2.0.0                    # App information introspection
-  device_info: ^2.0.0                     # Information about the device
+  package_info_plus: ^1.0.4               # App information introspection
+  device_info_plus: ^2.1.0                # Information about the device
   font_awesome_flutter: ^9.1.0            # FontAwesome icon set
   flutter_speed_dial: ^3.0.5              # FAB menu elements
   sentry_flutter: 5.0.0                   # Error reporting