diff --git a/flutter/android/app/build.gradle b/flutter/android/app/build.gradle index 487f43036..979bbf042 100644 --- a/flutter/android/app/build.gradle +++ b/flutter/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { } android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/flutter/ios/Flutter/AppFrameworkInfo.plist b/flutter/ios/Flutter/AppFrameworkInfo.plist index 4f8d4d245..8c6e56146 100644 --- a/flutter/ios/Flutter/AppFrameworkInfo.plist +++ b/flutter/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/flutter/ios/Podfile.lock b/flutter/ios/Podfile.lock index 252aa2f93..7644c20e6 100644 --- a/flutter/ios/Podfile.lock +++ b/flutter/ios/Podfile.lock @@ -5,124 +5,138 @@ PODS: - Flutter - file_picker (0.0.1): - Flutter - - Firebase/Auth (10.12.0): + - Firebase/Auth (10.25.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.12.0) - - Firebase/CoreOnly (10.12.0): - - FirebaseCore (= 10.12.0) - - Firebase/Crashlytics (10.12.0): + - FirebaseAuth (~> 10.25.0) + - Firebase/CoreOnly (10.25.0): + - FirebaseCore (= 10.25.0) + - Firebase/Crashlytics (10.25.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 10.12.0) - - Firebase/DynamicLinks (10.12.0): + - FirebaseCrashlytics (~> 10.25.0) + - Firebase/DynamicLinks (10.25.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (~> 10.12.0) - - Firebase/Storage (10.12.0): + - FirebaseDynamicLinks (~> 10.25.0) + - Firebase/Storage (10.25.0): - Firebase/CoreOnly - - FirebaseStorage (~> 10.12.0) - - firebase_auth (4.8.0): - - Firebase/Auth (= 10.12.0) + - FirebaseStorage (~> 10.25.0) + - firebase_auth (4.19.5): + - Firebase/Auth (= 10.25.0) - firebase_core - Flutter - - firebase_core (2.15.1): - - Firebase/CoreOnly (= 10.12.0) + - firebase_core (2.31.0): + - Firebase/CoreOnly (= 10.25.0) - Flutter - - firebase_crashlytics (3.3.5): - - Firebase/Crashlytics (= 10.12.0) + - firebase_crashlytics (3.5.5): + - Firebase/Crashlytics (= 10.25.0) - firebase_core - Flutter - - firebase_dynamic_links (5.3.5): - - Firebase/DynamicLinks (= 10.12.0) + - firebase_dynamic_links (5.5.5): + - Firebase/DynamicLinks (= 10.25.0) - firebase_core - Flutter - - firebase_storage (11.2.6): - - Firebase/Storage (= 10.12.0) + - firebase_storage (11.7.5): + - Firebase/Storage (= 10.25.0) - firebase_core - Flutter - - FirebaseAppCheckInterop (10.13.0) - - FirebaseAuth (10.12.0): - - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAppCheckInterop (10.25.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) - - FirebaseAuthInterop (10.13.0) - - FirebaseCore (10.12.0): + - RecaptchaInterop (~> 100.0) + - FirebaseAuthInterop (10.25.0) + - FirebaseCore (10.25.0): - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.13.0): + - GoogleUtilities/Environment (~> 7.12) + - GoogleUtilities/Logger (~> 7.12) + - FirebaseCoreExtension (10.25.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.13.0): + - FirebaseCoreInternal (10.25.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseCrashlytics (10.12.0): + - FirebaseCrashlytics (10.25.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) + - FirebaseRemoteConfigInterop (~> 10.23) - FirebaseSessions (~> 10.5) - GoogleDataTransport (~> 9.2) - GoogleUtilities/Environment (~> 7.8) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseDynamicLinks (10.12.0): + - FirebaseDynamicLinks (10.25.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.13.0): + - FirebaseInstallations (10.25.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseSessions (10.13.0): + - FirebaseRemoteConfigInterop (10.25.0) + - FirebaseSessions (10.25.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) - - GoogleUtilities/Environment (~> 7.10) - - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleUtilities/Environment (~> 7.13) + - GoogleUtilities/UserDefaults (~> 7.13) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseStorage (10.12.0): + - FirebaseStorage (10.25.0): - FirebaseAppCheckInterop (~> 10.0) - - FirebaseAuthInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.25) - FirebaseCore (~> 10.0) - FirebaseCoreExtension (~> 10.0) + - GoogleUtilities/Environment (~> 7.12) - GTMSessionFetcher/Core (< 4.0, >= 2.1) - Flutter (1.0.0) - - GoogleDataTransport (9.2.5): + - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.11.5): + - GoogleUtilities/AppDelegateSwizzler (7.13.3): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.5): + - GoogleUtilities/Logger (7.13.3): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.3): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.5)" - - GoogleUtilities/Reachability (7.11.5): + - "GoogleUtilities/NSData+zlib (7.13.3)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/Reachability (7.13.3): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (7.13.3): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (3.1.1) + - GoogleUtilities/Privacy + - GTMSessionFetcher/Core (3.4.1) - integration_test (0.0.1): - Flutter - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - - PromisesObjC (2.3.1) - - PromisesSwift (2.3.1): - - PromisesObjC (= 2.3.1) + - PromisesObjC (2.4.0) + - PromisesSwift (2.4.0): + - PromisesObjC (= 2.4.0) + - RecaptchaInterop (100.0.0) - share (0.0.1): - Flutter - share_plus (0.0.1): @@ -147,11 +161,11 @@ DEPENDENCIES: - Flutter (from `Flutter`) - integration_test (from `.symlinks/plugins/integration_test/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - share (from `.symlinks/plugins/share/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) @@ -167,6 +181,7 @@ SPEC REPOS: - FirebaseCrashlytics - FirebaseDynamicLinks - FirebaseInstallations + - FirebaseRemoteConfigInterop - FirebaseSessions - FirebaseStorage - GoogleDataTransport @@ -175,6 +190,7 @@ SPEC REPOS: - nanopb - PromisesObjC - PromisesSwift + - RecaptchaInterop EXTERNAL SOURCES: desktop_webview_auth: @@ -200,7 +216,7 @@ EXTERNAL SOURCES: package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" share: @@ -208,7 +224,7 @@ EXTERNAL SOURCES: share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/ios" + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" wakelock: @@ -216,42 +232,44 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: desktop_webview_auth: d645139460ef203d50bd0cdb33356785dd939cce - device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed - file_picker: ec55172937ec2d774460eb4538bad01df0171d81 - Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0 - firebase_auth: 604e47908bc2dcd7baa113bbd37ab74000bff488 - firebase_core: 4a3246a02f828a01c74a2c26427037786d90f17f - firebase_crashlytics: df144edf7d04ace42beb3a3e29d825bfa49dd04b - firebase_dynamic_links: cc3fd36190c7b58c27353915271d2c0d031ee11b - firebase_storage: 90a6038e00d3903c7f665dcfc57a9a98c7c8366b - FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef - FirebaseAuth: a66c1e14ec58f41d154a4b41ce1a23ea00ad4805 - FirebaseAuthInterop: 74875bde5d15636522a8fe98beb561df7a54db58 - FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed - FirebaseCoreExtension: ce60f9db46d83944cf444664d6d587474128eeca - FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e - FirebaseCrashlytics: c4d111b7430c49744c74bcc6346ea00868661ac8 - FirebaseDynamicLinks: 1a387da899779e5ef34f4d6f8bdba882f90d0e67 - FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f - FirebaseSessions: 991fb4c20b3505eef125f7cbfa20a5b5b189c2a4 - FirebaseStorage: 1d7ca8c8953fc61ccacaa7c612696b5402968a0d - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 - GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 - GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 - integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d + file_picker: 684373a825f14becb5556cf6c5b88610290914b2 + Firebase: 0312a2352584f782ea56f66d91606891d4607f06 + firebase_auth: 76ea642e91a9e914b3af751a416046ce1a965cf4 + firebase_core: 0b39f4f424e02eecabb2356ddf331fa07b772af8 + firebase_crashlytics: 5adb9a5ac7858811cef7a9447a011bb4dcb540c3 + firebase_dynamic_links: c4713196b078b72fe8ca825433eb7fbebc009dd9 + firebase_storage: e8b44d3f47e35f60dde2a119da11dc6e8962bef3 + FirebaseAppCheckInterop: 5da5ce93e8797a215e3f677fb0654b74e736c8b8 + FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb + FirebaseAuthInterop: 2753ef68cb3cd5aefebe0f58082671cede78350f + FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483 + FirebaseCoreExtension: 8a47811d0b155501559ef05d089518152a0a1677 + FirebaseCoreInternal: 910a81992c33715fec9263ca7381d59ab3a750b7 + FirebaseCrashlytics: 4b96efb0ce73b38b2a85e8b8bd1bd8f63f09d015 + FirebaseDynamicLinks: 12c9f5b643943e0565ed28080373f89cbcb914a3 + FirebaseInstallations: 91950fe859846fff0fbd296180909dd273103b09 + FirebaseRemoteConfigInterop: b25018791b204c0d78a90e394d6c62d9b1f22da8 + FirebaseSessions: c0939656253a1fa0e94ecc266ccf770cc8b33732 + FirebaseStorage: 44f4e25073f6fa0d4d8c09f5bec299ee9e4eb985 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd + integration_test: 13825b8a9334a850581300559b8839134b124670 + nanopb: 438bc412db1928dac798aa6fd75726007be04262 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 + RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 share: 0b2c3e82132f5888bccca3351c504d0003b3b410 - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f PODFILE CHECKSUM: 7efefa9b0888bed7351e3ede8a076c7bd0e778fa -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/flutter/ios/Runner.xcodeproj/project.pbxproj b/flutter/ios/Runner.xcodeproj/project.pbxproj index 01693d78e..32fe5fb43 100644 --- a/flutter/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter/ios/Runner.xcodeproj/project.pbxproj @@ -230,14 +230,15 @@ buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( ECF63E70EE94C1A007B886BF /* [CP] Check Pods Manifest.lock */, - 9740EEB61CF901F6004384FC /* Run Script xcode_backend */, + 19C134552876922700263A48 /* Embed Frameworks */, + 9740EEB61CF901F6004384FC /* [Script] [Flutter] Run Script xcode_backend */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 3B06AD1E1E4923F5004D2608 /* [Script] [Flutter] Thin Binary */, + BD70EE9B2A93C96B00C2A803 /* [Script] [Crashlytics] Upload dSYM files */, + 49C48ADF338F6B2EA7E867D7 /* [CP] Copy Pods Resources */, D5A11810053EEA7778D10F3D /* [CP] Embed Pods Frameworks */, - 19C134552876922700263A48 /* Embed Frameworks */, - BD70EE9B2A93C96B00C2A803 /* [Crashlytics] Upload dSYM files */, ); buildRules = ( ); @@ -255,7 +256,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 2C25ABBA270595F000518142 = { @@ -310,21 +311,39 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 3B06AD1E1E4923F5004D2608 /* [Script] [Flutter] Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "Thin Binary"; + name = "[Script] [Flutter] Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; + 49C48ADF338F6B2EA7E867D7 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 4C3B1FE56045A8AA75694CEB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -347,7 +366,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script xcode_backend */ = { + 9740EEB61CF901F6004384FC /* [Script] [Flutter] Run Script xcode_backend */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -355,14 +374,14 @@ ); inputPaths = ( ); - name = "Run Script xcode_backend"; + name = "[Script] [Flutter] Run Script xcode_backend"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; - BD70EE9B2A93C96B00C2A803 /* [Crashlytics] Upload dSYM files */ = { + BD70EE9B2A93C96B00C2A803 /* [Script] [Crashlytics] Upload dSYM files */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -372,7 +391,7 @@ ); inputPaths = ( ); - name = "[Crashlytics] Upload dSYM files"; + name = "[Script] [Crashlytics] Upload dSYM files"; outputFileListPaths = ( ); outputPaths = ( diff --git a/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3cfc0d76f..3bf5b6fa0 100644 --- a/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@