From 447ee0aa8ebff6198690d433272c60cc353e1ed6 Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Fri, 20 Dec 2024 19:22:11 +0100 Subject: [PATCH 1/8] Update to Flutter SDK 3.27.1 --- recipients_app/.tool-versions | 3 +- recipients_app/README.md | 2 +- recipients_app/android/settings.gradle | 2 +- recipients_app/ios/Podfile.lock | 35 +- recipients_app/ios/Runner/AppDelegate.swift | 2 +- recipients_app/lib/kri_intl.dart | 4 +- recipients_app/lib/ui/configs/app_theme.dart | 2 +- .../lib/ui/inputs/input_dropdown.dart | 4 +- recipients_app/lib/ui/inputs/input_text.dart | 2 +- recipients_app/pubspec.lock | 355 ++++++++++-------- recipients_app/pubspec.yaml | 4 +- .../test/helpers/flutter_test_config.dart | 2 +- 12 files changed, 221 insertions(+), 196 deletions(-) diff --git a/recipients_app/.tool-versions b/recipients_app/.tool-versions index 8645ab6c6..291ecc788 100644 --- a/recipients_app/.tool-versions +++ b/recipients_app/.tool-versions @@ -1 +1,2 @@ -flutter 3.22.3 +flutter 3.27.1 +ruby 3.2.2 diff --git a/recipients_app/README.md b/recipients_app/README.md index 8a5a0e8d5..41b287499 100644 --- a/recipients_app/README.md +++ b/recipients_app/README.md @@ -9,7 +9,7 @@ Mobile App for Recipients of a Social Income. - Java JDK 17 - Android Studio LadyBug or later - Latest vsCode -- Xcode 16.1 +- Xcode 16.x ## Configure the Apple Silicon Mac environment to build our app diff --git a/recipients_app/android/settings.gradle b/recipients_app/android/settings.gradle index 150887767..4bdc19f7a 100644 --- a/recipients_app/android/settings.gradle +++ b/recipients_app/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false // TODO(Verena): update to 4.4.0 once https://github.com/firebase/flutterfire/discussions/8691 is fixed id "com.google.gms.google-services" version "4.3.15" apply false } diff --git a/recipients_app/ios/Podfile.lock b/recipients_app/ios/Podfile.lock index ba6dd0339..9733885d9 100644 --- a/recipients_app/ios/Podfile.lock +++ b/recipients_app/ios/Podfile.lock @@ -94,7 +94,7 @@ PODS: - nanopb (< 2.30911.0, >= 2.30908.0) - FirebaseSharedSwift (10.25.0) - Flutter (1.0.0) - - flutter_native_splash (0.0.1): + - flutter_native_splash (2.4.3): - Flutter - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) @@ -136,15 +136,16 @@ PODS: - Flutter - PromisesObjC (2.4.0) - RecaptchaInterop (100.0.0) - - Sentry/HybridSDK (8.40.1) - - sentry_flutter (8.10.1): + - Sentry/HybridSDK (8.41.0) + - sentry_flutter (8.11.2): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.40.1) + - Sentry/HybridSDK (= 8.41.0) - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`) @@ -158,7 +159,7 @@ DEPENDENCIES: - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: @@ -213,7 +214,7 @@ EXTERNAL SOURCES: url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" CHECKOUT OPTIONS: FirebaseFirestore: @@ -222,12 +223,12 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AppCheckCore: 9feb4300caa596a36416cde10674dc5bec1e022e - cloud_firestore: 003d53b6b8b392600b7769acf9421cc4f23e5911 + cloud_firestore: 28753092b326c43b17251b50aa6c5b3247c939e5 Firebase: 0312a2352584f782ea56f66d91606891d4607f06 - firebase_app_check: 717089a2df93747620263dd6c8e444bde5699b7e - firebase_auth: 5719ddc9f654b813405899480e84971bd8e61235 - firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197 - firebase_messaging: 06391e8f35dc65a00c56580266285263d2861f10 + firebase_app_check: d2513b120608284733805c98e80b5b11c1bf705e + firebase_auth: f17bd6bfc0bc3d83c6df9dc3829e5b6fee10b147 + firebase_core: 3b49a055ff54114cae400581c13671fe53936c36 + firebase_messaging: 30fa3ec8cd0dc8a860b7817548911b97345a0875 FirebaseAppCheck: 148fa858b8070710c8f83d3f545b5f1e85d104a4 FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07 FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb @@ -245,19 +246,19 @@ SPEC CHECKSUMS: FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952 FirebaseSharedSwift: 0274086954b1b2d5fd7e829eccc587044d72a4ba Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 + flutter_native_splash: 576fbd69b830a63594ae678396fa17e43abbc5f8 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19 nanopb: 438bc412db1928dac798aa6fd75726007be04262 - package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - Sentry: e9215d7b17f7902692b4f8700e061e4f853e3521 - sentry_flutter: 927eed60d66951d1b0f1db37fe94ff5cb7c80231 - url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 - webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 + Sentry: 54d0fe6c0df448497c8ed4cce66ccf7027e1823e + sentry_flutter: da701e19e8addb2d9e6bcc3200152175389290fe + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c PODFILE CHECKSUM: f727177ee8bd2fa0ad40e98c3b4299dfade495ac diff --git a/recipients_app/ios/Runner/AppDelegate.swift b/recipients_app/ios/Runner/AppDelegate.swift index 70693e4a8..b63630348 100644 --- a/recipients_app/ios/Runner/AppDelegate.swift +++ b/recipients_app/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/recipients_app/lib/kri_intl.dart b/recipients_app/lib/kri_intl.dart index 6f8322fbd..0c3fc7e08 100644 --- a/recipients_app/lib/kri_intl.dart +++ b/recipients_app/lib/kri_intl.dart @@ -391,6 +391,7 @@ class _KriCupertinoLocalizationsDelegate extends LocalizationsDelegate delegate = _KriCupertinoLocalizationsDelegate(); diff --git a/recipients_app/lib/ui/configs/app_theme.dart b/recipients_app/lib/ui/configs/app_theme.dart index d4c3c7367..998bd1379 100644 --- a/recipients_app/lib/ui/configs/app_theme.dart +++ b/recipients_app/lib/ui/configs/app_theme.dart @@ -54,7 +54,7 @@ abstract class AppTheme { elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( foregroundColor: Colors.white, - disabledBackgroundColor: AppColors.primaryColor.withOpacity(0.5), + disabledBackgroundColor: AppColors.primaryColor.withValues(alpha: 0.5), backgroundColor: AppColors.primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(AppSizes.radiusLarge), diff --git a/recipients_app/lib/ui/inputs/input_dropdown.dart b/recipients_app/lib/ui/inputs/input_dropdown.dart index a077c2ce7..33ae1e5d4 100644 --- a/recipients_app/lib/ui/inputs/input_dropdown.dart +++ b/recipients_app/lib/ui/inputs/input_dropdown.dart @@ -45,7 +45,7 @@ class _InputDropdownState extends State> { contentPadding: AppSpacings.h12v16, label: Text(widget.label), labelStyle: AppStyles.inputHint.copyWith( - color: AppColors.darkGrey.withOpacity(0.6), + color: AppColors.darkGrey.withValues(alpha: 0.6), fontWeight: FontWeight.bold, ), border: OutlineInputBorder( @@ -73,7 +73,7 @@ class _InputDropdownState extends State> { child: Text( widget.label, style: AppStyles.inputHint.copyWith( - color: AppColors.darkGrey.withOpacity(0.6), + color: AppColors.darkGrey.withValues(alpha: 0.6), fontWeight: FontWeight.bold, fontSize: 12, ), diff --git a/recipients_app/lib/ui/inputs/input_text.dart b/recipients_app/lib/ui/inputs/input_text.dart index 02a977284..7e37da96e 100644 --- a/recipients_app/lib/ui/inputs/input_text.dart +++ b/recipients_app/lib/ui/inputs/input_text.dart @@ -62,7 +62,7 @@ class InputText extends StatelessWidget { child: Text( hintText!, style: AppStyles.inputHint.copyWith( - color: AppColors.darkGrey.withOpacity(0.6), + color: AppColors.darkGrey.withValues(alpha: 0.6), fontWeight: FontWeight.bold, fontSize: 12, ), diff --git a/recipients_app/pubspec.lock b/recipients_app/pubspec.lock index 86bc6d8c5..ce82ca91d 100644 --- a/recipients_app/pubspec.lock +++ b/recipients_app/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "76.0.0" _flutterfire_internals: dependency: transitive description: @@ -17,6 +17,11 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.35" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.3" alchemist: dependency: "direct dev" description: @@ -29,10 +34,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.11.0" animations: dependency: "direct main" description: @@ -53,26 +58,26 @@ packages: dependency: transitive description: name: ansicolor - sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" + sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" archive: dependency: transitive description: name: archive - sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.4.10" + version: "4.0.2" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: @@ -109,50 +114,50 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" build_daemon: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.3" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.14" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "8.0.0" built_collection: dependency: transitive description: @@ -165,10 +170,10 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" characters: dependency: transitive description: @@ -221,58 +226,58 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 url: "https://pub.dev" source: hosted - version: "1.7.2" + version: "1.11.1" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.2" dart_style: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "64b717484993e85315d0c04081b6fca9ef8bac8c2cb794b2e15810250b335913" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "3.0.0" diff_match_patch: dependency: transitive description: @@ -309,18 +314,18 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" firebase_app_check: dependency: "direct main" description: @@ -381,18 +386,18 @@ packages: dependency: transitive description: name: firebase_core_platform_interface - sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 + sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.4.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "22fcb352744908224fc7be3caae254836099786acfe5df6e9fe901e9c2575a41" + sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" url: "https://pub.dev" source: hosted - version: "2.17.1" + version: "2.17.5" firebase_messaging: dependency: "direct main" description: @@ -421,10 +426,10 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -447,10 +452,10 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 + sha256: "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.3" flutter_test: dependency: "direct dev" description: flutter @@ -465,10 +470,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -481,50 +486,50 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" html: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: transitive description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.1" image: dependency: transitive description: name: image - sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.1.7" + version: "4.5.2" intl: dependency: "direct main" description: @@ -546,18 +551,18 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_annotation: dependency: "direct main" description: @@ -570,26 +575,26 @@ packages: dependency: "direct main" description: name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + sha256: "8f52361c07497a7f2c16c13aac159f9be6fb12b1d67719eac98a21d9a205d571" url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.9.2" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -610,10 +615,18 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -626,26 +639,26 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" mocktail: dependency: "direct dev" description: @@ -674,26 +687,26 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce + sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d" url: "https://pub.dev" source: hosted - version: "8.1.1" + version: "8.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" path: dependency: transitive description: @@ -718,14 +731,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" - pointycastle: - dependency: transitive - description: - name: pointycastle - sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744" - url: "https://pub.dev" - source: hosted - version: "3.9.0" pool: dependency: transitive description: @@ -734,6 +739,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" protobuf: dependency: transitive description: @@ -754,18 +767,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0" url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.4.0" rounded_loading_button: dependency: "direct main" description: @@ -787,26 +800,26 @@ packages: dependency: transitive description: name: sentry - sha256: "2440763ae96fa8fd1bcdfc224f5232e1b7a09af76a72f4e626ee313a261faf6f" + sha256: b1ead7ca4da0949aed9482c4962f172021a4417f0a126fa974878c2301c16df7 url: "https://pub.dev" source: hosted - version: "8.10.1" + version: "8.11.2" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "3b30038b3b9303540a8b2c8b1c8f0bb93a207f8e4b25691c59d969ddeb4734fd" + sha256: d978861bc413ef98b663b065a65e780b255bfcdc0e2fa307884f7f6df0f1a406 url: "https://pub.dev" source: hosted - version: "8.10.1" + version: "8.11.2" shelf: dependency: transitive description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_packages_handler: dependency: transitive description: @@ -819,55 +832,55 @@ packages: dependency: transitive description: name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_helper: dependency: transitive description: name: source_helper - sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.5" source_map_stack_trace: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: name: source_maps - sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" url: "https://pub.dev" source: hosted - version: "0.10.12" + version: "0.10.13" source_span: dependency: transitive description: @@ -888,10 +901,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -904,18 +917,18 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -928,42 +941,42 @@ packages: dependency: transitive description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.5" timing: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" typed_data: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" universal_io: dependency: transitive description: @@ -984,34 +997,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.3.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -1024,26 +1037,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" uuid: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.1" vector_math: dependency: transitive description: @@ -1056,18 +1069,18 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.3.0" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: @@ -1076,14 +1089,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "3.0.1" webkit_inspection_protocol: dependency: transitive description: @@ -1096,18 +1117,18 @@ packages: dependency: "direct main" description: name: webview_flutter - sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" + sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.10.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: f038ee2fae73b509dde1bc9d2c5a50ca92054282de17631a9a3d515883740934 + sha256: "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379" url: "https://pub.dev" source: hosted - version: "3.16.0" + version: "4.2.0" webview_flutter_platform_interface: dependency: transitive description: @@ -1120,18 +1141,18 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7 + sha256: b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb url: "https://pub.dev" source: hosted - version: "3.13.0" + version: "3.16.3" win32: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.9.0" xml: dependency: transitive description: @@ -1144,10 +1165,10 @@ packages: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.4.4 <4.0.0" - flutter: ">=3.22.3" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.1" diff --git a/recipients_app/pubspec.yaml b/recipients_app/pubspec.yaml index b80324c0e..60e6513d2 100644 --- a/recipients_app/pubspec.yaml +++ b/recipients_app/pubspec.yaml @@ -5,8 +5,8 @@ publish_to: "none" version: 1.1.14+31 environment: - sdk: ">=3.4.4 <4.0.0" - flutter: 3.22.3 + sdk: ">=3.6.0 <4.0.0" + flutter: 3.27.1 dependencies: animations: ^2.0.11 diff --git a/recipients_app/test/helpers/flutter_test_config.dart b/recipients_app/test/helpers/flutter_test_config.dart index fca49d02a..117497986 100644 --- a/recipients_app/test/helpers/flutter_test_config.dart +++ b/recipients_app/test/helpers/flutter_test_config.dart @@ -4,7 +4,7 @@ import "package:alchemist/alchemist.dart"; import "package:app/ui/configs/app_theme.dart"; Future testExecutable(FutureOr Function() testMain) async { - const isRunningInCi = bool.fromEnvironment("CI"); + //const isRunningInCi = bool.fromEnvironment("CI"); return AlchemistConfig.runWithConfig( config: AlchemistConfig( From 097de329d2edd94d05419ff68c015f48431bec92 Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Fri, 20 Dec 2024 19:41:34 +0100 Subject: [PATCH 2/8] Update Firebase Flutter packages - Update Android minimum version from 21 to 23 - Update iOS minimum version from iOS 12 to iOS 13 --- recipients_app/android/app/build.gradle | 2 +- recipients_app/ios/Podfile | 4 +- recipients_app/ios/Podfile.lock | 262 +++++++++--------- .../ios/Runner.xcodeproj/project.pbxproj | 27 +- recipients_app/ios/Runner/Info.plist | 2 +- recipients_app/pubspec.lock | 64 ++--- recipients_app/pubspec.yaml | 10 +- 7 files changed, 191 insertions(+), 180 deletions(-) diff --git a/recipients_app/android/app/build.gradle b/recipients_app/android/app/build.gradle index 578f15e27..d031407a0 100644 --- a/recipients_app/android/app/build.gradle +++ b/recipients_app/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { applicationId "org.socialincome.app" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/recipients_app/ios/Podfile b/recipients_app/ios/Podfile index 95a28aa4c..c4cf526aa 100644 --- a/recipients_app/ios/Podfile +++ b/recipients_app/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -30,7 +30,7 @@ flutter_ios_podfile_setup target 'Runner' do use_frameworks! use_modular_headers! - pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.25.0' + pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.4.0' flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end diff --git a/recipients_app/ios/Podfile.lock b/recipients_app/ios/Podfile.lock index 9733885d9..8ae9b0083 100644 --- a/recipients_app/ios/Podfile.lock +++ b/recipients_app/ios/Podfile.lock @@ -1,137 +1,137 @@ PODS: - - AppCheckCore (10.19.2): - - GoogleUtilities/Environment (~> 7.13) - - GoogleUtilities/UserDefaults (~> 7.13) - - PromisesObjC (~> 2.3) - - cloud_firestore (4.17.5): - - Firebase/Firestore (= 10.25.0) + - AppCheckCore (11.2.0): + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - cloud_firestore (5.6.0): + - Firebase/Firestore (= 11.4.0) - firebase_core - Flutter - - Firebase/Auth (10.25.0): + - Firebase/Auth (11.4.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.25.0) - - Firebase/CoreOnly (10.25.0): - - FirebaseCore (= 10.25.0) - - Firebase/Firestore (10.25.0): + - FirebaseAuth (~> 11.4.0) + - Firebase/CoreOnly (11.4.0): + - FirebaseCore (= 11.4.0) + - Firebase/Firestore (11.4.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 10.25.0) - - Firebase/Messaging (10.25.0): + - FirebaseFirestore (~> 11.4.0) + - Firebase/Messaging (11.4.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.25.0) - - firebase_app_check (0.2.2-7): - - Firebase/CoreOnly (~> 10.25.0) + - FirebaseMessaging (~> 11.4.0) + - firebase_app_check (0.3.1-7): + - Firebase/CoreOnly (~> 11.4.0) - firebase_core - - FirebaseAppCheck (~> 10.25.0-beta) + - FirebaseAppCheck (~> 11.4.0) - Flutter - - firebase_auth (4.20.0): - - Firebase/Auth (= 10.25.0) + - firebase_auth (5.3.4): + - Firebase/Auth (= 11.4.0) - firebase_core - Flutter - - firebase_core (2.32.0): - - Firebase/CoreOnly (= 10.25.0) + - firebase_core (3.9.0): + - Firebase/CoreOnly (= 11.4.0) - Flutter - - firebase_messaging (14.9.4): - - Firebase/Messaging (= 10.25.0) + - firebase_messaging (15.1.6): + - Firebase/Messaging (= 11.4.0) - firebase_core - Flutter - - FirebaseAppCheck (10.25.0): - - AppCheckCore (~> 10.19) - - FirebaseAppCheckInterop (~> 10.17) - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.13) - - GoogleUtilities/UserDefaults (~> 7.13) - - PromisesObjC (~> 2.1) - - FirebaseAppCheckInterop (10.29.0) - - FirebaseAuth (10.25.0): - - FirebaseAppCheckInterop (~> 10.17) - - FirebaseCore (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseAppCheck (11.4.0): + - AppCheckCore (~> 11.0) + - FirebaseAppCheckInterop (~> 11.0) + - FirebaseCore (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseAppCheckInterop (11.6.0) + - FirebaseAuth (11.4.0): + - FirebaseAppCheckInterop (~> 11.0) + - FirebaseAuthInterop (~> 11.0) + - FirebaseCore (~> 11.4) + - FirebaseCoreExtension (~> 11.4) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GTMSessionFetcher/Core (< 5.0, >= 3.4) - RecaptchaInterop (~> 100.0) - - FirebaseCore (10.25.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.12) - - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreExtension (10.25.0): - - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.29.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseFirestore (10.25.0): - - FirebaseFirestoreBinary (= 10.25.0) - - FirebaseFirestoreAbseilBinary (1.2024011601.0) - - FirebaseFirestoreBinary (10.25.0): - - FirebaseCore (= 10.25.0) - - FirebaseCoreExtension (= 10.25.0) - - FirebaseFirestoreInternalBinary (= 10.25.0) - - FirebaseSharedSwift (= 10.25.0) - - FirebaseFirestoreGRPCBoringSSLBinary (1.62.1) - - FirebaseFirestoreGRPCCoreBinary (1.62.1): - - FirebaseFirestoreAbseilBinary (= 1.2024011601.0) - - FirebaseFirestoreGRPCBoringSSLBinary (= 1.62.1) - - FirebaseFirestoreGRPCCPPBinary (1.62.1): - - FirebaseFirestoreAbseilBinary (= 1.2024011601.0) - - FirebaseFirestoreGRPCCoreBinary (= 1.62.1) - - FirebaseFirestoreInternalBinary (10.25.0): - - FirebaseCore (= 10.25.0) - - FirebaseFirestoreAbseilBinary (= 1.2024011601.0) - - FirebaseFirestoreGRPCCPPBinary (= 1.62.1) + - FirebaseAuthInterop (11.6.0) + - FirebaseCore (11.4.0): + - FirebaseCoreInternal (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreExtension (11.4.0): + - FirebaseCore (~> 11.0) + - FirebaseCoreInternal (11.6.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseFirestore (11.4.0): + - FirebaseFirestoreBinary (= 11.4.0) + - FirebaseFirestoreAbseilBinary (1.2024011602.0) + - FirebaseFirestoreBinary (11.4.0): + - FirebaseCore (= 11.4.0) + - FirebaseCoreExtension (= 11.4.0) + - FirebaseFirestoreInternalBinary (= 11.4.0) + - FirebaseSharedSwift (= 11.4.0) + - FirebaseFirestoreGRPCBoringSSLBinary (1.65.1) + - FirebaseFirestoreGRPCCoreBinary (1.65.1): + - FirebaseFirestoreAbseilBinary (= 1.2024011602.0) + - FirebaseFirestoreGRPCBoringSSLBinary (= 1.65.1) + - FirebaseFirestoreGRPCCPPBinary (1.65.1): + - FirebaseFirestoreAbseilBinary (= 1.2024011602.0) + - FirebaseFirestoreGRPCCoreBinary (= 1.65.1) + - FirebaseFirestoreInternalBinary (11.4.0): + - FirebaseCore (= 11.4.0) + - FirebaseFirestoreAbseilBinary (= 1.2024011602.0) + - FirebaseFirestoreGRPCCPPBinary (= 1.65.1) - leveldb-library (~> 1.22) - - nanopb (< 2.30911.0, >= 2.30908.0) - - FirebaseInstallations (10.29.0): - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.25.0): - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleDataTransport (~> 9.3) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Reachability (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - nanopb (< 2.30911.0, >= 2.30908.0) - - FirebaseSharedSwift (10.25.0) + - nanopb (~> 3.30910.0) + - FirebaseInstallations (11.4.0): + - FirebaseCore (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - FirebaseMessaging (11.4.0): + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Reachability (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - nanopb (~> 3.30910.0) + - FirebaseSharedSwift (11.4.0) - Flutter (1.0.0) - flutter_native_splash (2.4.3): - Flutter - - GoogleDataTransport (9.4.1): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30911.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.13.3): + - GoogleDataTransport (10.1.0): + - nanopb (~> 3.30910.0) + - PromisesObjC (~> 2.4) + - GoogleUtilities/AppDelegateSwizzler (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - GoogleUtilities/Privacy - - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Environment (8.0.2): - GoogleUtilities/Privacy - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.13.3): + - GoogleUtilities/Logger (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Privacy - - GoogleUtilities/Network (7.13.3): + - GoogleUtilities/Network (8.0.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.13.3)": + - "GoogleUtilities/NSData+zlib (8.0.2)": - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (7.13.3) - - GoogleUtilities/Reachability (7.13.3): + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (7.13.3): + - GoogleUtilities/UserDefaults (8.0.2): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Core (4.1.0) - leveldb-library (1.22.6) - - nanopb (2.30910.0): - - nanopb/decode (= 2.30910.0) - - nanopb/encode (= 2.30910.0) - - nanopb/decode (2.30910.0) - - nanopb/encode (2.30910.0) + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) - package_info_plus (0.4.5): - Flutter - PromisesObjC (2.4.0) @@ -153,7 +153,7 @@ DEPENDENCIES: - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.25.0`) + - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `11.4.0`) - Flutter (from `Flutter`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) @@ -168,6 +168,7 @@ SPEC REPOS: - FirebaseAppCheck - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore - FirebaseCoreExtension - FirebaseCoreInternal @@ -202,7 +203,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/firebase_messaging/ios" FirebaseFirestore: :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git - :tag: 10.25.0 + :tag: 11.4.0 Flutter: :path: Flutter flutter_native_splash: @@ -219,39 +220,40 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: FirebaseFirestore: :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git - :tag: 10.25.0 + :tag: 11.4.0 SPEC CHECKSUMS: - AppCheckCore: 9feb4300caa596a36416cde10674dc5bec1e022e - cloud_firestore: 28753092b326c43b17251b50aa6c5b3247c939e5 - Firebase: 0312a2352584f782ea56f66d91606891d4607f06 - firebase_app_check: d2513b120608284733805c98e80b5b11c1bf705e - firebase_auth: f17bd6bfc0bc3d83c6df9dc3829e5b6fee10b147 - firebase_core: 3b49a055ff54114cae400581c13671fe53936c36 - firebase_messaging: 30fa3ec8cd0dc8a860b7817548911b97345a0875 - FirebaseAppCheck: 148fa858b8070710c8f83d3f545b5f1e85d104a4 - FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07 - FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb - FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483 - FirebaseCoreExtension: 8a47811d0b155501559ef05d089518152a0a1677 - FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 - FirebaseFirestore: d30223cc084fb1ea2d7aee742eea5392beaf3edd - FirebaseFirestoreAbseilBinary: bd0451946879e0e01327c8efc35896bb273009c4 - FirebaseFirestoreBinary: bfcacce21af5109ab56bef3d41b4235b98b22861 - FirebaseFirestoreGRPCBoringSSLBinary: c3007e61593e4583ec3bb8b34ce654663663b690 - FirebaseFirestoreGRPCCoreBinary: 1243fc6604a52912694635f891916976924931ed - FirebaseFirestoreGRPCCPPBinary: e447b3a7c060c0abfc4e2c9f6fb53bf7635ded66 - FirebaseFirestoreInternalBinary: 64bdfce9f9f44f131e47694b6287fce0f6f26019 - FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd - FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952 - FirebaseSharedSwift: 0274086954b1b2d5fd7e829eccc587044d72a4ba + AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f + cloud_firestore: 50c9e447367f07951ec36e06dffbce8e38bc2149 + Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99 + firebase_app_check: 106382d86713329d844a412d44eccfc1779ee8d1 + firebase_auth: dee97e7428ef7c304083839d4e3bc4313c03afd5 + firebase_core: 726c34112998e66d1ddaf4b1bef78ed2dd4b9804 + firebase_messaging: a538130cb2bca3ea0ff0892b8c948bd7d20ecaed + FirebaseAppCheck: 933cbda29279ed316b82360bca77602ac1af1ff2 + FirebaseAppCheckInterop: 347aa09a805219a31249b58fc956888e9fcb314b + FirebaseAuth: c359af98bd703cbf4293eec107a40de08ede6ce6 + FirebaseAuthInterop: a919d415797d23b7bfe195a04f322b86c65020ef + FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771 + FirebaseCoreExtension: 4445e4cd877e0790c4af33bedca61eaef27b7513 + FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 + FirebaseFirestore: 97f18b411aaca686a9e94ba742341228643b1a46 + FirebaseFirestoreAbseilBinary: fa2ebd2ed02cadef5382e4f7c93f1b265c812c85 + FirebaseFirestoreBinary: d0380b879b58d663b22467017d0e348d5b17b36b + FirebaseFirestoreGRPCBoringSSLBinary: d86ebbe2adc8d15d7ebf305fff7d6358385327f8 + FirebaseFirestoreGRPCCoreBinary: 472bd808e1886a5efb2fd03dd09b98d34641a335 + FirebaseFirestoreGRPCCPPBinary: db76d83d2b7517623f8426ed7f7a17bad2478084 + FirebaseFirestoreInternalBinary: 01c33a6d789b95dce32dbdfcaf30d60ddf8902d8 + FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 + FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 + FirebaseSharedSwift: 505dae2d05969dbf6d43749a642bb1bf230f0252 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_native_splash: 576fbd69b830a63594ae678396fa17e43abbc5f8 - GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a - GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 - GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + GTMSessionFetcher: 923b710231ad3d6f3f0495ac1ced35421e07d9a6 leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19 - nanopb: 438bc412db1928dac798aa6fd75726007be04262 + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 @@ -260,6 +262,6 @@ SPEC CHECKSUMS: url_launcher_ios: 694010445543906933d732453a59da0a173ae33d webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c -PODFILE CHECKSUM: f727177ee8bd2fa0ad40e98c3b4299dfade495ac +PODFILE CHECKSUM: 9a0f6acd578ce2f2c9bd914d243f7f5d4c09eda4 COCOAPODS: 1.16.2 diff --git a/recipients_app/ios/Runner.xcodeproj/project.pbxproj b/recipients_app/ios/Runner.xcodeproj/project.pbxproj index 89b2c6aae..233acc92b 100644 --- a/recipients_app/ios/Runner.xcodeproj/project.pbxproj +++ b/recipients_app/ios/Runner.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -449,6 +449,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -510,7 +511,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -537,6 +538,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -597,7 +599,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -622,6 +624,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -688,7 +691,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -712,6 +715,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -773,7 +777,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -800,6 +804,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -860,7 +865,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -885,6 +890,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -945,7 +951,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -970,6 +976,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1036,7 +1043,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1086,7 +1093,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -1113,6 +1120,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1148,6 +1156,7 @@ INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Social Income"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/recipients_app/ios/Runner/Info.plist b/recipients_app/ios/Runner/Info.plist index 4a8a7ea20..2e0a775a6 100644 --- a/recipients_app/ios/Runner/Info.plist +++ b/recipients_app/ios/Runner/Info.plist @@ -54,7 +54,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 12.0 + 13.0 UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/recipients_app/pubspec.lock b/recipients_app/pubspec.lock index ce82ca91d..96ca55d96 100644 --- a/recipients_app/pubspec.lock +++ b/recipients_app/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7" + sha256: daa1d780fdecf8af925680c06c86563cdd445deea995d5c9176f1302a2b10bbe url: "https://pub.dev" source: hosted - version: "1.3.35" + version: "1.3.48" _macros: dependency: transitive description: dart @@ -202,26 +202,26 @@ packages: dependency: "direct main" description: name: cloud_firestore - sha256: a0f161b92610e078b4962d7e6ebeb66dc9cce0ada3514aeee442f68165d78185 + sha256: ba89d4ae6ddaea0241f50a2dc1ffe36f32891f1a6bc78540f55d79c7f8ed536a url: "https://pub.dev" source: hosted - version: "4.17.5" + version: "5.6.0" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - sha256: "6a55b319f8d33c307396b9104512e8130a61904528ab7bd8b5402678fca54b81" + sha256: "966cfd6beb2e943f3363a7bced4476533caa55d2338ffd876855c07e5296d1d7" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.6.0" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - sha256: "89dfa1304d3da48b3039abbb2865e3d30896ef858e569a16804a99f4362283a9" + sha256: "110ba7ff3322c239527e5be3c0d471a3e14fd0a870b2feff96d1e527a2eae2bb" url: "https://pub.dev" source: hosted - version: "3.12.5" + version: "4.4.0" code_builder: dependency: transitive description: @@ -330,58 +330,58 @@ packages: dependency: "direct main" description: name: firebase_app_check - sha256: aac3b42cdf804b10cb1085c9902e5d1ef2f30e7cfc0c504e6f47519713d86829 + sha256: a43785ac59b3a7dc274c80369e36568dac0cda1122f42faa6ea76149e4953737 url: "https://pub.dev" source: hosted - version: "0.2.2+7" + version: "0.3.1+7" firebase_app_check_platform_interface: dependency: transitive description: name: firebase_app_check_platform_interface - sha256: d0b9e4676ee7a272160b989a9a899d6469e336fe3624b3935cdae77a476f00d1 + sha256: c350d1a550228d21eafc964648f93224d473e75d7152af651be72a95e5a9fd27 url: "https://pub.dev" source: hosted - version: "0.1.0+29" + version: "0.1.0+41" firebase_app_check_web: dependency: transitive description: name: firebase_app_check_web - sha256: f5359ba62111e4b28e5f1477b7c5c560dcfabe1ccc9e02e65ebdb428eda204ad + sha256: "0ee99f137b91ececce78230a4ce357a6fb694d7e8f3037ac22b96c9025c6c9a5" url: "https://pub.dev" source: hosted - version: "0.1.2+7" + version: "0.2.0+3" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: cfc2d970829202eca09e2896f0a5aa7c87302817ecc0bdfa954f026046bf10ba + sha256: "03483af6e67b7c4b696ca9386989a6cd5593569e1ac5af6907ea5f7fd9c16d8b" url: "https://pub.dev" source: hosted - version: "4.20.0" + version: "5.3.4" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: a0270e1db3b2098a14cb2a2342b3cd2e7e458e0c391b1f64f6f78b14296ec093 + sha256: "3e1409f48c48930635705b1237ebbdee8c54c19106a0a4fb321dbb4b642820c4" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.4.10" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: "64e067e763c6378b7e774e872f0f59f6812885e43020e25cde08f42e9459837b" + sha256: d83fe95c44d73c9c29b006ac7df3aa5e1b8ce92b62edc44e8f86250951fe2cd0 url: "https://pub.dev" source: hosted - version: "5.12.0" + version: "5.13.5" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c" + sha256: "15d761b95dfa2906dfcc31b7fc6fe293188533d1a3ffe78389ba9e69bd7fdbde" url: "https://pub.dev" source: hosted - version: "2.32.0" + version: "3.9.0" firebase_core_platform_interface: dependency: transitive description: @@ -394,34 +394,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" + sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b url: "https://pub.dev" source: hosted - version: "2.17.5" + version: "2.19.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: a1662cc95d9750a324ad9df349b873360af6f11414902021f130c68ec02267c4 + sha256: "151a3ee68736abf293aab66d1317ade53c88abe1db09c75a0460aebf7767bbdf" url: "https://pub.dev" source: hosted - version: "14.9.4" + version: "15.1.6" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "87c4a922cb6f811cfb7a889bdbb3622702443c52a0271636cbc90d813ceac147" + sha256: f331ee51e40c243f90cc7bc059222dfec4e5df53125b08d31fb28961b00d2a9d url: "https://pub.dev" source: hosted - version: "4.5.37" + version: "4.5.49" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "0d34dca01a7b103ed7f20138bffbb28eb0e61a677bf9e78a028a932e2c7322d5" + sha256: efaf3fdc54cd77e0eedb8e75f7f01c808828c64d052ddbf94d3009974e47d30f url: "https://pub.dev" source: hosted - version: "3.8.7" + version: "3.9.5" fixnum: dependency: transitive description: @@ -1085,10 +1085,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket: dependency: transitive description: diff --git a/recipients_app/pubspec.yaml b/recipients_app/pubspec.yaml index 60e6513d2..59c4db9a8 100644 --- a/recipients_app/pubspec.yaml +++ b/recipients_app/pubspec.yaml @@ -11,13 +11,13 @@ environment: dependencies: animations: ^2.0.11 another_flushbar: ^1.12.30 - cloud_firestore: ^4.17.5 + cloud_firestore: ^5.6.0 collection: ^1.18.0 equatable: ^2.0.7 - firebase_app_check: ^0.2.2+7 - firebase_auth: ^4.20.0 - firebase_core: ^2.32.0 - firebase_messaging: ^14.9.4 + firebase_app_check: ^0.3.1+7 + firebase_auth: ^5.3.4 + firebase_core: ^3.9.0 + firebase_messaging: ^15.1.6 flutter: sdk: flutter flutter_bloc: ^8.1.6 From 45ac66706c1f593bf503b1ff5503ee827e20e810 Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Fri, 20 Dec 2024 20:04:18 +0100 Subject: [PATCH 3/8] Update remaining flutter packages to latest possible version --- recipients_app/pubspec.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipients_app/pubspec.yaml b/recipients_app/pubspec.yaml index 59c4db9a8..4e1167b66 100644 --- a/recipients_app/pubspec.yaml +++ b/recipients_app/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: animations: ^2.0.11 another_flushbar: ^1.12.30 cloud_firestore: ^5.6.0 - collection: ^1.18.0 + collection: ^1.19.0 equatable: ^2.0.7 firebase_app_check: ^0.3.1+7 firebase_auth: ^5.3.4 @@ -23,7 +23,7 @@ dependencies: flutter_bloc: ^8.1.6 flutter_localizations: sdk: flutter - flutter_native_splash: ^2.4.0 + flutter_native_splash: ^2.4.3 intl: ^0.19.0 # v0.8.0 is not publish on pub.dev but it is released on Github. This version fixes the build error on iOS with the message "Cannot find type 'PhoneNumberKit' in scope". intl_phone_number_input: @@ -31,21 +31,21 @@ dependencies: url: https://github.com/natintosh/intl_phone_number_input.git ref: v0.8.0 json_annotation: ^4.9.0 - json_serializable: ^6.8.0 - package_info_plus: ^8.1.1 + json_serializable: ^6.9.2 + package_info_plus: ^8.1.2 # https://github.com/chrisedg87/flutter_rounded_loading_button/pull/74 rounded_loading_button: git: url: https://github.com/ShamilPP/flutter_rounded_loading_button.git ref: master - sentry_flutter: ^8.10.1 + sentry_flutter: ^8.11.2 url_launcher: ^6.3.1 - webview_flutter: ^4.8.0 + webview_flutter: ^4.10.0 dev_dependencies: alchemist: ^0.7.0 bloc_test: ^9.1.7 - build_runner: ^2.4.11 + build_runner: ^2.4.14 flutter_test: sdk: flutter From 6fa916561dc3d5be807cd145047cc74dc92a4feb Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Fri, 20 Dec 2024 20:37:51 +0100 Subject: [PATCH 4/8] Upgrade Android Gradle to be compatible to Android Studio LadyBug with Java JDK 21 instead of JDK17 --- recipients_app/README.md | 35 ++++++++++--------- recipients_app/android/.gitignore | 4 ++- recipients_app/android/app/build.gradle | 15 +++++--- .../android/app/src/debug/AndroidManifest.xml | 6 ++-- .../android/app/src/dev/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../recipients_app/MainActivity.kt | 6 ---- .../app/src/profile/AndroidManifest.xml | 6 ++-- .../android/app/src/stage/AndroidManifest.xml | 3 +- recipients_app/android/build.gradle | 4 +-- recipients_app/android/gradle.properties | 5 ++- .../gradle/wrapper/gradle-wrapper.properties | 4 ++- recipients_app/android/settings.gradle | 2 +- 13 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 recipients_app/android/app/src/main/kotlin/org/socialincome/recipients_app/MainActivity.kt diff --git a/recipients_app/README.md b/recipients_app/README.md index 41b287499..0b6996a42 100644 --- a/recipients_app/README.md +++ b/recipients_app/README.md @@ -26,23 +26,24 @@ Mobile App for Recipients of a Social Income. export PATH="$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools" ``` - Restart your terminal so that these changes take effect -- Install Java 17 via Homebrew `brew install openjdk@17` - - Homebrew is telling you to execute a symlink command, so that the - system Java wrappers can find this JDK. Please do this. - - Additionally in your USER's HOME directory in the file '.zshrc', add - the lines to set the JAVA_HOME environment variable to Java 17 and - add Java to the PATH environment variable - ```shell - export JAVA_HOME=$(/usr/libexec/java_home -v17) - export PATH="$PATH:$JAVA_HOME/bin" - ``` - - Restart your terminal so that these changes take effect -- Install Flutter - - Tell Flutter to use our Java 17 JDK and not the one bundle with - Android Studio via `flutter config --jdk-dir "$JAVA_HOME"`. - Otherwise, you will get the error "Unsupported class file major - version 65” when building the app for Android. - - Restart your terminal and IDE so that these changes take effect +- Optional: Pin Flutter's JDK version and do not use the JDK from Android Studio by default + - Install Java 21 via Homebrew `brew install openjdk@21` + - Homebrew is telling you to execute a symlink command, so that the + system Java wrappers can find this JDK. Please do this. + - Additionally in your USER's HOME directory in the file '.zshrc', add + the lines to set the JAVA_HOME environment variable to Java 21 and + add Java to the PATH environment variable + ```shell + export JAVA_HOME=$(/usr/libexec/java_home -v21) + export PATH="$PATH:$JAVA_HOME/bin" + ``` + - Restart your terminal so that these changes take effect + - Install Flutter + - Tell Flutter to use our Java 21 JDK and not the one bundle with + Android Studio via `flutter config --jdk-dir "$JAVA_HOME"`. + Otherwise, you will get the error "Unsupported class file major + version XX" when building the app for Android. + - Restart your terminal and IDE so that these changes take effect - Install vsCode - Install Flutter extension - Install Xcode diff --git a/recipients_app/android/.gitignore b/recipients_app/android/.gitignore index 0a741cb43..ae10d8a80 100644 --- a/recipients_app/android/.gitignore +++ b/recipients_app/android/.gitignore @@ -7,5 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties +**/*.keystore +**/*.jks \ No newline at end of file diff --git a/recipients_app/android/app/build.gradle b/recipients_app/android/app/build.gradle index d031407a0..7c6cb071b 100644 --- a/recipients_app/android/app/build.gradle +++ b/recipients_app/android/app/build.gradle @@ -1,6 +1,7 @@ plugins { id "com.android.application" id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" id "com.google.gms.google-services" } @@ -30,8 +31,18 @@ if (keystorePropertiesFile.exists()) { } android { + namespace 'org.socialincome.app' compileSdkVersion 34 + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -84,7 +95,3 @@ flutter { source '../..' } -dependencies { -} - - diff --git a/recipients_app/android/app/src/debug/AndroidManifest.xml b/recipients_app/android/app/src/debug/AndroidManifest.xml index 8417fdc72..86e1f786a 100644 --- a/recipients_app/android/app/src/debug/AndroidManifest.xml +++ b/recipients_app/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/recipients_app/android/app/src/dev/AndroidManifest.xml b/recipients_app/android/app/src/dev/AndroidManifest.xml index 514d62e09..4e6add589 100644 --- a/recipients_app/android/app/src/dev/AndroidManifest.xml +++ b/recipients_app/android/app/src/dev/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> + diff --git a/recipients_app/android/app/src/main/kotlin/org/socialincome/recipients_app/MainActivity.kt b/recipients_app/android/app/src/main/kotlin/org/socialincome/recipients_app/MainActivity.kt deleted file mode 100644 index 3a444015e..000000000 --- a/recipients_app/android/app/src/main/kotlin/org/socialincome/recipients_app/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.socialincome.recipients_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/recipients_app/android/app/src/profile/AndroidManifest.xml b/recipients_app/android/app/src/profile/AndroidManifest.xml index 8417fdc72..399f6981d 100644 --- a/recipients_app/android/app/src/profile/AndroidManifest.xml +++ b/recipients_app/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/recipients_app/android/app/src/stage/AndroidManifest.xml b/recipients_app/android/app/src/stage/AndroidManifest.xml index c2e86a2fc..7da9829c6 100644 --- a/recipients_app/android/app/src/stage/AndroidManifest.xml +++ b/recipients_app/android/app/src/stage/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/recipients_app/android/build.gradle b/recipients_app/android/build.gradle index 50d92aaff..67ac2b730 100644 --- a/recipients_app/android/build.gradle +++ b/recipients_app/android/build.gradle @@ -5,13 +5,13 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/recipients_app/android/gradle.properties b/recipients_app/android/gradle.properties index 94adc3a3f..db24e8b27 100644 --- a/recipients_app/android/gradle.properties +++ b/recipients_app/android/gradle.properties @@ -1,3 +1,6 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/recipients_app/android/gradle/wrapper/gradle-wrapper.properties b/recipients_app/android/gradle/wrapper/gradle-wrapper.properties index 41dfb8790..09523c0e5 100644 --- a/recipients_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/recipients_app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/recipients_app/android/settings.gradle b/recipients_app/android/settings.gradle index 4bdc19f7a..28b581102 100644 --- a/recipients_app/android/settings.gradle +++ b/recipients_app/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version '8.7.3' apply false id "org.jetbrains.kotlin.android" version "1.8.22" apply false // TODO(Verena): update to 4.4.0 once https://github.com/firebase/flutterfire/discussions/8691 is fixed id "com.google.gms.google-services" version "4.3.15" apply false From 3f75983df15e8de1e62acdb7e3d5765c47fbd41f Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Fri, 20 Dec 2024 20:45:29 +0100 Subject: [PATCH 5/8] Flutter analyse fix: Don't use 'BuildContext's across async gaps. Try rewriting the code to not use the 'BuildContext', or guard the use with a 'mounted' check. --- recipients_app/lib/view/pages/account_page.dart | 17 ++++++++++------- .../view/pages/terms_and_conditions_page.dart | 13 ++++++++----- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/recipients_app/lib/view/pages/account_page.dart b/recipients_app/lib/view/pages/account_page.dart index a4c65b96e..ed4fc3f2f 100644 --- a/recipients_app/lib/view/pages/account_page.dart +++ b/recipients_app/lib/view/pages/account_page.dart @@ -236,14 +236,17 @@ class AccountPageState extends State { context: context, ).then((value) { if (value != null) { - final timestamp = Timestamp.fromDate(value); + // Don't use 'BuildContext's across async gaps. Try rewriting the code to not use the 'BuildContext', or guard the use with a 'mounted' check. + if (context.mounted) { + final timestamp = Timestamp.fromDate(value); - context.read().updateRecipient( - recipient.copyWith( - birthDate: timestamp, - ), - ); - _birthDateController.text = getFormattedDate(timestamp, locale) ?? ""; + context.read().updateRecipient( + recipient.copyWith( + birthDate: timestamp, + ), + ); + _birthDateController.text = getFormattedDate(timestamp, locale) ?? ""; + } } return; }), diff --git a/recipients_app/lib/view/pages/terms_and_conditions_page.dart b/recipients_app/lib/view/pages/terms_and_conditions_page.dart index d901c4a4e..6e669c2c0 100644 --- a/recipients_app/lib/view/pages/terms_and_conditions_page.dart +++ b/recipients_app/lib/view/pages/terms_and_conditions_page.dart @@ -61,11 +61,14 @@ class TermsAndConditionsPage extends StatelessWidget { text: "https://socialincome.org/privacy", ), ).then((_) { - FlushbarHelper.showFlushbar( - context, - message: localizations.privacyPolicyError, - type: FlushbarType.error, - ); + // Don't use 'BuildContext's across async gaps. Try rewriting the code to not use the 'BuildContext', or guard the use with a 'mounted' check. + if (context.mounted) { + FlushbarHelper.showFlushbar( + context, + message: localizations.privacyPolicyError, + type: FlushbarType.error, + ); + } }); } }, From 7b6eb2b2407c60e05a25e1b3cb49dd2db306ba33 Mon Sep 17 00:00:00 2001 From: KarinBerg Date: Fri, 20 Dec 2024 19:49:49 +0000 Subject: [PATCH 6/8] Prettified Code! --- recipients_app/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipients_app/README.md b/recipients_app/README.md index 0b6996a42..4c2e72276 100644 --- a/recipients_app/README.md +++ b/recipients_app/README.md @@ -26,13 +26,14 @@ Mobile App for Recipients of a Social Income. export PATH="$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools" ``` - Restart your terminal so that these changes take effect -- Optional: Pin Flutter's JDK version and do not use the JDK from Android Studio by default +- Optional: Pin Flutter's JDK version and do not use the JDK from + Android Studio by default - Install Java 21 via Homebrew `brew install openjdk@21` - Homebrew is telling you to execute a symlink command, so that the system Java wrappers can find this JDK. Please do this. - - Additionally in your USER's HOME directory in the file '.zshrc', add - the lines to set the JAVA_HOME environment variable to Java 21 and - add Java to the PATH environment variable + - Additionally in your USER's HOME directory in the file '.zshrc', + add the lines to set the JAVA_HOME environment variable to Java 21 + and add Java to the PATH environment variable ```shell export JAVA_HOME=$(/usr/libexec/java_home -v21) export PATH="$PATH:$JAVA_HOME/bin" From 9fda3d1f987b866a858ffa72a73e60c8645b375e Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Sat, 21 Dec 2024 13:31:25 +0100 Subject: [PATCH 7/8] Only add comments --- recipients_app/android/app/build.gradle | 1 + recipients_app/android/settings.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/recipients_app/android/app/build.gradle b/recipients_app/android/app/build.gradle index 7c6cb071b..fdb4a4e6c 100644 --- a/recipients_app/android/app/build.gradle +++ b/recipients_app/android/app/build.gradle @@ -3,6 +3,7 @@ plugins { id "kotlin-android" // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" + // The Google services Gradle plugin id "com.google.gms.google-services" } diff --git a/recipients_app/android/settings.gradle b/recipients_app/android/settings.gradle index 28b581102..d18ac9157 100644 --- a/recipients_app/android/settings.gradle +++ b/recipients_app/android/settings.gradle @@ -20,6 +20,7 @@ plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version '8.7.3' apply false id "org.jetbrains.kotlin.android" version "1.8.22" apply false + // The dependency for the Google services Gradle plugin // TODO(Verena): update to 4.4.0 once https://github.com/firebase/flutterfire/discussions/8691 is fixed id "com.google.gms.google-services" version "4.3.15" apply false } From 60bd4dacee9389b5e4245ffc36d1a9de786f0361 Mon Sep 17 00:00:00 2001 From: Karin Berg Date: Wed, 25 Dec 2024 22:48:53 +0100 Subject: [PATCH 8/8] Remove not used FlutterFire CLI file --- recipients_app/ios/firebase_app_id_file.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 recipients_app/ios/firebase_app_id_file.json diff --git a/recipients_app/ios/firebase_app_id_file.json b/recipients_app/ios/firebase_app_id_file.json deleted file mode 100644 index 08338235d..000000000 --- a/recipients_app/ios/firebase_app_id_file.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "file_generated_by": "FlutterFire CLI", - "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory", - "GOOGLE_APP_ID": "0", - "FIREBASE_PROJECT_ID": "demo-social-income", - "GCM_SENDER_ID": "0" -}