From 0431164ca6bcffa9d4dbb45bbf6002e3fef4d5ef Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Mon, 7 Jun 2021 17:36:55 +0900
Subject: [PATCH] packages upgrade

---
 pubspec.lock | 38 ++++++++++++++++++--------------------
 pubspec.yaml |  6 +-----
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 14f89b42d..e46cbdebd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   async:
     dependency: transitive
     description:
@@ -212,16 +212,16 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   fijkplayer:
     dependency: "direct main"
     description:
       path: "."
       ref: aves
-      resolved-ref: ded83f43a1c3a664d5e9cfcab687c3caab2cbdb0
+      resolved-ref: "33aaf201bf761a50755971ba714c80693717b9f9"
       url: "git://github.com/deckerst/fijkplayer.git"
     source: git
-    version: "0.8.8"
+    version: "0.9.0"
   file:
     dependency: transitive
     description:
@@ -242,7 +242,7 @@ packages:
       name: firebase_analytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.0"
+    version: "8.1.1"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
@@ -263,7 +263,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -284,14 +284,14 @@ packages:
       name: firebase_crashlytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -324,11 +324,9 @@ packages:
   flutter_map:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "issues/829-nullsafety"
-      resolved-ref: d9674b5c4fec7d759462a417c8acc548a3e720e1
-      url: "git://github.com/fleaflet/flutter_map.git"
-    source: git
+      name: flutter_map
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.13.0"
   flutter_markdown:
     dependency: "direct main"
@@ -386,7 +384,7 @@ packages:
       name: github
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.0"
+    version: "8.1.1"
   glob:
     dependency: transitive
     description:
@@ -701,14 +699,14 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.0+2"
+    version: "8.0.1"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.5.1"
   petitparser:
     dependency: transitive
     description:
@@ -1016,7 +1014,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.4"
+    version: "6.0.6"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1044,7 +1042,7 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1107,7 +1105,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   wkt_parser:
     dependency: transitive
     description:
@@ -1128,7 +1126,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.1"
+    version: "5.1.2"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 68082db96..8638050b9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,9 +7,8 @@ publish_to: none
 environment:
   sdk: '>=2.12.0 <3.0.0'
 
-# not null safe, as of 2021/05/23
+# not null safe, as of 2021/06/07
 # `charts_flutter` - https://github.com/google/charts/issues/579
-# `flutter_map` - https://github.com/fleaflet/flutter_map/issues/829
 
 dependencies:
   flutter:
@@ -34,9 +33,6 @@ dependencies:
   firebase_crashlytics:
   flutter_highlight:
   flutter_map:
-    git:
-      url: git://github.com/fleaflet/flutter_map.git
-      ref: issues/829-nullsafety
   flutter_markdown:
   flutter_staggered_animations:
   flutter_svg: