Merge branch 'master' into av-web

* master: Updated location package and code to cope with a breaking change. (flutter-mapbox-gl#239)
andrea689 · Apr 2, 2020 · c7e364e · c7e364e
2 parents 5883c13 + e352b22
commit c7e364e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -33,7 +33,7 @@ class MapsDemo extends StatelessWidget {
     if (!kIsWeb) {
       final location = Location();
       final hasPermissions = await location.hasPermission();
-      if (!hasPermissions) {
+      if (hasPermissions != PermissionStatus.GRANTED) {
         await location.requestPermission();
       }
     }

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
-  location: ^2.3.5
+  location: ^2.5.3
 
 dev_dependencies:
   flutter_test:

diff --git a/pubspec.lock b/pubspec.lock
@@ -31,7 +31,7 @@ packages:
       name: mapbox_gl_dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   mapbox_gl_platform_interface:
     dependency: "direct main"
     description:
@@ -73,5 +73,5 @@ packages:
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.7.0-dev <3.0.0"
+  dart: ">=2.7.0 <3.0.0"
   flutter: ">=1.12.13+hotfix.4 <2.0.0"