From 13a52d66c840ab0f13752edd51a5eb4653548e3e Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Thu, 27 Mar 2025 12:01:07 -0700 Subject: [PATCH 1/2] ios build: Take lines added by the `flutter` tool Greg found that this is a side effect of the Flutter upgrade in PR #1426: https://github.com/zulip/zulip-flutter/pull/1444#discussion_r2015640139 > And indeed, `git log -G flutter_lldbinit` in the Flutter tree > finds this from earlier this month, 2025-03-06: > flutter/flutter@eb07c5123 Committing it here, after building for iOS, which we forgot to do when preparing that PR. --- ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c53e2b314e..9c12df59c6 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES"> Date: Wed, 26 Mar 2025 18:32:23 -0700 Subject: [PATCH 2/2] ios deps: Take auto updates to Podfile.lock These are needed because #1426 didn't include the `pod` step of `tools/upgrade`. Done by building for iOS, then (when I remembered that macOS/Podfile.lock needs updating too) `tools/upgrade pod`. --- ios/Podfile.lock | 28 ++++++++++++++-------------- macos/Podfile.lock | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e233f1ff9c..ea92d3df55 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -212,14 +212,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/wakelock_plus/ios" SPEC CHECKSUMS: - app_settings: 5127ae0678de1dcc19f2293271c51d37c89428b2 - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe + app_settings: 58017cd26b604ae98c3e65acbdd8ba173703cc82 + device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be + file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49 Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf - firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510 - firebase_messaging: 8b96a4f09841c15a16b96973ef5c3dcfc1a064e4 + firebase_core: ac395f994af4e28f6a38b59e05a88ca57abeb874 + firebase_messaging: 7e223f4ee7ca053bf4ce43748e84a6d774ec9728 FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 @@ -227,20 +227,20 @@ SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a - integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e + image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 + integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868 - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a + share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983 - sqlite3_flutter_libs: f8fc13346870e73fe35ebf6dbb997fbcd156b241 + sqlite3_flutter_libs: cc304edcb8e1d8c595d1b08c7aeb46a47691d9db SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d - video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b - wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 + wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56 PODFILE CHECKSUM: 7ed5116924b3be7e8fb75f7aada61e057028f5c7 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 92123a7e30..83d38cb17e 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -168,13 +168,13 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos SPEC CHECKSUMS: - app_settings: cd21e176b56f8172043640ade81322a98896bff4 - device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76 - file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a - file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31 + app_settings: 140be3a9c0fc1f681e44afe9f549ab037b3aa3a2 + device_info_plus: 1b14eed9bf95428983aed283a8d51cce3d8c4215 + file_picker: e716a70a9fe5fd9e09ebc922d7541464289443af + file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d Firebase: 973c28133496aab0223e9ea99f0abafb9f91ad58 - firebase_core: 3dcdf8453dfb144a023ee70f49e0463b97177f71 - firebase_messaging: 96fe41b2f8b5bee4e0f21df8d716cb8c9293448c + firebase_core: 1b573eac37729348cdc472516991dd7e269ae37e + firebase_messaging: 0620038ea399ceae2218c9087fca00a28f576209 FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 @@ -183,15 +183,15 @@ SPEC CHECKSUMS: GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: f0052d280d17aa382b932f399edf32507174e870 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc + share_plus: 1fa619de8392a4398bfaf176d441853922614e89 sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983 - sqlite3_flutter_libs: f8fc13346870e73fe35ebf6dbb997fbcd156b241 - url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673 - video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b - wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497 + sqlite3_flutter_libs: cc304edcb8e1d8c595d1b08c7aeb46a47691d9db + url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 + wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 PODFILE CHECKSUM: bd6842df0dd91920553fbfacd50c921f7e63a62f