From 093f1747da0df9613b29fccbb9b4a9c6c0c69d89 Mon Sep 17 00:00:00 2001
From: Jon Samwell <jonsamwell@gmail.com>
Date: Wed, 5 Jun 2019 11:56:11 +1000
Subject: [PATCH] chore(lint): fixed linting errors

---
 CHANGELOG.md           |  3 +++
 pre-publish-checks.cmd |  1 +
 pubspec.lock           | 34 +++++++++++++++++-----------------
 pubspec.yaml           | 15 ++++++---------
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eba2a..fc4750b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [1.0.1] - 05/06/2019
+* Fixed dependency conflicts
+
 ## [1.0.0] - 05/06/2019
 * Huge speed improvement when running tests by hot reloading (which clears the state) rather than restarting the app
 * Added flag to determine if the application should be built prior to running tests
diff --git a/pre-publish-checks.cmd b/pre-publish-checks.cmd
index c5ae8f0..7c5a0b2 100644
--- a/pre-publish-checks.cmd
+++ b/pre-publish-checks.cmd
@@ -1,3 +1,4 @@
 CALL "C:\Google\flutter\bin\cache\dart-sdk\bin\dartanalyzer" --options analysis_options.yaml .
 CALL "C:\Google\flutter\bin\cache\dart-sdk\bin\dartfmt" . -w
+CALL flutter packages upgrade
 CALL flutter test
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 86e25cf..2bd54a5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -70,19 +70,19 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.8"
+    version: "5.0.7"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
   flutter_driver:
-    dependency: "direct dev"
+    dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
   flutter_test:
-    dependency: "direct dev"
+    dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
@@ -106,7 +106,7 @@ packages:
     source: hosted
     version: "1.0.0"
   glob:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: glob
       url: "https://pub.dartlang.org"
@@ -132,7 +132,7 @@ packages:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -167,7 +167,7 @@ packages:
       name: json_rpc_2
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.10"
   kernel:
     dependency: transitive
     description:
@@ -176,7 +176,7 @@ packages:
     source: hosted
     version: "0.3.18"
   matcher:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
@@ -225,7 +225,7 @@ packages:
     source: hosted
     version: "1.0.10"
   path:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
@@ -237,7 +237,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.5.0"
   platform:
     dependency: transitive
     description:
@@ -272,7 +272,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.2"
   shelf:
     dependency: transitive
     description:
@@ -356,26 +356,26 @@ packages:
     source: hosted
     version: "1.1.0"
   test:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.6.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.6"
+    version: "0.2.4"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.6"
+    version: "0.2.3"
   typed_data:
     dependency: transitive
     description:
@@ -396,7 +396,7 @@ packages:
       name: vm_service_client
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.6+2"
+    version: "0.2.6+1"
   watcher:
     dependency: transitive
     description:
@@ -410,7 +410,7 @@ packages:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.13"
+    version: "1.0.12"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index f456fad..45b4284 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_gherkin
 description: A Gherkin / Cucumber parser and test runner for Dart and Flutter
-version: 1.0.0
+version: 1.0.1
 author: Jon Samwell <jonsamwell@gmail.com>
 homepage: https://github.com/jonsamwell/flutter_gherkin
 
@@ -10,17 +10,14 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  path: ^1.6.2
-  glob: ^1.1.7
-  test: ^1.6.4
-  matcher: ^0.12.5
-  pedantic: ^1.5.0
-  gherkin: ^1.0.0
-
-dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_driver:
     sdk: flutter
+  pedantic: ^1.5.0
+  gherkin: ^1.0.0
+
+dev_dependencies:
+  test: 1.6.1
 
 flutter: