1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-28 22:51:59 +00:00

chore(mobile): upgrade flutter to 3.22 (#9518)

* chore(mobile): upgrade flutter sdk

* gha

* update kotlin

* refactor

* ios build

* remove patch files

* not touching openapi pubpsec file
This commit is contained in:
Alex 2024-05-16 10:58:02 -05:00 committed by GitHub
parent 984aa8fb41
commit 673e97e71d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 38 additions and 36 deletions

View file

@ -45,7 +45,7 @@ jobs:
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
channel: 'stable' channel: 'stable'
flutter-version: '3.19.3' flutter-version: '3.22.0'
cache: true cache: true
- name: Create the Keystore - name: Create the Keystore

View file

@ -22,8 +22,8 @@ jobs:
- name: Setup Flutter SDK - name: Setup Flutter SDK
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
channel: "stable" channel: 'stable'
flutter-version: "3.19.3" flutter-version: '3.22.0'
- name: Install dependencies - name: Install dependencies
run: dart pub get run: dart pub get

View file

@ -208,7 +208,7 @@ jobs:
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
channel: 'stable' channel: 'stable'
flutter-version: '3.19.3' flutter-version: '3.22.0'
- name: Run tests - name: Run tests
working-directory: ./mobile working-directory: ./mobile
run: flutter test -j 1 run: flutter test -j 1

View file

@ -1,5 +1,5 @@
{ {
"dart.flutterSdkPath": ".fvm/versions/3.19.3", "dart.flutterSdkPath": ".fvm/versions/3.22.0",
"search.exclude": { "search.exclude": {
"**/.fvm": true "**/.fvm": true
}, },

View file

@ -1,4 +1,6 @@
allprojects { allprojects {
ext.kotlin_version = '1.9.24'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()

View file

@ -159,7 +159,7 @@ SPEC CHECKSUMS:
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461 geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
integration_test: 13825b8a9334a850581300559b8839134b124670 integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073 isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef
maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9 maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9

View file

@ -121,12 +121,12 @@ final ThemeData immichLightTheme = ThemeData(
), ),
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
indicatorColor: Colors.indigo.withOpacity(0.15), indicatorColor: Colors.indigo.withOpacity(0.15),
iconTheme: MaterialStatePropertyAll( iconTheme: WidgetStatePropertyAll(
IconThemeData(color: Colors.grey[700]), IconThemeData(color: Colors.grey[700]),
), ),
backgroundColor: immichBackgroundColor, backgroundColor: immichBackgroundColor,
surfaceTintColor: Colors.transparent, surfaceTintColor: Colors.transparent,
labelTextStyle: MaterialStatePropertyAll( labelTextStyle: WidgetStatePropertyAll(
TextStyle( TextStyle(
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
@ -249,12 +249,12 @@ final ThemeData immichDarkTheme = ThemeData(
), ),
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
indicatorColor: immichDarkThemePrimaryColor.withOpacity(0.4), indicatorColor: immichDarkThemePrimaryColor.withOpacity(0.4),
iconTheme: MaterialStatePropertyAll( iconTheme: WidgetStatePropertyAll(
IconThemeData(color: Colors.grey[500]), IconThemeData(color: Colors.grey[500]),
), ),
backgroundColor: Colors.grey[900], backgroundColor: Colors.grey[900],
surfaceTintColor: Colors.transparent, surfaceTintColor: Colors.transparent,
labelTextStyle: MaterialStatePropertyAll( labelTextStyle: WidgetStatePropertyAll(
TextStyle( TextStyle(
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,

View file

@ -164,7 +164,7 @@ class _DateTimePicker extends HookWidget {
color: context.primaryColor, color: context.primaryColor,
), ),
menuStyle: const MenuStyle( menuStyle: const MenuStyle(
fixedSize: MaterialStatePropertyAll(Size.fromWidth(350)), fixedSize: WidgetStatePropertyAll(Size.fromWidth(350)),
alignment: Alignment(-1.25, 0.5), alignment: Alignment(-1.25, 0.5),
), ),
onSelected: (value) => tzOffset.value = value!, onSelected: (value) => tzOffset.value = value!,
@ -175,7 +175,7 @@ class _DateTimePicker extends HookWidget {
value: t, value: t,
label: t.display, label: t.display,
style: ButtonStyle( style: ButtonStyle(
textStyle: MaterialStatePropertyAll( textStyle: WidgetStatePropertyAll(
context.textTheme.bodyMedium, context.textTheme.bodyMedium,
), ),
), ),

View file

@ -40,7 +40,7 @@ class CameraPicker extends HookConsumerWidget {
); );
final menuStyle = MenuStyle( final menuStyle = MenuStyle(
shape: MaterialStatePropertyAll<OutlinedBorder>( shape: WidgetStatePropertyAll<OutlinedBorder>(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),

View file

@ -56,7 +56,7 @@ class LocationPicker extends HookConsumerWidget {
); );
final menuStyle = MenuStyle( final menuStyle = MenuStyle(
shape: MaterialStatePropertyAll<OutlinedBorder>( shape: WidgetStatePropertyAll<OutlinedBorder>(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),

View file

@ -34,12 +34,12 @@ class LanguageSettings extends HookConsumerWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
), ),
menuStyle: MenuStyle( menuStyle: MenuStyle(
shape: MaterialStatePropertyAll<OutlinedBorder>( shape: WidgetStatePropertyAll<OutlinedBorder>(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
), ),
backgroundColor: MaterialStatePropertyAll<Color>( backgroundColor: WidgetStatePropertyAll<Color>(
context.isDarkTheme context.isDarkTheme
? Colors.grey[900]! ? Colors.grey[900]!
: context.scaffoldBackgroundColor, : context.scaffoldBackgroundColor,

View file

@ -381,10 +381,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: easy_localization name: easy_localization
sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5 sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.3" version: "3.0.7"
easy_logger: easy_logger:
dependency: transitive dependency: transitive
description: description:
@ -699,10 +699,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: hotreloader name: hotreloader
sha256: "94ee21a60ea2836500799f3af035dc3212b1562027f1e0031c14e087f0231449" sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.1.0" version: "4.2.0"
html: html:
dependency: transitive dependency: transitive
description: description:
@ -816,10 +816,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: intl name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.18.1" version: "0.19.0"
io: io:
dependency: transitive dependency: transitive
description: description:
@ -872,26 +872,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.0" version: "10.0.4"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.1" version: "3.0.3"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.1" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@ -1503,10 +1503,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.6.1" version: "0.7.0"
thumbhash: thumbhash:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1703,10 +1703,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "13.0.0" version: "14.2.1"
wakelock_plus: wakelock_plus:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1805,4 +1805,4 @@ packages:
version: "3.1.2" version: "3.1.2"
sdks: sdks:
dart: ">=3.3.0 <4.0.0" dart: ">=3.3.0 <4.0.0"
flutter: ">=3.16.0" flutter: ">=3.18.0-18.0.pre.54"

View file

@ -21,7 +21,7 @@ dependencies:
riverpod_annotation: ^2.3.3 riverpod_annotation: ^2.3.3
cached_network_image: ^3.3.1 cached_network_image: ^3.3.1
flutter_cache_manager: ^3.3.1 flutter_cache_manager: ^3.3.1
intl: ^0.18.0 intl: ^0.19.0
auto_route: ^8.0.2 auto_route: ^8.0.2
fluttertoast: ^8.2.4 fluttertoast: ^8.2.4
video_player: ^2.8.2 video_player: ^2.8.2

View file

@ -23,8 +23,8 @@ extension PumpConsumerWidget on WidgetTester {
home: Material(child: widget), home: Material(child: widget),
), ),
), ),
duration, duration: duration,
phase, phase: phase,
); );
} }
} }