From 0d0c5976b754c67b3e03a2f5cae09070b9d07b33 Mon Sep 17 00:00:00 2001 From: Frederik St-Onge Date: Wed, 19 Feb 2025 14:21:25 -0500 Subject: [PATCH 1/5] Update --- .gitignore | 2 + android/app/build.gradle | 18 -- lib/l10n/generated/app_localizations_en.dart | 2 +- lib/l10n/generated/app_localizations_fr.dart | 2 +- pubspec.lock | 238 +++++++++---------- 5 files changed, 123 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index 79c113f9..0e6b45f6 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,8 @@ migrate_working_dir/ .pub/ /build/ +**/.cxx/ + # Symbolication related app.*.symbols diff --git a/android/app/build.gradle b/android/app/build.gradle index 398092be..bd68656c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,24 +10,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } -def localProperties = new Properties() -def localPropertiesFile = rootProject.file("local.properties") -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader("UTF-8") { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty("flutter.versionCode") -if (flutterVersionCode == null) { - flutterVersionCode = "1" -} - -def flutterVersionName = localProperties.getProperty("flutter.versionName") -if (flutterVersionName == null) { - flutterVersionName = "1.0" -} - // Signing def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file("key.properties") diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart index 70b19d9b..26aa1e00 100644 --- a/lib/l10n/generated/app_localizations_en.dart +++ b/lib/l10n/generated/app_localizations_en.dart @@ -1,5 +1,5 @@ +// ignore: unused_import import 'package:intl/intl.dart' as intl; - import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/lib/l10n/generated/app_localizations_fr.dart b/lib/l10n/generated/app_localizations_fr.dart index 62e696a0..59fef72d 100644 --- a/lib/l10n/generated/app_localizations_fr.dart +++ b/lib/l10n/generated/app_localizations_fr.dart @@ -1,5 +1,5 @@ +// ignore: unused_import import 'package:intl/intl.dart' as intl; - import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/pubspec.lock b/pubspec.lock index a697e26a..1bde055e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "27899c95f9e7ec06c8310e6e0eac967707714b9f1450c4a58fa00ca011a4a8ae" + sha256: "401dd18096f5eaa140404ccbbbf346f83c850e6f27049698a7ee75a3488ddb32" url: "https://pub.dev" source: hosted - version: "1.3.49" + version: "1.3.52" _macros: dependency: transitive description: dart @@ -58,10 +58,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" bloc: dependency: transitive description: @@ -74,10 +74,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -98,26 +98,26 @@ packages: dependency: transitive description: name: build_daemon - sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" + sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" url: "https://pub.dev" source: hosted - version: "4.0.3" + version: "4.0.4" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" + sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" + sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" url: "https://pub.dev" source: hosted - version: "2.4.14" + version: "2.4.15" build_runner_core: dependency: transitive description: @@ -146,10 +146,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -162,10 +162,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -178,10 +178,10 @@ packages: dependency: "direct main" description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" convert: dependency: transitive description: @@ -226,50 +226,50 @@ packages: dependency: "direct main" description: name: dart_mappable - sha256: f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382 + sha256: a88d1637354b8e3120433cbdf2b816dd9e38659b8a9b6ed8cb19cd101e12c545 url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.4.0" dart_mappable_builder: dependency: "direct dev" description: name: dart_mappable_builder - sha256: "04a6e7117382f8a8689b3e363bee6c3de8c9ea4332e664148fe01bd576eb1126" + sha256: b3673a6d190f2ea766b39ea298d4c55d1caca9382a536cf164ffe7e2f955c501 url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.3.1+1" dart_style: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.8" dbus: dependency: transitive description: name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" dio: dependency: "direct main" description: name: dio - sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9" url: "https://pub.dev" source: hosted - version: "5.7.0" + version: "5.8.0+1" dio_web_adapter: dependency: transitive description: name: dio_web_adapter - sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" equatable: dependency: transitive description: @@ -290,18 +290,18 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: name: ffi - sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" file: dependency: transitive description: @@ -314,34 +314,34 @@ packages: dependency: "direct main" description: name: firebase_analytics - sha256: "498c6cb8468e348a556709c745d92a52173ab3a9b906aa0593393f0787f201ea" + sha256: "6abce50b79729d8a13c3d4ae05ac612d5ef2f57394330bc5e581ca0e762325f4" url: "https://pub.dev" source: hosted - version: "11.4.0" + version: "11.4.3" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: ccbb350554e98afdb4b59852689292d194d31232a2647b5012a66622b3711df9 + sha256: cd9ae65870bf23ab7e63a04fe9c1b38522fd3556a8c32288afd3f5cb10d4b8f4 url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.3.3" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: "68e1f18fc16482c211c658e739c25f015b202a260d9ad8249c6d3d7963b8105f" + sha256: "5654ed7e39d7a8099e60748924327159785512d78d913e965f9ca93c533af910" url: "https://pub.dev" source: hosted - version: "0.5.10+6" + version: "0.5.10+9" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "0307c1fde82e2b8b97e0be2dab93612aff9a72f31ebe9bfac66ed8b37ef7c568" + sha256: "6a4ea0f1d533443c8afc3d809cd36a4e2b8f2e2e711f697974f55bb31d71d1b8" url: "https://pub.dev" source: hosted - version: "3.10.0" + version: "3.12.0" firebase_core_platform_interface: dependency: transitive description: @@ -354,74 +354,74 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b + sha256: e47f5c2776de018fa19bc9f6f723df136bc75cdb164d64b65305babd715c8e41 url: "https://pub.dev" source: hosted - version: "2.19.0" + version: "2.21.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: f6adb65fa3d6391a79f0e60833bb4cdc468ce0c318831c90057ee11e0909cd29 + sha256: "3d4dd8406ee3be734a027503af7dd8d89ad5bddbaf83f4189946ce5ecc0f6aa6" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.3.3" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "6635166c22c6f75f634b8e77b70fcc43b24af4cfee28f975249dbdbd9769a702" + sha256: "3a2b20b4b486fc897e3d89ba785ce2df6e819b4486df660ef0cce499b3d760ca" url: "https://pub.dev" source: hosted - version: "3.8.0" + version: "3.8.3" firebase_performance: dependency: "direct main" description: name: firebase_performance - sha256: "0c8c0d9c491d166e95df6db0f8758fc5b5445a56dac6e63f33e8feb9f9021d83" + sha256: "850aeed08f4798581ba438fc8dbb9c36825d04253c46edcf816315ee8b743597" url: "https://pub.dev" source: hosted - version: "0.10.1" + version: "0.10.1+3" firebase_performance_platform_interface: dependency: transitive description: name: firebase_performance_platform_interface - sha256: "53adf58798495c0df223fa7a2e0d36972ce630d8019ed7392a4b5b490c4114da" + sha256: "04df3299e881f2c326ef74db348c84b3e1a949dc7f15a0ba6b452d63d58e5ec4" url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.5+3" firebase_performance_web: dependency: transitive description: name: firebase_performance_web - sha256: a9db2c82552d853ef121e184229b999e318e03ea54d392ffac9c54eea5aa4216 + sha256: fdb858c438571022ee4085b4992bd6400dd6a3f826ffcf0330cb2685b31745c8 url: "https://pub.dev" source: hosted - version: "0.1.7+6" + version: "0.1.7+9" firebase_remote_config: dependency: "direct main" description: name: firebase_remote_config - sha256: "1ddeee5055a6fd2295429b8cc3019d5f422c60c77fd22156a789aa6446645595" + sha256: "6e9846bba1d5bf8b5bea8012c9ab7245371ac956864f422da1ec4c8d95c37554" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.1" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - sha256: a17a43aa27f860a4e13c2cea11f66d71584976c5b9aa59b0e1720b8435d14764 + sha256: "1272a268434097d5645bb1537f3073c82b58910b4a588bbe88e5eab6005ef144" url: "https://pub.dev" source: hosted - version: "1.4.48" + version: "1.5.1" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - sha256: a85a95d6cc0692b82663acf3b0c312f219c55fbdf8ce997922ab862e64945415 + sha256: "122c7e1304787072969b8df84a77684f7c9448e95a6d114868280b6fc18c46fa" url: "https://pub.dev" source: hosted - version: "1.7.6" + version: "1.8.1" fixnum: dependency: transitive description: @@ -518,18 +518,18 @@ packages: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" go_router: dependency: "direct main" description: name: go_router - sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d" + sha256: "04539267a740931c6d4479a10d466717ca5901c6fdfd3fcda09391bbb8ebd651" url: "https://pub.dev" source: hosted - version: "14.6.3" + version: "14.8.0" golden_screenshot: dependency: "direct dev" description: @@ -566,10 +566,10 @@ packages: dependency: transitive description: name: hive_ce - sha256: "918d3379fafea06d501a161805965f04d0ff164aa3948daeb746b31ed936a51b" + sha256: ac66daee46ad46486a1ed12cf91e9d7479c875fb46889be8d2c96b557406647f url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.1" html: dependency: "direct main" description: @@ -582,10 +582,10 @@ packages: dependency: transitive description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" http_mock_adapter: dependency: "direct dev" description: @@ -678,18 +678,18 @@ packages: dependency: transitive description: name: jovial_misc - sha256: "4b10a4cac4f492d9692e97699bff775efa84abdba29909124cbccf3126e31cea" + sha256: "4301011027d87b8b919cb862db84071a34448eadbb32cc8d40fe505424dfe69a" url: "https://pub.dev" source: hosted - version: "0.9.0" + version: "0.9.2" jovial_svg: dependency: transitive description: name: jovial_svg - sha256: ca14d42956b9949c36333065c9141f100e930c918f57f4bd8dd59d35581bd3fc + sha256: "5e45b05845c8cbfec99ea32f177473ab2573d2c48479b29922c44ad329881d72" url: "https://pub.dev" source: hosted - version: "1.1.24" + version: "1.1.25" js: dependency: transitive description: @@ -710,18 +710,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -766,10 +766,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -782,10 +782,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -798,10 +798,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: "728828a798d1a2ee506beb652ca23d974c542c96ed03dcbd5eaf97bef96cdaad" + sha256: "91d28b825784e15572fdc39165c5733099ce0e69c6f6f0964ebdbf98a62130fd" url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.0.6" mockito: dependency: "direct dev" description: @@ -830,26 +830,26 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d" + sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35" url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.2.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b + sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.1.0" path: dependency: "direct dev" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -910,10 +910,10 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.1.0" platform: dependency: transitive description: @@ -974,18 +974,18 @@ packages: dependency: transitive description: name: shared_preferences - sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a + sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d" + sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.6" shared_preferences_foundation: dependency: transitive description: @@ -1014,10 +1014,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" shared_preferences_windows: dependency: transitive description: @@ -1038,10 +1038,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" sky_engine: dependency: transitive description: flutter @@ -1059,10 +1059,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1075,18 +1075,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -1099,34 +1099,34 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" synchronized: dependency: transitive description: name: synchronized - sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" + sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" url: "https://pub.dev" source: hosted - version: "3.3.0+3" + version: "3.3.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" textfield_tags: dependency: "direct main" description: @@ -1259,10 +1259,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" wakelock_plus: dependency: "direct main" description: @@ -1307,18 +1307,18 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" win32: dependency: transitive description: name: win32 - sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" + sha256: b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.11.0" xdg_directories: dependency: transitive description: @@ -1344,5 +1344,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0 <4.0.0" flutter: ">=3.27.0" From 2c2ba1c621a28af06c30952fce5ae428fe1e040a Mon Sep 17 00:00:00 2001 From: Frederik St-Onge Date: Wed, 19 Feb 2025 15:24:59 -0500 Subject: [PATCH 2/5] Migrate to flutter 3.29 --- .github/actions/setup-flutter/action.yml | 1 - .gitignore | 2 - .metadata | 30 +- android/.gitignore | 1 + android/app/build.gradle | 66 -- android/app/build.gradle.kts | 60 ++ android/build.gradle | 28 - android/build.gradle.kts | 21 + .../reports/problems/problems-report.html | 663 ++++++++++++++++++ android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- android/settings.gradle | 30 - android/settings.gradle.kts | 30 + ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile.lock | 148 ++-- .../xcshareddata/xcschemes/Runner.xcscheme | 1 + pubspec.lock | 104 +-- pubspec.yaml | 4 +- 18 files changed, 902 insertions(+), 295 deletions(-) delete mode 100644 android/app/build.gradle create mode 100644 android/app/build.gradle.kts delete mode 100644 android/build.gradle create mode 100644 android/build.gradle.kts create mode 100644 android/build/reports/problems/problems-report.html delete mode 100644 android/settings.gradle create mode 100644 android/settings.gradle.kts diff --git a/.github/actions/setup-flutter/action.yml b/.github/actions/setup-flutter/action.yml index 2747089d..8a1331ce 100644 --- a/.github/actions/setup-flutter/action.yml +++ b/.github/actions/setup-flutter/action.yml @@ -8,7 +8,6 @@ runs: uses: subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.27.4 - name: Initialize Flutter shell: bash diff --git a/.gitignore b/.gitignore index 0e6b45f6..79c113f9 100644 --- a/.gitignore +++ b/.gitignore @@ -33,8 +33,6 @@ migrate_working_dir/ .pub/ /build/ -**/.cxx/ - # Symbolication related app.*.symbols diff --git a/.metadata b/.metadata index 0edb585d..9a674c61 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "8495dee1fd4aacbe9de707e7581203232f591b2f" + revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1" channel: "stable" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: android - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: ios - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: linux - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: macos - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: web - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 - platform: windows - create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f - base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 # User provided section diff --git a/android/.gitignore b/android/.gitignore index 55afd919..be3943c9 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,6 +5,7 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. # See https://flutter.dev/to/reference-keystore diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index bd68656c..00000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,66 +0,0 @@ -plugins { - id "com.android.application" - // START: FlutterFire Configuration - id "com.google.gms.google-services" - id "com.google.firebase.firebase-perf" - id "com.google.firebase.crashlytics" - // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. - id "dev.flutter.flutter-gradle-plugin" -} - -// Signing -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file("key.properties") -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -} - -android { - namespace "com.stongef.monpacing" - compileSdk flutter.compileSdkVersion - ndkVersion '27.0.12077973' //flutter.ndkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_21 - } - - defaultConfig { - applicationId = "com.stongef.monpacing" - minSdk = 23 //flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion - versionCode = flutter.versionCode - versionName = flutter.versionName - } - - signingConfigs { - release { - if (keystorePropertiesFile.exists()) { - keyAlias keystoreProperties["keyAlias"] - keyPassword keystoreProperties["keyPassword"] - storeFile file(keystoreProperties["storeFile"]) - storePassword keystoreProperties["storePassword"] - } - } - } - - buildTypes { - release { - if (keystorePropertiesFile.exists()) { - signingConfig signingConfigs.release - } else { - signingConfig signingConfigs.debug - } - } - } -} - -flutter { - source = "../.." -} diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 00000000..6879bb15 --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,60 @@ +import java.util.Properties +import java.io.FileInputStream + +plugins { + id("com.android.application") + id("kotlin-android") + // START: FlutterFire Configuration + id("com.google.gms.google-services") + id("com.google.firebase.firebase-perf") + id("com.google.firebase.crashlytics") + // END: FlutterFire Configuration + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +val keystorePropertiesFile = rootProject.file("key.properties") +val keystoreProperties = Properties() +keystoreProperties.load(FileInputStream(keystorePropertiesFile)) + +android { + namespace = "com.stongef.monpacing" + compileSdk = flutter.compileSdkVersion + ndkVersion = "27.0.12077973" //flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + applicationId = "com.stongef.monpacing" + minSdk = 23 //flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + signingConfigs { + create("release") { + keyAlias = keystoreProperties["keyAlias"] as String + keyPassword = keystoreProperties["keyPassword"] as String + storeFile = file(keystoreProperties["storeFile"] as String) + storePassword = keystoreProperties["storePassword"] as String + } + } + + buildTypes { + release { + signingConfig = signingConfigs.getByName("release") + } + } +} + +flutter { + source = "../.." +} diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index df07db99..00000000 --- a/android/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = "../build" -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(":app") -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 00000000..89176ef4 --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,21 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html new file mode 100644 index 00000000..2625b4fc --- /dev/null +++ b/android/build/reports/problems/problems-report.html @@ -0,0 +1,663 @@ + + + + + + + + + + + + + Gradle Configuration Cache + + + +
+ +
+ Loading... +
+ + + + + + diff --git a/android/gradle.properties b/android/gradle.properties index 25971708..f018a618 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cea7a793..afa1e8eb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip -networkTimeout=10000 -validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index e512ef07..00000000 --- a/android/settings.gradle +++ /dev/null @@ -1,30 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.7.3' apply false - // START: FlutterFire Configuration - id "com.google.gms.google-services" version "4.3.15" apply false - id "com.google.firebase.firebase-perf" version "1.4.1" apply false - id "com.google.firebase.crashlytics" version "2.8.1" apply false - // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "1.9.25" apply false -} - -include ":app" diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 00000000..032b591f --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,30 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.7.0" apply false + // START: FlutterFire Configuration + id("com.google.gms.google-services") version "4.3.15" apply false + id("com.google.firebase.firebase-perf") version "1.4.1" apply false + id("com.google.firebase.crashlytics") version "2.8.1" apply false + // END: FlutterFire Configuration + id("org.jetbrains.kotlin.android") version "1.8.22" apply false +} + +include(":app") diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 1dc6cf76..41bb3f8b 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 13.0 + 15.5 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 26b68d7d..38220d2a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,69 +1,69 @@ PODS: - - Firebase/Analytics (11.6.0): + - Firebase/Analytics (11.8.0): - Firebase/Core - - Firebase/Core (11.6.0): + - Firebase/Core (11.8.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.6.0) - - Firebase/CoreOnly (11.6.0): - - FirebaseCore (~> 11.6.0) - - Firebase/Crashlytics (11.6.0): + - FirebaseAnalytics (~> 11.8.0) + - Firebase/CoreOnly (11.8.0): + - FirebaseCore (~> 11.8.0) + - Firebase/Crashlytics (11.8.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.6.0) - - Firebase/Performance (11.6.0): + - FirebaseCrashlytics (~> 11.8.0) + - Firebase/Performance (11.8.0): - Firebase/CoreOnly - - FirebasePerformance (~> 11.6.0) - - Firebase/RemoteConfig (11.6.0): + - FirebasePerformance (~> 11.8.0) + - Firebase/RemoteConfig (11.8.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 11.6.0) - - firebase_analytics (11.4.0): - - Firebase/Analytics (= 11.6.0) + - FirebaseRemoteConfig (~> 11.8.0) + - firebase_analytics (11.4.3): + - Firebase/Analytics (= 11.8.0) - firebase_core - Flutter - - firebase_core (3.10.0): - - Firebase/CoreOnly (= 11.6.0) + - firebase_core (3.12.0): + - Firebase/CoreOnly (= 11.8.0) - Flutter - - firebase_crashlytics (4.3.0): - - Firebase/Crashlytics (= 11.6.0) + - firebase_crashlytics (4.3.3): + - Firebase/Crashlytics (= 11.8.0) - firebase_core - Flutter - - firebase_performance (0.10.1): - - Firebase/Performance (= 11.6.0) + - firebase_performance (0.10.1-3): + - Firebase/Performance (= 11.8.0) - firebase_core - Flutter - - firebase_remote_config (5.3.0): - - Firebase/RemoteConfig (= 11.6.0) + - firebase_remote_config (5.4.1): + - Firebase/RemoteConfig (= 11.8.0) - firebase_core - Flutter - - FirebaseABTesting (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseAnalytics (11.6.0): - - FirebaseAnalytics/AdIdSupport (= 11.6.0) - - FirebaseCore (~> 11.6.0) + - FirebaseABTesting (11.8.0): + - FirebaseCore (~> 11.8.0) + - FirebaseAnalytics (11.8.0): + - FirebaseAnalytics/AdIdSupport (= 11.8.0) + - FirebaseCore (~> 11.8.0) - FirebaseInstallations (~> 11.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.6.0): - - FirebaseCore (~> 11.6.0) + - FirebaseAnalytics/AdIdSupport (11.8.0): + - FirebaseCore (~> 11.8.0) - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.6.0) + - GoogleAppMeasurement (= 11.8.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseCore (11.6.0): - - FirebaseCoreInternal (~> 11.6.0) + - FirebaseCore (11.8.1): + - FirebaseCoreInternal (~> 11.8.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseCoreInternal (11.6.0): + - FirebaseCoreExtension (11.8.0): + - FirebaseCore (~> 11.8.0) + - FirebaseCoreInternal (11.8.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.6.0): - - FirebaseCore (~> 11.6.0) + - FirebaseCrashlytics (11.8.0): + - FirebaseCore (~> 11.8.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) - FirebaseSessions (~> 11.0) @@ -71,13 +71,13 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.6.0): - - FirebaseCore (~> 11.6.0) + - FirebaseInstallations (11.8.0): + - FirebaseCore (~> 11.8.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebasePerformance (11.6.0): - - FirebaseCore (~> 11.6.0) + - FirebasePerformance (11.8.0): + - FirebaseCore (~> 11.8.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfig (~> 11.0) - FirebaseSessions (~> 11.0) @@ -86,47 +86,45 @@ PODS: - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (11.6.0): + - FirebaseRemoteConfig (11.8.0): - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.6.0) + - FirebaseCore (~> 11.8.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) - FirebaseSharedSwift (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.7.0) - - FirebaseSessions (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseCoreExtension (~> 11.6.0) + - FirebaseRemoteConfigInterop (11.8.0) + - FirebaseSessions (11.8.0): + - FirebaseCore (~> 11.8.0) + - FirebaseCoreExtension (~> 11.8.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (11.7.0) + - FirebaseSharedSwift (11.8.0) - Flutter (1.0.0) - flutter_file_dialog (0.0.1): - Flutter - flutter_foreground_task (0.0.1): - Flutter - - flutter_native_splash (2.4.3): - - Flutter - - GoogleAppMeasurement (11.6.0): - - GoogleAppMeasurement/AdIdSupport (= 11.6.0) + - GoogleAppMeasurement (11.8.0): + - GoogleAppMeasurement/AdIdSupport (= 11.8.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.6.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0) + - GoogleAppMeasurement/AdIdSupport (11.8.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.6.0): + - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) @@ -227,7 +225,6 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_file_dialog (from `.symlinks/plugins/flutter_file_dialog/ios`) - flutter_foreground_task (from `.symlinks/plugins/flutter_foreground_task/ios`) - - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - haptic_feedback (from `.symlinks/plugins/haptic_feedback/ios`) - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`) - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) @@ -283,8 +280,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_file_dialog/ios" flutter_foreground_task: :path: ".symlinks/plugins/flutter_foreground_task/ios" - flutter_native_splash: - :path: ".symlinks/plugins/flutter_native_splash/ios" haptic_feedback: :path: ".symlinks/plugins/haptic_feedback/ios" isar_flutter_libs: @@ -303,29 +298,28 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/wakelock_plus/ios" SPEC CHECKSUMS: - Firebase: 374a441a91ead896215703a674d58cdb3e9d772b - firebase_analytics: a5c6ef5a435d22870fe3cfdcb424f390f56ff752 - firebase_core: 2337982fb78ee4d8d91e608b0a3d4f44346a93c8 - firebase_crashlytics: 3b6a9a9cbdc5ab92afaf9b206e52c79c2321a0d4 - firebase_performance: 15203ddb4a8ae30a08e1513f4ece0104f1b27e51 - firebase_remote_config: 1250c62dcb0bb5a1333ea71d15eaff9183461308 - FirebaseABTesting: 663ece168d2d65a31f71603d71937e326020a887 - FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7 - FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa - FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361 - FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 - FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300 - FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c - FirebasePerformance: eede3a4db492e4cc0e094cdc71a83896e948fea3 - FirebaseRemoteConfig: ee5161282c4e857ad81c0197cd8baec9d5dfef0e - FirebaseRemoteConfigInterop: ca12abf9da0003efd3a476b2dff4f7a04fd31b4f - FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b - FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 + Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf + firebase_analytics: d9a47ad8168f1da7bab57cd1400833d2bc48a043 + firebase_core: 6cbed78b4f298ed103a9fd034e6dbc846320480f + firebase_crashlytics: eb5eb0ef5e6910395adfe177b9ca4a62e8a2f1aa + firebase_performance: 340bc5b09f0a38a886b6f53b2406941f3c3f3f94 + firebase_remote_config: fd021c0d4a6dcf859042b3b74a24cd4d988625c3 + FirebaseABTesting: 7d6eee42b9137541eac2610e5fea3568d956707a + FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b + FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d + FirebaseCoreExtension: 3d3f2017a00d06e09ab4ebe065391b0bb642565e + FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 + FirebaseCrashlytics: a1102c035f18d5dd94a5969ee439c526d0c9e313 + FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 + FirebasePerformance: 4db21c8ac5a967d38ca8625ce77f58a7abb59bc0 + FirebaseRemoteConfig: f63724461fd97f0d62f20021314b59388f3e8ef8 + FirebaseRemoteConfigInterop: 98897a64aa372eac3c5b3fe2816594ccfaac55ef + FirebaseSessions: c4d40a97f88f9eaff2834d61b4fea0a522d62123 + FirebaseSharedSwift: 672954eac7b141d6954fab9a32d45d6b1d922df8 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_file_dialog: ca8d7fbd1772d4f0c2777b4ab20a7787ef4e7dd8 flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89 - flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145 - GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3 + GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318 GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e3ca5df..15cada48 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -59,6 +59,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/pubspec.lock b/pubspec.lock index 1bde055e..9acee773 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "401dd18096f5eaa140404ccbbbf346f83c850e6f27049698a7ee75a3488ddb32" + sha256: "7fd72d77a7487c26faab1d274af23fb008763ddc10800261abbfb2c067f183d5" url: "https://pub.dev" source: hosted - version: "1.3.52" + version: "1.3.53" _macros: dependency: transitive description: dart @@ -138,10 +138,10 @@ packages: dependency: transitive description: name: built_value - sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" + sha256: "8b158ab94ec6913e480dc3f752418348b5ae099eb75868b5f4775f0572999c61" url: "https://pub.dev" source: hosted - version: "8.9.3" + version: "8.9.4" characters: dependency: transitive description: @@ -266,10 +266,10 @@ packages: dependency: transitive description: name: dio_web_adapter - sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a + sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" equatable: dependency: transitive description: @@ -314,34 +314,34 @@ packages: dependency: "direct main" description: name: firebase_analytics - sha256: "6abce50b79729d8a13c3d4ae05ac612d5ef2f57394330bc5e581ca0e762325f4" + sha256: "81a582e9348216fcf6b30878487369325bf78b8ddd752ed176949c8e4fd4aaac" url: "https://pub.dev" source: hosted - version: "11.4.3" + version: "11.4.4" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: cd9ae65870bf23ab7e63a04fe9c1b38522fd3556a8c32288afd3f5cb10d4b8f4 + sha256: "5ae7bd4a551b67009cd0676f5407331b202eaf16e0a80dcf7b40cd0a34a18746" url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.3.4" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: "5654ed7e39d7a8099e60748924327159785512d78d913e965f9ca93c533af910" + sha256: "15fd7459fea2a00958dbf9b86cd8ad14d3ce2db13950308af7c7717e89ccc5c2" url: "https://pub.dev" source: hosted - version: "0.5.10+9" + version: "0.5.10+10" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "6a4ea0f1d533443c8afc3d809cd36a4e2b8f2e2e711f697974f55bb31d71d1b8" + sha256: f4d8f49574a4e396f34567f3eec4d38ab9c3910818dec22ca42b2a467c685d8b url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "3.12.1" firebase_core_platform_interface: dependency: transitive description: @@ -354,74 +354,74 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: e47f5c2776de018fa19bc9f6f723df136bc75cdb164d64b65305babd715c8e41 + sha256: faa5a76f6380a9b90b53bc3bdcb85bc7926a382e0709b9b5edac9f7746651493 url: "https://pub.dev" source: hosted - version: "2.21.0" + version: "2.21.1" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: "3d4dd8406ee3be734a027503af7dd8d89ad5bddbaf83f4189946ce5ecc0f6aa6" + sha256: d672dad83e6e99b826599fef63dbe71bac70633d5c3df90c124e986e1461e79b url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.3.4" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "3a2b20b4b486fc897e3d89ba785ce2df6e819b4486df660ef0cce499b3d760ca" + sha256: b2468a5cd54051dd31ca332a5c35f1bcbfb21b0135f84d4606c3275a226c0321 url: "https://pub.dev" source: hosted - version: "3.8.3" + version: "3.8.4" firebase_performance: dependency: "direct main" description: name: firebase_performance - sha256: "850aeed08f4798581ba438fc8dbb9c36825d04253c46edcf816315ee8b743597" + sha256: "2d70028b8377dc7f3486ac5b1e3078b4c18846d5f34833fb749e9688d0088630" url: "https://pub.dev" source: hosted - version: "0.10.1+3" + version: "0.10.1+4" firebase_performance_platform_interface: dependency: transitive description: name: firebase_performance_platform_interface - sha256: "04df3299e881f2c326ef74db348c84b3e1a949dc7f15a0ba6b452d63d58e5ec4" + sha256: "418669719144eaec175ad87b9f09ce80240ab54b949af770663813b6b7c15e39" url: "https://pub.dev" source: hosted - version: "0.1.5+3" + version: "0.1.5+4" firebase_performance_web: dependency: transitive description: name: firebase_performance_web - sha256: fdb858c438571022ee4085b4992bd6400dd6a3f826ffcf0330cb2685b31745c8 + sha256: e16ce790aecdd1d30236e15ac5ed112485d11090f08f1238e435fbea1117e56e url: "https://pub.dev" source: hosted - version: "0.1.7+9" + version: "0.1.7+10" firebase_remote_config: dependency: "direct main" description: name: firebase_remote_config - sha256: "6e9846bba1d5bf8b5bea8012c9ab7245371ac956864f422da1ec4c8d95c37554" + sha256: "908fe47d1aea2dbb6c6f3ef93ae884b34bafddf696495949f75c981a47f6704e" url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "5.4.2" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - sha256: "1272a268434097d5645bb1537f3073c82b58910b4a588bbe88e5eab6005ef144" + sha256: "0914e2680235cca3e0c88ad98ff387d38c5455ec8d24ad70649a15e6a872295b" url: "https://pub.dev" source: hosted - version: "1.5.1" + version: "1.5.2" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - sha256: "122c7e1304787072969b8df84a77684f7c9448e95a6d114868280b6fc18c46fa" + sha256: "7fd610cf20077fb1b3383573968e3477864272f540788b6da24e4fab395f68bb" url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.2" fixnum: dependency: transitive description: @@ -488,14 +488,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - flutter_native_splash: - dependency: "direct main" - description: - name: flutter_native_splash - sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7" - url: "https://pub.dev" - source: hosted - version: "2.4.4" flutter_test: dependency: "direct dev" description: flutter @@ -618,14 +610,6 @@ packages: url: "https://pub.dev" source: hosted version: "10.0.0" - icons_launcher: - dependency: "direct main" - description: - name: icons_launcher - sha256: a7c83fbc837dc6f81944ef35c3756f533bb2aba32fcca5cbcdb2dbcd877d5ae9 - url: "https://pub.dev" - source: hosted - version: "3.0.0" iconsax_flutter: dependency: transitive description: @@ -634,14 +618,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - image: - dependency: transitive - description: - name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d - url: "https://pub.dev" - source: hosted - version: "4.3.0" intl: dependency: "direct main" description: @@ -830,18 +806,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35" + sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" url: "https://pub.dev" source: hosted - version: "8.2.1" + version: "8.3.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76" + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" path: dependency: "direct dev" description: @@ -1167,14 +1143,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" - universal_io: - dependency: transitive - description: - name: universal_io - sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" - url: "https://pub.dev" - source: hosted - version: "2.2.2" url_launcher: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 0550fe7f..dcbc0a98 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.1.14+1 environment: - sdk: ^3.6.0 + sdk: ^3.7.0 dependencies: collection: ^1.18.0 @@ -27,12 +27,10 @@ dependencies: sdk: flutter flutter_localized_locales: ^2.0.5 flutter_material_color_picker: ^1.2.0 - flutter_native_splash: ^2.4.1 go_router: ^14.0.1 haptic_feedback: ^0.5.1 html: ^0.15.5 hydrated_bloc: ^10.0.0 - icons_launcher: ^3.0.0 intl: any isar: ^4.0.0-dev.14 isar_flutter_libs: ^4.0.0-dev.14 From 71a405bb00f4ac249f202e1786d1af06079d6f8f Mon Sep 17 00:00:00 2001 From: Frederik St-Onge Date: Wed, 26 Feb 2025 12:48:07 -0500 Subject: [PATCH 3/5] Fix golden screenshots --- .vscode/settings.json | 6 ------ analysis_options.yaml | 3 +++ android/app/build.gradle.kts | 22 +++++++++++++--------- pubspec.yaml | 2 ++ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 365ad8b2..f219e406 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,5 @@ { - "dart.flutterGenerateLocalizationsOnSave": "manualIfDirty", - "dart.lineLength": 150, "[dart]": { - "editor.rulers": [ - 150 - ], - "editor.defaultFormatter": "Dart-Code.dart-code", "editor.formatOnSave": true, }, "files.exclude": { diff --git a/analysis_options.yaml b/analysis_options.yaml index be949902..41c7fb57 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -44,6 +44,9 @@ linter: avoid_void_async: true directives_ordering: true +formatter: + page_width: 120 + # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 6879bb15..e395b743 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,5 +1,6 @@ -import java.util.Properties +import java.io.File import java.io.FileInputStream +import java.util.* plugins { id("com.android.application") @@ -13,9 +14,12 @@ plugins { id("dev.flutter.flutter-gradle-plugin") } -val keystorePropertiesFile = rootProject.file("key.properties") -val keystoreProperties = Properties() -keystoreProperties.load(FileInputStream(keystorePropertiesFile)) +val keyPropertiesFile = File("key.properties") +require(keyPropertiesFile.exists()) { "key.properties file not found." } + +val keyProperties = Properties().apply { + load(FileInputStream(keyPropertiesFile)) +} android { namespace = "com.stongef.monpacing" @@ -41,15 +45,15 @@ android { signingConfigs { create("release") { - keyAlias = keystoreProperties["keyAlias"] as String - keyPassword = keystoreProperties["keyPassword"] as String - storeFile = file(keystoreProperties["storeFile"] as String) - storePassword = keystoreProperties["storePassword"] as String + keyAlias = keyProperties.getProperty("keyAlias") + keyPassword = keyProperties.getProperty("keyPassword") + storeFile = file(keyProperties.getProperty("storeFile")) + storePassword = keyProperties.getProperty("storePassword") } } buildTypes { - release { + getByName("release") { signingConfig = signingConfigs.getByName("release") } } diff --git a/pubspec.yaml b/pubspec.yaml index dcbc0a98..2dc82bfa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,10 +46,12 @@ dev_dependencies: build_runner: ^2.4.13 dart_mappable_builder: ^4.3.0 flutter_lints: ^5.0.0 + flutter_native_splash: ^2.4.5 flutter_test: sdk: flutter golden_screenshot: ^3.1.3 http_mock_adapter: ^0.6.1 + icons_launcher: ^3.0.0 mockito: ^5.4.5 path: ^1.9.0 From 48296349232c14bb95268a95b0acdb9cdf7912c1 Mon Sep 17 00:00:00 2001 From: Frederik St-Onge Date: Sat, 1 Mar 2025 09:32:15 -0500 Subject: [PATCH 4/5] Update conditional signing --- android/app/build.gradle.kts | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index e395b743..d2cb2f90 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -15,10 +15,9 @@ plugins { } val keyPropertiesFile = File("key.properties") -require(keyPropertiesFile.exists()) { "key.properties file not found." } - -val keyProperties = Properties().apply { - load(FileInputStream(keyPropertiesFile)) +val keyProperties = Properties() +if (keyPropertiesFile.exists()) { + keyProperties.load(FileInputStream(keyPropertiesFile)) } android { @@ -44,17 +43,29 @@ android { } signingConfigs { - create("release") { - keyAlias = keyProperties.getProperty("keyAlias") - keyPassword = keyProperties.getProperty("keyPassword") - storeFile = file(keyProperties.getProperty("storeFile")) - storePassword = keyProperties.getProperty("storePassword") + if (keyPropertiesFile.exists()) { + create("release") { + keyAlias = keyProperties.getProperty("keyAlias") + keyPassword = keyProperties.getProperty("keyPassword") + storeFile = file(keyProperties.getProperty("storeFile")) + storePassword = keyProperties.getProperty("storePassword") + } } } buildTypes { getByName("release") { - signingConfig = signingConfigs.getByName("release") + isMinifyEnabled = true + isShrinkResources = true + if (keyPropertiesFile.exists()) { + signingConfig = signingConfigs.getByName("release") + } else { + signingConfig = signingConfigs.getByName("debug") + } + } + getByName("debug") { + isDebuggable = true + signingConfig = signingConfigs.getByName("debug") } } } From 350236ccc32dbb4f63f7bb7bd607c42348cdd8b2 Mon Sep 17 00:00:00 2001 From: Frederik St-Onge Date: Mon, 3 Mar 2025 08:40:37 -0500 Subject: [PATCH 5/5] Fix --- android/app/build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index d2cb2f90..82b8a51b 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -55,18 +55,12 @@ android { buildTypes { getByName("release") { - isMinifyEnabled = true - isShrinkResources = true if (keyPropertiesFile.exists()) { signingConfig = signingConfigs.getByName("release") } else { signingConfig = signingConfigs.getByName("debug") } } - getByName("debug") { - isDebuggable = true - signingConfig = signingConfigs.getByName("debug") - } } }