From e91524c7c6e48d095f7d216ba7151f73383e8df0 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Tue, 23 Apr 2024 11:37:43 -0700 Subject: [PATCH 1/5] deps: Upgrade Flutter to latest main, 3.22.0-16.0.pre.20 And update Flutter's supporting libraries to match. --- ios/Podfile.lock | 2 +- pubspec.lock | 24 ++++++++++++------------ pubspec.yaml | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d5a52a62fe..8cd90f3b0c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -221,7 +221,7 @@ SPEC CHECKSUMS: GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18 - integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 + integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 nanopb: 438bc412db1928dac798aa6fd75726007be04262 package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c diff --git a/pubspec.lock b/pubspec.lock index 18509fd60a..54ecb50a17 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -712,10 +712,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.14.0" mime: dependency: transitive description: @@ -1077,26 +1077,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: d72b538180efcf8413cd2e4e6fcc7ae99c7712e0909eb9223f9da6e6d0ef715f url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.4" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.1" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.2" timezone: dependency: transitive description: @@ -1205,10 +1205,10 @@ packages: dependency: transitive description: name: vm_service - sha256: a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.2.0" + version: "14.2.1" watcher: dependency: transitive description: @@ -1297,5 +1297,5 @@ packages: source: path version: "0.0.1" sdks: - dart: ">=3.5.0-18.0.dev <4.0.0" - flutter: ">=3.22.0-5.0.pre.22" + dart: ">=3.5.0-90.0.dev <4.0.0" + flutter: ">=3.22.0-16.0.pre.20" diff --git a/pubspec.yaml b/pubspec.yaml index 729290ae15..d8b25ecef3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,8 +24,8 @@ environment: # that by the time we want to release, these will have become stable. # TODO: Before general release, switch to stable Flutter and Dart versions, # or pin exact versions: https://github.com/zulip/zulip-flutter/issues/15 - sdk: '>=3.5.0-18.0.dev <4.0.0' - flutter: '>=3.22.0-5.0.pre.22' + sdk: '>=3.5.0-90.0.dev <4.0.0' + flutter: '>=3.22.0-16.0.pre.20' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 5f111cbaf1b92d4cfc315bfc0dd60aef2ef5fe0f Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Tue, 23 Apr 2024 11:44:43 -0700 Subject: [PATCH 2/5] ios: Take automatic migration away from @UIApplicationMain When building for iOS (`flutter run`), I got this output: ios/Runner/AppDelegate.swift uses the deprecated @UIApplicationMain attribute, updating. And sure enough, this change was made, automatically. Sure; might as well commit it. The following seems to be the explanation for it: https://github.com/apple/swift-evolution/blob/43b894b0c/proposals/0383-deprecate-uiapplicationmain-and-nsapplicationmain.md --- ios/Runner/AppDelegate.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 70693e4a8c..b636303481 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, From 0dbf69b245efc3a639ef92c210d9ece7fed5f7b9 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Tue, 23 Apr 2024 11:54:36 -0700 Subject: [PATCH 3/5] deps: Update CocoaPods pods (tools/upgrade pod) --- ios/Podfile.lock | 32 ++++++++++++++++---------------- macos/Podfile.lock | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8cd90f3b0c..f46722ef63 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,14 +3,14 @@ PODS: - Flutter - device_info_plus (0.0.1): - Flutter - - DKImagePickerController/Core (4.3.4): + - DKImagePickerController/Core (4.3.8): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.4) - - DKImagePickerController/PhotoGallery (4.3.4): + - DKImagePickerController/ImageDataManager (4.3.8) + - DKImagePickerController/PhotoGallery (4.3.8): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.4) + - DKImagePickerController/Resource (4.3.8) - DKPhotoGallery (0.0.17): - DKPhotoGallery/Core (= 0.0.17) - DKPhotoGallery/Model (= 0.0.17) @@ -53,9 +53,9 @@ PODS: - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.23.0): + - FirebaseCoreInternal (10.24.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.23.0): + - FirebaseInstallations (10.24.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -121,14 +121,14 @@ PODS: - SDWebImage/Core (5.19.1) - share_plus (0.0.1): - Flutter - - sqlite3 (3.45.1): - - sqlite3/common (= 3.45.1) - - sqlite3/common (3.45.1) - - sqlite3/fts5 (3.45.1): + - "sqlite3 (3.45.3+1)": + - "sqlite3/common (= 3.45.3+1)" + - "sqlite3/common (3.45.3+1)" + - "sqlite3/fts5 (3.45.3+1)": - sqlite3/common - - sqlite3/perf-threadsafe (3.45.1): + - "sqlite3/perf-threadsafe (3.45.3+1)": - sqlite3/common - - sqlite3/rtree (3.45.1): + - "sqlite3/rtree (3.45.3+1)": - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter @@ -206,15 +206,15 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d - DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac + DKImagePickerController: a7836546cfdfe014171694f643a7d575bc8ace7f DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 firebase_core: d955499180c3c8ef355adf46b8752c4c01d09e0a firebase_messaging: 23c8eaa885a11552e45c98b7a08ba81860092883 FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 - FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 - FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 + FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af + FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 @@ -228,7 +228,7 @@ SPEC CHECKSUMS: PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad - sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 + sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 0b6bea27a6..16324a6f09 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -20,9 +20,9 @@ PODS: - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.23.0): + - FirebaseCoreInternal (10.24.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.23.0): + - FirebaseInstallations (10.24.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -81,14 +81,14 @@ PODS: - PromisesObjC (2.4.0) - share_plus (0.0.1): - FlutterMacOS - - sqlite3 (3.45.1): - - sqlite3/common (= 3.45.1) - - sqlite3/common (3.45.1) - - sqlite3/fts5 (3.45.1): + - "sqlite3 (3.45.3+1)": + - "sqlite3/common (= 3.45.3+1)" + - "sqlite3/common (3.45.3+1)" + - "sqlite3/fts5 (3.45.3+1)": - sqlite3/common - - sqlite3/perf-threadsafe (3.45.1): + - "sqlite3/perf-threadsafe (3.45.3+1)": - sqlite3/common - - sqlite3/rtree (3.45.1): + - "sqlite3/rtree (3.45.3+1)": - sqlite3/common - sqlite3_flutter_libs (0.0.1): - FlutterMacOS @@ -156,8 +156,8 @@ SPEC CHECKSUMS: firebase_core: 2c57be44d4fb5de6757fd8ebe04e363599daef36 firebase_messaging: 6ee25816b47b604184e49b9e0c49334ebe555d06 FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 - FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 - FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 + FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af + FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 @@ -168,7 +168,7 @@ SPEC CHECKSUMS: path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf - sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 + sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a sqlite3_flutter_libs: 06a05802529659a272beac4ee1350bfec294f386 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 From 92f5dd5eaf9394684ce8eb75ff2392471b7a1900 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Tue, 23 Apr 2024 11:55:23 -0700 Subject: [PATCH 4/5] deps: Upgrade packages within constraints (tools/upgrade pub) Actually, I have a hunch that this will be enough for #612, '"Missing API declaration" warning from Apple'. As that issue says, the only category of "required reason APIs" that Apple is alerting about is "user defaults APIs". There's just one API in this category: `NSUserDefaults`. Using Step 4 in these instructions from a Flutter maintainer -- https://github.com/flutter/flutter/issues/145269#issuecomment-2070221423 -- I found that firebase_messaging and flutter_local_notifications, but no other dependencies, have calls to NSUserDefaults without declaring reasons in this category in a "privacy manifest" file. Moreover, unlike in zulip-mobile, our Podfile calls `use_frameworks!`, which should mean we don't have to manually copy anything from our dependencies into a privacy manifest file of our own. See zulip/zulip-mobile#5859 for a link to a mention in the Flutter project about `use_frameworks!`. So I'm hoping that the following upgrades, made here, will address Apple's alerts: - firebase_messaging to v14.9.0, in which that dependency gets a privacy manifest that declares a reason for using "user defaults APIs": https://github.com/firebase/flutterfire/releases/tag/firebase_messaging-v14.9.0 - flutter_local_notifications to v17.1.0. In v17.0.1, a "user defaults APIs" reason declaration was added to this dependency's privacy manifest: https://github.com/MaikuB/flutter_local_notifications/releases Fixes: #612 --- ios/Podfile.lock | 34 +++---- ios/Runner.xcodeproj/project.pbxproj | 18 ++++ macos/Podfile.lock | 36 ++++---- macos/Runner.xcodeproj/project.pbxproj | 18 ++++ pubspec.lock | 120 ++++++++++++------------- 5 files changed, 131 insertions(+), 95 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f46722ef63..d9e1a993d0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -37,19 +37,19 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (10.22.0): - - FirebaseCore (= 10.22.0) - - Firebase/Messaging (10.22.0): + - Firebase/CoreOnly (10.24.0): + - FirebaseCore (= 10.24.0) + - Firebase/Messaging (10.24.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.22.0) - - firebase_core (2.28.0): - - Firebase/CoreOnly (= 10.22.0) + - FirebaseMessaging (~> 10.24.0) + - firebase_core (2.30.1): + - Firebase/CoreOnly (= 10.24.0) - Flutter - - firebase_messaging (14.8.0): - - Firebase/Messaging (= 10.22.0) + - firebase_messaging (14.9.0): + - Firebase/Messaging (= 10.24.0) - firebase_core - Flutter - - FirebaseCore (10.22.0): + - FirebaseCore (10.24.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) @@ -60,7 +60,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.22.0): + - FirebaseMessaging (10.24.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.3) @@ -132,7 +132,7 @@ PODS: - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - - sqlite3 (~> 3.45.1) + - "sqlite3 (~> 3.45.3+1)" - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -209,13 +209,13 @@ SPEC CHECKSUMS: DKImagePickerController: a7836546cfdfe014171694f643a7d575bc8ace7f DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 - Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 - firebase_core: d955499180c3c8ef355adf46b8752c4c01d09e0a - firebase_messaging: 23c8eaa885a11552e45c98b7a08ba81860092883 - FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 + Firebase: 91fefd38712feb9186ea8996af6cbdef41473442 + firebase_core: 7f1e1156934d0da3be260174812842df9420e4ab + firebase_messaging: 917a590db1d2f6fec494c5d9aa83c010f518c28f + FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894 FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e - FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e + FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a @@ -229,7 +229,7 @@ SPEC CHECKSUMS: SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a - sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 + sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1dea534dba..6d1b000936 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -141,6 +141,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, CF082B7052F068E927BF3A60 /* [CP] Embed Pods Frameworks */, + 85EEE45BF1E43CE258437BA2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -237,6 +238,23 @@ 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; }; + 85EEE45BF1E43CE258437BA2 /* [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; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 16324a6f09..a6b02e8755 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -3,20 +3,20 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - Firebase/CoreOnly (10.22.0): - - FirebaseCore (= 10.22.0) - - Firebase/Messaging (10.22.0): + - Firebase/CoreOnly (10.24.0): + - FirebaseCore (= 10.24.0) + - Firebase/Messaging (10.24.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.22.0) - - firebase_core (2.28.0): - - Firebase/CoreOnly (~> 10.22.0) + - FirebaseMessaging (~> 10.24.0) + - firebase_core (2.30.1): + - Firebase/CoreOnly (~> 10.24.0) - FlutterMacOS - - firebase_messaging (14.8.0): - - Firebase/CoreOnly (~> 10.22.0) - - Firebase/Messaging (~> 10.22.0) + - firebase_messaging (14.9.0): + - Firebase/CoreOnly (~> 10.24.0) + - Firebase/Messaging (~> 10.24.0) - firebase_core - FlutterMacOS - - FirebaseCore (10.22.0): + - FirebaseCore (10.24.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) @@ -27,7 +27,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.22.0): + - FirebaseMessaging (10.24.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.3) @@ -92,7 +92,7 @@ PODS: - sqlite3/common - sqlite3_flutter_libs (0.0.1): - FlutterMacOS - - sqlite3 (~> 3.45.1) + - "sqlite3 (~> 3.45.3+1)" - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -152,13 +152,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 - Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 - firebase_core: 2c57be44d4fb5de6757fd8ebe04e363599daef36 - firebase_messaging: 6ee25816b47b604184e49b9e0c49334ebe555d06 - FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 + Firebase: 91fefd38712feb9186ea8996af6cbdef41473442 + firebase_core: 59eec96207757ff60fa76232d0b0bb749f2c4b89 + firebase_messaging: eb3c1afa3c6756407f2d9f22a4b6c58d50f4c9b2 + FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894 FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e - FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e + FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a @@ -169,7 +169,7 @@ SPEC CHECKSUMS: PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a - sqlite3_flutter_libs: 06a05802529659a272beac4ee1350bfec294f386 + sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 0ba37e8f2f..cbb7143013 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -185,6 +185,7 @@ 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, FD4A0BBCC328170C90F9011D /* [CP] Embed Pods Frameworks */, + 265FD38E002254FFD08E2D83 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -254,6 +255,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 265FD38E002254FFD08E2D83 /* [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; + }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; diff --git a/pubspec.lock b/pubspec.lock index 54ecb50a17..50b75bca26 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "79b6452b4066fcbdd74c2aac354e80c591a727e0364bedccecdb5a5321784fa2" + sha256: "1639d96851f9e9e215dd39c9baad56846488aef3df392cb3221f37f70beac686" url: "https://pub.dev" source: hosted - version: "1.3.28" + version: "1.3.31" analyzer: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "50fb435ed30c6d2525cbfaaa0f46851ea6131315f213c0d921b0e407b34e3b84" + sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91 url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "10.1.0" device_info_plus_platform_interface: dependency: transitive description: @@ -277,18 +277,18 @@ packages: dependency: "direct main" description: name: drift - sha256: "3b276c838ff7f8e19aac18a51f9b388715268f3534eaaf8047c8455ef3c1738d" + sha256: "049057eba8692cc097c9d0be7612d0a6dd65e3bd283de7e352f9dc81de23169a" url: "https://pub.dev" source: hosted - version: "2.16.0" + version: "2.17.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: "66cf3e397448f855523d7b6b7b3789db232b211db96543a42285464d05f3bf72" + sha256: eb327c76604f3e84fff12b246d52da1c160d3aa44d7d433f000d416b4d5e8d8d url: "https://pub.dev" source: hosted - version: "2.16.0" + version: "2.17.0" fake_async: dependency: "direct dev" description: @@ -317,10 +317,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03 + sha256: "45c70b43df893027e441a6fa0aacc8f484fb9f9c60c746dc8f1dc4f774cf55cd" url: "https://pub.dev" source: hosted - version: "8.0.0+1" + version: "8.0.2" file_selector_linux: dependency: transitive description: @@ -357,10 +357,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "4b45655ec1b21a1783681f72f840a2e74d298046c2b7c286ab0e4f0efbf93d0a" + sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284" url: "https://pub.dev" source: hosted - version: "2.28.0" + version: "2.30.1" firebase_core_platform_interface: dependency: transitive description: @@ -373,34 +373,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "28e30e00748497b9a70db2025942a42c5d752534eb678e9b9b98db056cf404ba" + sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29" url: "https://pub.dev" source: hosted - version: "2.14.0" + version: "2.16.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "502233442839406198c34458a4ff71ca3350cc7be88ce06a8b729cbd2162ef57" + sha256: d8b12bcfe535f9bf8e24b4f9685036a8614f11b6fdcdff54ce9758ea8585a8a9 url: "https://pub.dev" source: hosted - version: "14.8.0" + version: "14.9.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "9438353a857c8000b0680d7ee246acb14fb854c4a14df4ebc7e1efde166903ac" + sha256: "8355f089bfc06691f00e0bc01c4214bc0aeff22acabdb5090b734a551d33ca43" url: "https://pub.dev" source: hosted - version: "4.5.30" + version: "4.5.33" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "6672c1c41e79d607b1ce0bbf1c6dcf97f7894b98bf65fe806e40d62a700bae3a" + sha256: d6f3ea91e0aae479a09355af91e65b19cfbc485d596c5448a87356af4923e582 url: "https://pub.dev" source: hosted - version: "3.8.0" + version: "3.8.3" fixnum: dependency: transitive description: @@ -439,10 +439,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1 + sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4" url: "https://pub.dev" source: hosted - version: "17.0.0" + version: "17.1.0" flutter_local_notifications_linux: dependency: transitive description: @@ -455,10 +455,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications_platform_interface - sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef" + sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7" url: "https://pub.dev" source: hosted - version: "7.0.0+1" + version: "7.1.0" flutter_localizations: dependency: "direct main" description: flutter @@ -468,10 +468,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.0.19" flutter_test: dependency: "direct dev" description: flutter @@ -547,34 +547,34 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd" + sha256: fe9ee64ccb8d599a5dfb0e21cc6652232c610bcf667af4e79b9eb175cc30a7a5 url: "https://pub.dev" source: hosted - version: "1.0.7" + version: "1.1.0" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: "42c098e7fb6334746be37cdc30369ade356ed4f14d48b7a0313f95a9159f4321" + sha256: "8e75431a62b7feb4fd55cb4a5c6f0ac4564460ec5dc09f9c4a0d50a5ce7c4cb9" url: "https://pub.dev" source: hosted - version: "0.8.9+5" + version: "0.8.10" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "6a1704fdd75022272e7e7a897a9068e9c2ff3cd6a66820bf3ded810633eac954" + sha256: "5d6eb13048cd47b60dbf1a5495424dea226c5faf3950e20bf8120a58efb5b5f3" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: "917a5cadd67d052554cfb258595e54217de53fac5b52939426e26319a02e6297" + sha256: f74064bc548b5164a033ec05638e23c91be1a249c255e0f56319dddffd759794 url: "https://pub.dev" source: hosted - version: "0.8.9+2" + version: "0.8.10+1" image_picker_linux: dependency: transitive description: @@ -595,10 +595,10 @@ packages: dependency: transitive description: name: image_picker_platform_interface - sha256: "3d2c323daea9d60608f1caf30be32a938916f4975434b8352e6f73dae496da38" + sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80" url: "https://pub.dev" source: hosted - version: "2.9.4" + version: "2.10.0" image_picker_windows: dependency: transitive description: @@ -776,18 +776,18 @@ packages: dependency: "direct main" description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.4" path_provider_foundation: dependency: transitive description: @@ -904,10 +904,10 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "05ec043470319bfbabe0adbc90d3a84cbff0426b9d9f3a6e2ad3e131fa5fa629" + sha256: fb5319f3aab4c5dda5ebb92dca978179ba21f8c783ee4380910ef4c1c6824f51 url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.0.3" share_plus_platform_interface: dependency: "direct main" description: @@ -1013,18 +1013,18 @@ packages: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060 + sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5 url: "https://pub.dev" source: hosted - version: "0.5.20" + version: "0.5.21" sqlparser: dependency: transitive description: name: sqlparser - sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0" + sha256: "462a7be9feb74328ddbd275b39fdacf64fbd8c4149ad85becb488664859cf9f3" url: "https://pub.dev" source: hosted - version: "0.34.1" + version: "0.35.0" stack_trace: dependency: "direct dev" description: @@ -1125,18 +1125,18 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" + sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.2.6" url_launcher_android: dependency: "direct main" description: name: url_launcher_android - sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 + sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_ios: dependency: transitive description: @@ -1173,10 +1173,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" url_launcher_windows: dependency: transitive description: @@ -1189,10 +1189,10 @@ packages: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.4.0" vector_math: dependency: transitive description: @@ -1229,10 +1229,10 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.5" webdriver: dependency: transitive description: @@ -1261,10 +1261,10 @@ packages: dependency: transitive description: name: win32_registry - sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" + sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" xdg_directories: dependency: transitive description: From 0b3e4cf4d38ca6a9c1ef6c9c8867d9a995a09600 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Tue, 23 Apr 2024 11:55:57 -0700 Subject: [PATCH 5/5] deps: Upgrade packages to latest, namely package_info_plus, share_plus This is the result of `tools/upgrade pod-major`, and some small adjustments for a breaking API change in share_plus. Changelogs: https://pub.dev/packages/package_info_plus/changelog https://pub.dev/packages/share_plus/changelog Tested on my iPhone and on the office Android device. In particular, I checked that sharing message content via the message action sheet still worked, and I checked that the "About Zulip" page still shows the "App version" field correctly. --- lib/widgets/action_sheet.dart | 2 +- pubspec.lock | 16 ++++++++-------- pubspec.yaml | 6 +++--- test/test_share_plus.dart | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart index ba03831fe2..a37b7eabc0 100644 --- a/lib/widgets/action_sheet.dart +++ b/lib/widgets/action_sheet.dart @@ -205,7 +205,7 @@ class ShareButton extends MessageActionSheetMenuItemButton { // https://pub.dev/packages/share_plus#ipad // Perhaps a wart in the API; discussion: // https://github.com/zulip/zulip-flutter/pull/12#discussion_r1130146231 - final result = await Share.shareWithResult(rawContent); + final result = await Share.share(rawContent); switch (result.status) { // The plugin isn't very helpful: "The status can not be determined". diff --git a/pubspec.lock b/pubspec.lock index 50b75bca26..d637917ec4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -752,18 +752,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" path: dependency: "direct main" description: @@ -904,18 +904,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: fb5319f3aab4c5dda5ebb92dca978179ba21f8c783ee4380910ef4c1c6824f51 + sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544 url: "https://pub.dev" source: hosted - version: "8.0.3" + version: "9.0.0" share_plus_platform_interface: dependency: "direct main" description: name: share_plus_platform_interface - sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496" + sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4" url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "4.0.0" shelf: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d8b25ecef3..19fcd92046 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -56,11 +56,11 @@ dependencies: image_picker: ^1.0.0 intl: ^0.19.0 json_annotation: ^4.8.1 - package_info_plus: ^6.0.0 + package_info_plus: ^8.0.0 path: ^1.8.3 path_provider: ^2.0.13 - share_plus: ^8.0.2 - share_plus_platform_interface: ^3.3.1 + share_plus: ^9.0.0 + share_plus_platform_interface: ^4.0.0 sqlite3: ^2.4.0 sqlite3_flutter_libs: ^0.5.13 url_launcher: ^6.1.11 diff --git a/test/test_share_plus.dart b/test/test_share_plus.dart index ecd63dfe88..6f62c0b76b 100644 --- a/test/test_share_plus.dart +++ b/test/test_share_plus.dart @@ -12,7 +12,7 @@ class MockSharePlus { Future handleMethodCall(MethodCall methodCall) async { switch (methodCall.method) { - case 'shareWithResult': + case 'share': // The method channel doesn't preserve Map as // `arguments`'s type; logging runtimeType gives _Map. final arguments = methodCall.arguments as Map;