From d93ccb1669556c63fea4fdee791797747da56bef Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 7 Aug 2024 13:47:40 -0500
Subject: [PATCH] chore(mobile): update maplibre_gl dep (#11640)

---
 .../android/app/src/main/AndroidManifest.xml  |  9 +++--
 mobile/android/build.gradle                   |  2 ++
 mobile/android/settings.gradle                |  4 +--
 mobile/pubspec.lock                           | 33 +++++++++----------
 mobile/pubspec.yaml                           |  8 +----
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index dc0e10ee82..1bac79daf5 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.alextran.immich"
   xmlns:tools="http://schemas.android.com/tools">
   <application android:label="Immich" android:name=".ImmichApp" android:usesCleartextTraffic="true"
-    android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true"  android:largeHeap="true">
+    android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true"
+    android:largeHeap="true">
 
     <meta-data
       android:name="io.flutter.embedding.android.EnableImpeller"
@@ -55,7 +56,8 @@
 
 
   <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    android:maxSdkVersion="32" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
   <uses-permission android:name="android.permission.MANAGE_MEDIA" />
@@ -65,6 +67,7 @@
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
   <queries>
     <intent>
@@ -76,4 +79,4 @@
       <data android:scheme="geo" />
     </intent>
   </queries>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 9b757fbc36..9b5e515a68 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -8,9 +8,11 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+
 subprojects {
     project.evaluationDependsOn(':app')
 }
diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle
index e832517e64..e809a0abaa 100644
--- a/mobile/android/settings.gradle
+++ b/mobile/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.4.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.24" apply false
-    id "org.jetbrains.kotlin.kapt" version "1.9.24" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+    id "org.jetbrains.kotlin.kapt" version "1.9.0" apply false
 }
 
 include ":app"
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index bd756703b9..d6c37632ad 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -935,30 +935,27 @@ packages:
   maplibre_gl:
     dependency: "direct main"
     description:
-      path: "."
-      ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
-      resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
-      url: "https://github.com/maplibre/flutter-maplibre-gl.git"
-    source: git
-    version: "0.18.0"
+      name: maplibre_gl
+      sha256: "9dd9eebee52f42a45aaa9cdb912afa47845c37007b26a799aa482ecd368804c8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0+2"
   maplibre_gl_platform_interface:
     dependency: transitive
     description:
-      path: maplibre_gl_platform_interface
-      ref: main
-      resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
-      url: "https://github.com/maplibre/flutter-maplibre-gl.git"
-    source: git
-    version: "0.18.0"
+      name: maplibre_gl_platform_interface
+      sha256: a95fa38a3532253f32dfe181389adfe9f402773e58ac902d9c4efad3209e0903
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0+2"
   maplibre_gl_web:
     dependency: transitive
     description:
-      path: maplibre_gl_web
-      ref: main
-      resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
-      url: "https://github.com/maplibre/flutter-maplibre-gl.git"
-    source: git
-    version: "0.18.0"
+      name: maplibre_gl_web
+      sha256: "7f1540b384f16f3c9bc8b4ebdfca96fb07f6dab5d9ef4dd0e102985dba238691"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0+2"
   matcher:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index f429b5374c..6c853054ea 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -13,8 +13,6 @@ dependencies:
     sdk: flutter
 
   path_provider_ios:
-  # TODO: upgrade to stable after 3.0.1 is released. 3.0.0 is broken
-  # https://github.com/fluttercandies/flutter_photo_manager/pull/990#issuecomment-2058066427
   photo_manager: ^3.2.3
   photo_manager_image_provider: ^2.1.1
   flutter_hooks: ^0.20.4
@@ -28,11 +26,7 @@ dependencies:
   video_player: ^2.8.2
   chewie: ^1.7.4
   socket_io_client: ^2.0.3+1
-  # TODO: Update it to tag once next stable release
-  maplibre_gl:
-    git:
-      url: https://github.com/maplibre/flutter-maplibre-gl.git
-      ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
+  maplibre_gl: 0.19.0+2
   geolocator: ^11.0.0 # used to move to current location in map view
   flutter_udid: ^3.0.0
   flutter_svg: ^2.0.9