From 400f1a5da455f1420647348714f135814dbd2d72 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Fri, 5 Apr 2024 12:13:04 -0700 Subject: [PATCH 1/6] android: Bump minSdkVersion to 28, aka Android 9 Pie In 2023-09, just 2.2% of our zulip-mobile Android users were below this version, according to stats Greg posted: https://chat.zulip.org/#narrow/stream/48-mobile/topic/platform.20versions/near/1648299 So I think by now we can be comfortable making this the new minumum. I'm not sure if this is actually strictly required by some dependency upgrades we'll take later in this series of commits. But Android 9 is what the office Android device is on, and the core team doesn't have a physical device running a lower version. So we'll validate the upcoming dependency upgrades experimentally, by running on the office Android device. And with this bump to the threshold, we can leave it at that. Discussion: https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20Java.20versions.3F/near/1775991 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7b35456070..4a8b1eb783 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -40,7 +40,7 @@ android { defaultConfig { applicationId "com.zulip.flutter" - minSdkVersion 24 + minSdkVersion 28 targetSdkVersion flutter.targetSdkVersion // These are synced to local.properties from pubspec.yaml by the flutter tool. versionCode localProperties.getProperty('flutter.versionCode').toInteger() From 0b910aface06b5ff70655cf98982dd097e8c275e Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 4 Apr 2024 15:12:23 -0700 Subject: [PATCH 2/6] deps: Update Flutter to latest main, 3.22.0-5.0.pre.22 And update Flutter's supporting libraries to match. --- pubspec.lock | 16 ++++++++-------- pubspec.yaml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 9610f2458c..46ada4f0c2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -656,18 +656,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -704,10 +704,10 @@ 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: @@ -1297,5 +1297,5 @@ packages: source: path version: "0.0.1" sdks: - dart: ">=3.4.0-256.0.dev <4.0.0" - flutter: ">=3.21.0-12.0.pre.26" + dart: ">=3.5.0-18.0.dev <4.0.0" + flutter: ">=3.22.0-5.0.pre.22" diff --git a/pubspec.yaml b/pubspec.yaml index 56aa501a8f..4ece9b612a 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.4.0-256.0.dev <4.0.0' - flutter: '>=3.21.0-12.0.pre.26' + sdk: '>=3.5.0-18.0.dev <4.0.0' + flutter: '>=3.22.0-5.0.pre.22' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 106e7399cee207697594ef16f5e33496b0a48b63 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 4 Apr 2024 15:26:32 -0700 Subject: [PATCH 3/6] deps: Update CocoaPods pods (tools/upgrade pod) --- ios/Podfile.lock | 54 ++++++++++++++++++++++++++-------------------- macos/Podfile.lock | 42 +++++++++++++++++++++--------------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6a62a69bde..658c46b237 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -53,9 +53,9 @@ PODS: - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.21.0): + - FirebaseCoreInternal (10.23.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.21.0): + - FirebaseInstallations (10.23.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -72,27 +72,35 @@ PODS: - Flutter (1.0.0) - flutter_local_notifications (0.0.1): - Flutter - - GoogleDataTransport (9.3.0): + - 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.12.0): + - GoogleUtilities/AppDelegateSwizzler (7.13.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (7.13.0): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.12.0): + - GoogleUtilities/Logger (7.13.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.12.0)" - - GoogleUtilities/Reachability (7.12.0): + - "GoogleUtilities/NSData+zlib (7.13.0)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.0) + - GoogleUtilities/Reachability (7.13.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (7.13.0): - GoogleUtilities/Logger + - GoogleUtilities/Privacy - image_picker_ios (0.0.1): - Flutter - integration_test (0.0.1): @@ -107,10 +115,10 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - PromisesObjC (2.3.1) - - SDWebImage (5.18.11): - - SDWebImage/Core (= 5.18.11) - - SDWebImage/Core (5.18.11) + - PromisesObjC (2.4.0) + - SDWebImage (5.19.1): + - SDWebImage/Core (= 5.19.1) + - SDWebImage/Core (5.19.1) - share_plus (0.0.1): - Flutter - sqlite3 (3.45.1): @@ -128,7 +136,7 @@ PODS: - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree - - SwiftyGif (5.4.4) + - SwiftyGif (5.4.5) - url_launcher_ios (0.0.1): - Flutter @@ -205,24 +213,24 @@ SPEC CHECKSUMS: firebase_core: a46c312d8bae4defa3d009b2aa7b5b413aeb394e firebase_messaging: 40d7dd2f3e88a6367c7326cf601f84633d477582 FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6 - FirebaseCoreInternal: 43c1788eaeee9d1b97caaa751af567ce11010d00 - FirebaseInstallations: 390ea1d10a4d02b20c965cbfd527ee9b3b412acb + FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 + FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 - GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe - GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - SDWebImage: a3ba0b8faac7228c3c8eadd1a55c9c9fe5e16457 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 - SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f + SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 PODFILE CHECKSUM: 6998435987a000fdec9b2e1b5b1eef6d54bdba77 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index daf3de8254..7433f327e4 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.21.0): + - FirebaseCoreInternal (10.23.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.21.0): + - FirebaseInstallations (10.23.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -39,27 +39,35 @@ PODS: - flutter_local_notifications (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - - GoogleDataTransport (9.3.0): + - 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.12.0): + - GoogleUtilities/AppDelegateSwizzler (7.13.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (7.13.0): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.12.0): + - GoogleUtilities/Logger (7.13.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.12.0)" - - GoogleUtilities/Reachability (7.12.0): + - "GoogleUtilities/NSData+zlib (7.13.0)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.0) + - GoogleUtilities/Reachability (7.13.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (7.13.0): - GoogleUtilities/Logger + - GoogleUtilities/Privacy - nanopb (2.30909.1): - nanopb/decode (= 2.30909.1) - nanopb/encode (= 2.30909.1) @@ -70,7 +78,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - PromisesObjC (2.3.1) + - PromisesObjC (2.4.0) - share_plus (0.0.1): - FlutterMacOS - sqlite3 (3.45.1): @@ -148,17 +156,17 @@ SPEC CHECKSUMS: firebase_core: 2e1a33fd13fb581f0dc809c18be25cdc1a2e10db firebase_messaging: aa7d68aa238b24ee36bfe33f7a73561d3a78b069 FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6 - FirebaseCoreInternal: 43c1788eaeee9d1b97caaa751af567ce11010d00 - FirebaseInstallations: 390ea1d10a4d02b20c965cbfd527ee9b3b412acb + FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 + FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5 flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe - GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 sqlite3_flutter_libs: 06a05802529659a272beac4ee1350bfec294f386 From 79fd015d029c8f0257a19a6baf5925a591917ac4 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 4 Apr 2024 15:27:30 -0700 Subject: [PATCH 4/6] deps: Upgrade packages within constraints (tools/upgrade pub) --- ios/Podfile.lock | 48 ++++++++++++------------ macos/Podfile.lock | 46 +++++++++++------------ pubspec.lock | 92 +++++++++++++++++++++++----------------------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 658c46b237..cc57d1e9f1 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.20.0): - - FirebaseCore (= 10.20.0) - - Firebase/Messaging (10.20.0): + - Firebase/CoreOnly (10.22.0): + - FirebaseCore (= 10.22.0) + - Firebase/Messaging (10.22.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.20.0) - - firebase_core (2.25.4): - - Firebase/CoreOnly (= 10.20.0) + - FirebaseMessaging (~> 10.22.0) + - firebase_core (2.27.0): + - Firebase/CoreOnly (= 10.22.0) - Flutter - - firebase_messaging (14.7.15): - - Firebase/Messaging (= 10.20.0) + - firebase_messaging (14.7.19): + - Firebase/Messaging (= 10.22.0) - firebase_core - Flutter - - FirebaseCore (10.20.0): + - FirebaseCore (10.22.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.20.0): + - FirebaseMessaging (10.22.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.3) @@ -68,7 +68,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - Flutter (1.0.0) - flutter_local_notifications (0.0.1): - Flutter @@ -105,11 +105,11 @@ PODS: - Flutter - integration_test (0.0.1): - Flutter - - nanopb (2.30909.1): - - nanopb/decode (= 2.30909.1) - - nanopb/encode (= 2.30909.1) - - nanopb/decode (2.30909.1) - - nanopb/encode (2.30909.1) + - 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): @@ -209,20 +209,20 @@ SPEC CHECKSUMS: DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - Firebase: 10c8cb12fb7ad2ae0c09ffc86cd9c1ab392a0031 - firebase_core: a46c312d8bae4defa3d009b2aa7b5b413aeb394e - firebase_messaging: 40d7dd2f3e88a6367c7326cf601f84633d477582 - FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6 + Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 + firebase_core: 100945864b4aedce3cfef0c62ab864858bf013cf + firebase_messaging: e65050bf9b187511d80ea3a4de7cf5573d2c7543 + FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 - FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5 + FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 - image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 + image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18 integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 - nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 + nanopb: 438bc412db1928dac798aa6fd75726007be04262 package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 @@ -231,7 +231,7 @@ SPEC CHECKSUMS: sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 PODFILE CHECKSUM: 6998435987a000fdec9b2e1b5b1eef6d54bdba77 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 7433f327e4..0d20871de5 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.20.0): - - FirebaseCore (= 10.20.0) - - Firebase/Messaging (10.20.0): + - Firebase/CoreOnly (10.22.0): + - FirebaseCore (= 10.22.0) + - Firebase/Messaging (10.22.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.20.0) - - firebase_core (2.25.4): - - Firebase/CoreOnly (~> 10.20.0) + - FirebaseMessaging (~> 10.22.0) + - firebase_core (2.27.0): + - Firebase/CoreOnly (~> 10.22.0) - FlutterMacOS - - firebase_messaging (14.7.15): - - Firebase/CoreOnly (~> 10.20.0) - - Firebase/Messaging (~> 10.20.0) + - firebase_messaging (14.7.19): + - Firebase/CoreOnly (~> 10.22.0) + - Firebase/Messaging (~> 10.22.0) - firebase_core - FlutterMacOS - - FirebaseCore (10.20.0): + - FirebaseCore (10.22.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.20.0): + - FirebaseMessaging (10.22.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.3) @@ -35,7 +35,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - flutter_local_notifications (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) @@ -68,11 +68,11 @@ PODS: - GoogleUtilities/UserDefaults (7.13.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - nanopb (2.30909.1): - - nanopb/decode (= 2.30909.1) - - nanopb/encode (= 2.30909.1) - - nanopb/decode (2.30909.1) - - nanopb/encode (2.30909.1) + - 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.0.1): - FlutterMacOS - path_provider_foundation (0.0.1): @@ -152,18 +152,18 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 - Firebase: 10c8cb12fb7ad2ae0c09ffc86cd9c1ab392a0031 - firebase_core: 2e1a33fd13fb581f0dc809c18be25cdc1a2e10db - firebase_messaging: aa7d68aa238b24ee36bfe33f7a73561d3a78b069 - FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6 + Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 + firebase_core: 94cef1d79e26747286a4808b2345c1ecb8501b11 + firebase_messaging: b243cd1026362f3f5ec5e73ffb0c4431519f0b57 + FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 - FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5 + FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 - nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 + nanopb: 438bc412db1928dac798aa6fd75726007be04262 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 diff --git a/pubspec.lock b/pubspec.lock index 46ada4f0c2..9d88d3cf75 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "1a52f1afae8ab7ac4741425114713bdbba802f1ce1e0648e167ffcc6e05e96cf" + sha256: "4eec93681221723a686ad580c2e7d960e1017cf1a4e0a263c2573c2c6b0bf5cd" url: "https://pub.dev" source: hosted - version: "1.3.21" + version: "1.3.25" analyzer: dependency: transitive description: @@ -101,10 +101,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.9" build_runner_core: dependency: transitive description: @@ -125,10 +125,10 @@ packages: dependency: transitive description: name: built_value - sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6 + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.9.2" characters: dependency: transitive description: @@ -245,10 +245,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.6" dbus: dependency: transitive description: @@ -317,10 +317,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6" + sha256: "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4" url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.2.1" file_selector_linux: dependency: transitive description: @@ -357,10 +357,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "7e049e32a9d347616edb39542cf92cd53fdb4a99fb6af0a0bff327c14cd76445" + sha256: "53316975310c8af75a96e365f9fccb67d1c544ef0acdbf0d88bbe30eedd1c4f9" url: "https://pub.dev" source: hosted - version: "2.25.4" + version: "2.27.0" firebase_core_platform_interface: dependency: transitive description: @@ -373,34 +373,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "57e61d6010e253b36d38191cefd6199d7849152cdcd234b61ca290cdb278a0ba" + sha256: c8e1d59385eee98de63c92f961d2a7062c5d9a65e7f45bdc7f1b0b205aab2492 url: "https://pub.dev" source: hosted - version: "2.11.4" + version: "2.11.5" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "9c97b20c012542252a8853f11334efd833ddae83551fe37d27f87d885c655038" + sha256: e41586e0fd04fe9a40424f8b0053d0832e6d04f49e020cdaf9919209a28497e9 url: "https://pub.dev" source: hosted - version: "14.7.15" + version: "14.7.19" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: d464b255e922c7915dc4b0ebc305ebad4e1f130519bee3d6e568ef2ea1613a4b + sha256: f7a9d74ff7fc588a924f6b2eaeaa148b0db521b13a9db55f6ad45864fa98c06e url: "https://pub.dev" source: hosted - version: "4.5.23" + version: "4.5.27" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: f3f71aeec719ec1fe2c99f75cd74d00d33f1c240cf1e402cc9d43883e84f935a + sha256: fc21e771166860c55b103701c5ac7cdb2eec28897b97c42e6e5703cbedf9e02e url: "https://pub.dev" source: hosted - version: "3.6.4" + version: "3.6.8" fixnum: dependency: transitive description: @@ -431,18 +431,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" flutter_local_notifications: dependency: "direct main" description: name: flutter_local_notifications - sha256: c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3 + sha256: "55b9b229307a10974b26296ff29f2e132256ba4bd74266939118eaefa941cb00" url: "https://pub.dev" source: hosted - version: "16.3.2" + version: "16.3.3" flutter_local_notifications_linux: dependency: transitive description: @@ -486,10 +486,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" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -555,10 +555,10 @@ packages: dependency: transitive description: name: image_picker_android - sha256: "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1" + sha256: "42c098e7fb6334746be37cdc30369ade356ed4f14d48b7a0313f95a9159f4321" url: "https://pub.dev" source: hosted - version: "0.8.9+3" + version: "0.8.9+5" image_picker_for_web: dependency: transitive description: @@ -571,10 +571,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3 + sha256: "917a5cadd67d052554cfb258595e54217de53fac5b52939426e26319a02e6297" url: "https://pub.dev" source: hosted - version: "0.8.9+1" + version: "0.8.9+2" image_picker_linux: dependency: transitive description: @@ -595,10 +595,10 @@ packages: dependency: transitive description: name: image_picker_platform_interface - sha256: fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b + sha256: "3d2c323daea9d60608f1caf30be32a938916f4975434b8352e6f73dae496da38" url: "https://pub.dev" source: hosted - version: "2.9.3" + version: "2.9.4" image_picker_windows: dependency: transitive description: @@ -832,10 +832,10 @@ packages: dependency: "direct dev" description: name: pigeon - sha256: ea0db5609f90eb26d6f3d7807558860d0eda5a908f99b3ad7eb6079a8c74378b + sha256: f336a0547b790b3dcfe4fc49f63575dea3555b609e38886f4f46c1fe3cfa5f20 url: "https://pub.dev" source: hosted - version: "17.2.0" + version: "17.3.0" platform: dependency: transitive description: @@ -912,10 +912,10 @@ packages: dependency: "direct main" description: name: share_plus_platform_interface - sha256: df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956 + sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.0" shelf: dependency: transitive description: @@ -1005,10 +1005,10 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: "072128763f1547e3e9b4735ce846bfd226d68019ccda54db4cd427b12dfdedc9" + sha256: "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.2" sqlite3_flutter_libs: dependency: "direct main" description: @@ -1021,10 +1021,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: dc384bb1f56d1384ce078edb5ff8247976abdab79d0c83e437210c85f06ecb61 + sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0" url: "https://pub.dev" source: hosted - version: "0.34.0" + version: "0.34.1" stack_trace: dependency: "direct dev" description: @@ -1125,10 +1125,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_android: dependency: "direct main" description: @@ -1141,10 +1141,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_linux: dependency: transitive description: @@ -1253,10 +1253,10 @@ packages: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.4.0" win32_registry: dependency: transitive description: From 8df3064123f72a5f43eb16a639026a31bbeb893a Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 4 Apr 2024 15:28:08 -0700 Subject: [PATCH 5/6] deps: Upgrade packages to latest Done because it's the first step in our plan for #612, the "Missing API declaration" warning from Apple. This is the result of `tools/upgrade pod-major`. No breaking changes requiring synchronous code changes were found. Changelogs: https://pub.dev/packages/device_info_plus/changelog https://pub.dev/packages/file_picker/changelog https://pub.dev/packages/flutter_local_notifications/changelog https://pub.dev/packages/package_info_plus/changelog https://pub.dev/packages/share_plus/changelog https://pub.dev/packages/pigeon/changelog All of these changelogs except `pigeon` mention adding "privacy info" or "privacy manifest" in the version we're taking here -- exactly the kind of thing we want to see, with #612 in mind. And `pigeon` shouldn't need one, as it's a dev dependency only, not part of the actual build. Related: #612 --- .../com/zulip/flutter/Notifications.g.kt | 7 +- ios/Podfile.lock | 16 ++-- lib/host/android_notifications.g.dart | 11 ++- macos/Podfile.lock | 14 ++-- pubspec.lock | 84 +++++++++---------- pubspec.yaml | 12 +-- 6 files changed, 74 insertions(+), 70 deletions(-) diff --git a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt b/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt index ac6f0a5732..d1b91c9614 100644 --- a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt +++ b/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v17.2.0), do not edit directly. +// Autogenerated from Pigeon (v18.0.0), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.zulip.flutter @@ -134,9 +134,10 @@ interface AndroidNotificationHostApi { } /** Sets up an instance of `AndroidNotificationHostApi` to handle messages through the `binaryMessenger`. */ @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: AndroidNotificationHostApi?) { + fun setUp(binaryMessenger: BinaryMessenger, api: AndroidNotificationHostApi?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.zulip.AndroidNotificationHostApi.notify", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.zulip.AndroidNotificationHostApi.notify$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List diff --git a/ios/Podfile.lock b/ios/Podfile.lock index cc57d1e9f1..e786a718c5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -42,10 +42,10 @@ PODS: - Firebase/Messaging (10.22.0): - Firebase/CoreOnly - FirebaseMessaging (~> 10.22.0) - - firebase_core (2.27.0): + - firebase_core (2.28.0): - Firebase/CoreOnly (= 10.22.0) - Flutter - - firebase_messaging (14.7.19): + - firebase_messaging (14.8.0): - Firebase/Messaging (= 10.22.0) - firebase_core - Flutter @@ -205,13 +205,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 - firebase_core: 100945864b4aedce3cfef0c62ab864858bf013cf - firebase_messaging: e65050bf9b187511d80ea3a4de7cf5573d2c7543 + firebase_core: d955499180c3c8ef355adf46b8752c4c01d09e0a + firebase_messaging: 23c8eaa885a11552e45c98b7a08ba81860092883 FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 @@ -223,11 +223,11 @@ SPEC CHECKSUMS: image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18 integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 nanopb: 438bc412db1928dac798aa6fd75726007be04262 - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 diff --git a/lib/host/android_notifications.g.dart b/lib/host/android_notifications.g.dart index 6c36eb66f1..9dcf09a74e 100644 --- a/lib/host/android_notifications.g.dart +++ b/lib/host/android_notifications.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v17.2.0), do not edit directly. +// Autogenerated from Pigeon (v18.0.0), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -80,12 +80,15 @@ class AndroidNotificationHostApi { /// Constructor for [AndroidNotificationHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - AndroidNotificationHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + AndroidNotificationHostApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _AndroidNotificationHostApiCodec(); + final String __pigeon_messageChannelSuffix; + /// Corresponds to `android.app.NotificationManager.notify`, /// combined with `androidx.core.app.NotificationCompat.Builder`. /// @@ -104,7 +107,7 @@ class AndroidNotificationHostApi { /// https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify /// https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder Future notify({String? tag, required int id, required String channelId, int? color, PendingIntent? contentIntent, String? contentText, String? contentTitle, Map? extras, String? smallIconResourceName,}) async { - const String __pigeon_channelName = 'dev.flutter.pigeon.zulip.AndroidNotificationHostApi.notify'; + final String __pigeon_channelName = 'dev.flutter.pigeon.zulip.AndroidNotificationHostApi.notify$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, pigeonChannelCodec, diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 0d20871de5..0b6bea27a6 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -8,10 +8,10 @@ PODS: - Firebase/Messaging (10.22.0): - Firebase/CoreOnly - FirebaseMessaging (~> 10.22.0) - - firebase_core (2.27.0): + - firebase_core (2.28.0): - Firebase/CoreOnly (~> 10.22.0) - FlutterMacOS - - firebase_messaging (14.7.19): + - firebase_messaging (14.8.0): - Firebase/CoreOnly (~> 10.22.0) - Firebase/Messaging (~> 10.22.0) - firebase_core @@ -150,11 +150,11 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: - device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f + device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 - firebase_core: 94cef1d79e26747286a4808b2345c1ecb8501b11 - firebase_messaging: b243cd1026362f3f5ec5e73ffb0c4431519f0b57 + firebase_core: 2c57be44d4fb5de6757fd8ebe04e363599daef36 + firebase_messaging: 6ee25816b47b604184e49b9e0c49334ebe555d06 FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 @@ -164,10 +164,10 @@ SPEC CHECKSUMS: GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 nanopb: 438bc412db1928dac798aa6fd75726007be04262 - package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce + package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 + share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 sqlite3_flutter_libs: 06a05802529659a272beac4ee1350bfec294f386 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 diff --git a/pubspec.lock b/pubspec.lock index 9d88d3cf75..18509fd60a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "4eec93681221723a686ad580c2e7d960e1017cf1a4e0a263c2573c2c6b0bf5cd" + sha256: "79b6452b4066fcbdd74c2aac354e80c591a727e0364bedccecdb5a5321784fa2" url: "https://pub.dev" source: hosted - version: "1.3.25" + version: "1.3.28" analyzer: dependency: transitive description: @@ -221,10 +221,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.4+1" crypto: dependency: "direct main" description: @@ -261,10 +261,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: "50fb435ed30c6d2525cbfaaa0f46851ea6131315f213c0d921b0e407b34e3b84" url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "10.0.1" device_info_plus_platform_interface: dependency: transitive description: @@ -277,18 +277,18 @@ packages: dependency: "direct main" description: name: drift - sha256: b50a8342c6ddf05be53bda1d246404cbad101b64dc73e8d6d1ac1090d119b4e2 + sha256: "3b276c838ff7f8e19aac18a51f9b388715268f3534eaaf8047c8455ef3c1738d" url: "https://pub.dev" source: hosted - version: "2.15.0" + version: "2.16.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: c037d9431b6f8dc633652b1469e5f53aaec6e4eb405ed29dd232fa888ef10d88 + sha256: "66cf3e397448f855523d7b6b7b3789db232b211db96543a42285464d05f3bf72" url: "https://pub.dev" source: hosted - version: "2.15.0" + version: "2.16.0" fake_async: dependency: "direct dev" description: @@ -317,10 +317,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4" + sha256: d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "8.0.0+1" file_selector_linux: dependency: transitive description: @@ -357,10 +357,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "53316975310c8af75a96e365f9fccb67d1c544ef0acdbf0d88bbe30eedd1c4f9" + sha256: "4b45655ec1b21a1783681f72f840a2e74d298046c2b7c286ab0e4f0efbf93d0a" url: "https://pub.dev" source: hosted - version: "2.27.0" + version: "2.28.0" firebase_core_platform_interface: dependency: transitive description: @@ -373,34 +373,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: c8e1d59385eee98de63c92f961d2a7062c5d9a65e7f45bdc7f1b0b205aab2492 + sha256: "28e30e00748497b9a70db2025942a42c5d752534eb678e9b9b98db056cf404ba" url: "https://pub.dev" source: hosted - version: "2.11.5" + version: "2.14.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: e41586e0fd04fe9a40424f8b0053d0832e6d04f49e020cdaf9919209a28497e9 + sha256: "502233442839406198c34458a4ff71ca3350cc7be88ce06a8b729cbd2162ef57" url: "https://pub.dev" source: hosted - version: "14.7.19" + version: "14.8.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: f7a9d74ff7fc588a924f6b2eaeaa148b0db521b13a9db55f6ad45864fa98c06e + sha256: "9438353a857c8000b0680d7ee246acb14fb854c4a14df4ebc7e1efde166903ac" url: "https://pub.dev" source: hosted - version: "4.5.27" + version: "4.5.30" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: fc21e771166860c55b103701c5ac7cdb2eec28897b97c42e6e5703cbedf9e02e + sha256: "6672c1c41e79d607b1ce0bbf1c6dcf97f7894b98bf65fe806e40d62a700bae3a" url: "https://pub.dev" source: hosted - version: "3.6.8" + version: "3.8.0" fixnum: dependency: transitive description: @@ -439,10 +439,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "55b9b229307a10974b26296ff29f2e132256ba4bd74266939118eaefa941cb00" + sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1 url: "https://pub.dev" source: hosted - version: "16.3.3" + version: "17.0.0" flutter_local_notifications_linux: dependency: transitive description: @@ -523,10 +523,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" http_multi_server: dependency: transitive description: @@ -563,10 +563,10 @@ packages: dependency: transitive description: name: image_picker_for_web - sha256: e2423c53a68b579a7c37a1eda967b8ae536c3d98518e5db95ca1fe5719a730a3 + sha256: "6a1704fdd75022272e7e7a897a9068e9c2ff3cd6a66820bf3ded810633eac954" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" image_picker_ios: dependency: transitive description: @@ -632,10 +632,10 @@ packages: 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: @@ -752,10 +752,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "6.0.0" package_info_plus_platform_interface: dependency: transitive description: @@ -832,10 +832,10 @@ packages: dependency: "direct dev" description: name: pigeon - sha256: f336a0547b790b3dcfe4fc49f63575dea3555b609e38886f4f46c1fe3cfa5f20 + sha256: be883401d09121c427ed9c5f6e96427787d93d335f55e5e2b0d780a0a22cd561 url: "https://pub.dev" source: hosted - version: "17.3.0" + version: "18.0.0" platform: dependency: transitive description: @@ -904,10 +904,10 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900" + sha256: "05ec043470319bfbabe0adbc90d3a84cbff0426b9d9f3a6e2ad3e131fa5fa629" url: "https://pub.dev" source: hosted - version: "7.2.2" + version: "8.0.2" share_plus_platform_interface: dependency: "direct main" description: @@ -1173,10 +1173,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" url_launcher_windows: dependency: transitive description: @@ -1221,18 +1221,18 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" webdriver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4ece9b612a..729290ae15 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,23 +43,23 @@ dependencies: collection: ^1.17.2 convert: ^3.1.1 crypto: ^3.0.3 - device_info_plus: ^9.0.0 + device_info_plus: ^10.0.1 drift: ^2.5.0 - file_picker: ^6.0.0 + file_picker: ^8.0.0+1 firebase_core: ^2.14.0 firebase_messaging: ^14.6.3 flutter_color_models: ^1.3.3+2 - flutter_local_notifications: ^16.1.0 + flutter_local_notifications: ^17.0.0 flutter_local_notifications_platform_interface: ^7.0.0+1 html: ^0.15.1 http: ^1.0.0 image_picker: ^1.0.0 intl: ^0.19.0 json_annotation: ^4.8.1 - package_info_plus: ^5.0.1 + package_info_plus: ^6.0.0 path: ^1.8.3 path_provider: ^2.0.13 - share_plus: ^7.0.0 + share_plus: ^8.0.2 share_plus_platform_interface: ^3.3.1 sqlite3: ^2.4.0 sqlite3_flutter_libs: ^0.5.13 @@ -84,7 +84,7 @@ dev_dependencies: fake_async: ^1.3.1 flutter_lints: ^3.0.0 json_serializable: ^6.5.4 - pigeon: ^17.2.0 + pigeon: ^18.0.0 stack_trace: ^1.11.1 test: ^1.23.1 # Keep list sorted when adding dependencies; it helps prevent merge conflicts. From a7ed31eb7c4da4bf4c2d7124731cdb8752b05c18 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Fri, 5 Apr 2024 13:47:15 -0700 Subject: [PATCH 6/6] ios: Proactively bump min iOS version to 14.0, matching zulip-mobile We could almost certainly bump it to 15, based on the last platform-version statistics Greg posted, and that was in 2023-09: https://chat.zulip.org/#narrow/stream/48-mobile/topic/platform.20versions/near/1648327 But there isn't specific code we want to write for iOS 15 features right now, so might as well leave that for later. In fact, I don't think there's a particularly strong need to bump it to 14, at least at the moment. But there's no reason it needs to lag behind zulip-mobile. And in case the lower threshold would be an obstacle later on, it's nice to have it cleared away proactively ahead of time. --- ios/Podfile | 4 +++- ios/Podfile.lock | 2 +- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 70212f20c8..1fe9fe3125 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,4 +1,6 @@ -platform :ios, '12.0' +# This should match the iOS Deployment Target +# (in Xcode, that's in project > Runner > Info) +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e786a718c5..d5a52a62fe 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -233,6 +233,6 @@ SPEC CHECKSUMS: SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 -PODFILE CHECKSUM: 6998435987a000fdec9b2e1b5b1eef6d54bdba77 +PODFILE CHECKSUM: 7ed5116924b3be7e8fb75f7aada61e057028f5c7 COCOAPODS: 1.13.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4d166f72a9..1dea534dba 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -344,7 +344,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 = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -423,7 +423,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 = 14.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -472,7 +472,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 = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos;