From 8c4e84ba06c29b1e000c103d668f5eb5818d4112 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sat, 18 Jun 2022 17:31:00 +0900
Subject: [PATCH] packages upgrade, build fix

---
 android/app/build.gradle                 |  1 -
 android/app/src/main/AndroidManifest.xml |  7 ++++
 pubspec.lock                             | 46 ++++++++++++------------
 pubspec.yaml                             |  6 ++--
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 78f84d8c2..54dd9793b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -140,7 +140,6 @@ android {
     lint {
         disable 'InvalidPackage'
     }
-    namespace 'deckers.thibault.aves'
 }
 
 flutter {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 68c90244b..e566bc012 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,12 @@
+<!--
+Android Studio Chipmunk (2021.2.1) recommends:
+- removing "package" from AndroidManifest.xml
+- adding it as "namespace" in app/build.gradle
+This change eventually prevents building the app with Flutter v3.0.2.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    package="deckers.thibault.aves"
     android:installLocation="auto">
 
     <!--
diff --git a/pubspec.lock b/pubspec.lock
index ae64ed458..08fbe62ae 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -133,7 +133,7 @@ packages:
       name: connectivity_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.4"
   connectivity_plus_linux:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: connectivity_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   connectivity_plus_windows:
     dependency: transitive
     description:
@@ -326,35 +326,35 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.1"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.6.5"
   firebase_crashlytics:
     dependency: transitive
     description:
       name: firebase_crashlytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.7"
+    version: "3.2.8"
   flex_color_picker:
     dependency: "direct main"
     description:
@@ -418,7 +418,7 @@ packages:
       name: flutter_map
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -475,7 +475,7 @@ packages:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   google_api_availability:
     dependency: transitive
     description:
@@ -489,14 +489,14 @@ packages:
       name: google_maps_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   google_maps_flutter_platform_interface:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.0"
   highlight:
     dependency: transitive
     description:
@@ -517,7 +517,7 @@ packages:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -671,7 +671,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -783,7 +783,7 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.2.0"
+    version: "10.0.0"
   permission_handler_android:
     dependency: "direct overridden"
     description:
@@ -848,7 +848,7 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   positioned_tap_detector_2:
     dependency: transitive
     description:
@@ -948,12 +948,12 @@ packages:
     source: hosted
     version: "2.0.15"
   shared_preferences_android:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: shared_preferences_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.12"
   shared_preferences_ios:
     dependency: transitive
     description:
@@ -1002,28 +1002,28 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1212,14 +1212,14 @@ packages:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.0"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.12"
   url_launcher_windows:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a75030aa9..a39236ec9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,7 +62,7 @@ dependencies:
   overlay_support:
   package_info_plus:
   palette_generator:
-# TODO TLAD as of 2022/02/22, latest version (v0.4.1) has this issue: https://github.com/zesage/panorama/issues/25
+# TODO TLAD as of 2022/06/18, latest version (v0.4.1) has this issue: https://github.com/zesage/panorama/issues/25
   panorama: 0.4.0
   path:
   pdf:
@@ -73,8 +73,6 @@ dependencies:
   provider:
   screen_brightness:
   shared_preferences:
-# TODO TLAD as of 2022/02/22, latest version (v2.0.11) fails to load from analysis service (target wrong channel?)
-  shared_preferences_android: 2.0.10
   sqflite:
   streams_channel:
     git:
@@ -85,7 +83,7 @@ dependencies:
   xml:
 
 dependency_overrides:
-  # TODO TLAD as of 2022/06/11, latest version (v9.0.2+1) does not support Android 13 storage permissions
+  # TODO TLAD as of 2022/06/18, latest version (v10.0.0) does not support Android 13 storage permissions
   permission_handler_android:
     git:
       url: https://github.com/deckerst/flutter-permission-handler