1
0
mirror of https://github.com/immich-app/immich.git synced 2025-02-15 19:36:04 +02:00

chore(mobile): update maplibre_gl dep (#11640)

This commit is contained in:
Alex 2024-08-07 13:47:40 -05:00 committed by GitHub
parent c34fc4f2d1
commit d93ccb1669
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 26 additions and 30 deletions

View File

@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.alextran.immich" <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.alextran.immich"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<application android:label="Immich" android:name=".ImmichApp" android:usesCleartextTraffic="true" <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 <meta-data
android:name="io.flutter.embedding.android.EnableImpeller" android:name="io.flutter.embedding.android.EnableImpeller"
@ -55,7 +56,8 @@
<uses-permission android:name="android.permission.INTERNET" /> <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.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
<uses-permission android:name="android.permission.MANAGE_MEDIA" /> <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.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <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_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<queries> <queries>
<intent> <intent>
@ -76,4 +79,4 @@
<data android:scheme="geo" /> <data android:scheme="geo" />
</intent> </intent>
</queries> </queries>
</manifest> </manifest>

View File

@ -8,9 +8,11 @@ allprojects {
} }
rootProject.buildDir = '../build' rootProject.buildDir = '../build'
subprojects { subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}" project.buildDir = "${rootProject.buildDir}/${project.name}"
} }
subprojects { subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }

View File

@ -19,8 +19,8 @@ pluginManagement {
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.2" apply false 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.android" version "1.9.0" apply false
id "org.jetbrains.kotlin.kapt" version "1.9.24" apply false id "org.jetbrains.kotlin.kapt" version "1.9.0" apply false
} }
include ":app" include ":app"

View File

@ -935,30 +935,27 @@ packages:
maplibre_gl: maplibre_gl:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." name: maplibre_gl
ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5 sha256: "9dd9eebee52f42a45aaa9cdb912afa47845c37007b26a799aa482ecd368804c8"
resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5 url: "https://pub.dev"
url: "https://github.com/maplibre/flutter-maplibre-gl.git" source: hosted
source: git version: "0.19.0+2"
version: "0.18.0"
maplibre_gl_platform_interface: maplibre_gl_platform_interface:
dependency: transitive dependency: transitive
description: description:
path: maplibre_gl_platform_interface name: maplibre_gl_platform_interface
ref: main sha256: a95fa38a3532253f32dfe181389adfe9f402773e58ac902d9c4efad3209e0903
resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5 url: "https://pub.dev"
url: "https://github.com/maplibre/flutter-maplibre-gl.git" source: hosted
source: git version: "0.19.0+2"
version: "0.18.0"
maplibre_gl_web: maplibre_gl_web:
dependency: transitive dependency: transitive
description: description:
path: maplibre_gl_web name: maplibre_gl_web
ref: main sha256: "7f1540b384f16f3c9bc8b4ebdfca96fb07f6dab5d9ef4dd0e102985dba238691"
resolved-ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5 url: "https://pub.dev"
url: "https://github.com/maplibre/flutter-maplibre-gl.git" source: hosted
source: git version: "0.19.0+2"
version: "0.18.0"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:

View File

@ -13,8 +13,6 @@ dependencies:
sdk: flutter sdk: flutter
path_provider_ios: 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: ^3.2.3
photo_manager_image_provider: ^2.1.1 photo_manager_image_provider: ^2.1.1
flutter_hooks: ^0.20.4 flutter_hooks: ^0.20.4
@ -28,11 +26,7 @@ dependencies:
video_player: ^2.8.2 video_player: ^2.8.2
chewie: ^1.7.4 chewie: ^1.7.4
socket_io_client: ^2.0.3+1 socket_io_client: ^2.0.3+1
# TODO: Update it to tag once next stable release maplibre_gl: 0.19.0+2
maplibre_gl:
git:
url: https://github.com/maplibre/flutter-maplibre-gl.git
ref: acb428a005efd9832a0a8e7ef0945f899dfb3ca5
geolocator: ^11.0.0 # used to move to current location in map view geolocator: ^11.0.0 # used to move to current location in map view
flutter_udid: ^3.0.0 flutter_udid: ^3.0.0
flutter_svg: ^2.0.9 flutter_svg: ^2.0.9