From e681ed3739e4da4c3869e97d1bb1feb788ac4b1a Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 30 May 2023 14:34:02 -0700 Subject: [PATCH 1/5] lint: Update database.g.dart to suppress unnecessary_cast too This happens automatically if you rerun build_runner. Seems like its omission was basically a mismerge between 901a99eb8, when it was merged early from #84: https://github.com/zulip/zulip-flutter/pull/84#issuecomment-153384586 and 780b09283 / #22, which added this file. Chalk it up as another occasion where #60 would have helped keep things clean. --- lib/model/database.g.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/model/database.g.dart b/lib/model/database.g.dart index 613c5919ae..a7964f85a1 100644 --- a/lib/model/database.g.dart +++ b/lib/model/database.g.dart @@ -1,5 +1,7 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: unnecessary_cast + part of 'database.dart'; // ignore_for_file: type=lint From f25242c466c45080d5f036cc5192069737129f8a Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 30 May 2023 14:40:15 -0700 Subject: [PATCH 2/5] deps: Upgrade drift, drift_dev, sqlparser The upgrade to drift_dev 2.8.x seems to be required in order to work with the upgrade to analyzer 5.12.0 that we took in 861a92911. The others are in turn required for that. This makes another occasion where having CI, #60, would have helped keep things clean for us. --- pubspec.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 0ea7944a69..5e21651ad3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -261,18 +261,18 @@ packages: dependency: "direct main" description: name: drift - sha256: "1eaef0a152f1b3dc2e3ad3b04f900794bbe5a2833c26a85794ed1f7e5b7320ce" + sha256: "21abd7b1c1a637a264f58f9f05c7b910d29c204aab1cbfcb4d9fada1e98a9303" url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.8.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: b6c2b1bcf637d34142bf9a0c21d1d290ade2254538be00559360db165b524381 + sha256: "387a3a70047ae90cbef4c9262a7f833c7c274b7cc22133faf067c2e9cef84c60" url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.8.2" fake_async: dependency: "direct dev" description: @@ -785,10 +785,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: "11ebfd764085a96261f44f90cbf475927c508e654d4be30ee4832d564d06d86b" + sha256: "0d2c9a3b554baa10b2560d69a1c7cabd4687cc08041a7dd3d2dc6992f607b400" url: "https://pub.dev" source: hosted - version: "0.28.1" + version: "0.30.0" stack_trace: dependency: transitive description: From f1ab96cc509db1ac90f73f5214ce6bb7dc2fed41 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 30 May 2023 15:23:59 -0700 Subject: [PATCH 3/5] deps: Upgrade watcher With a recent Dart SDK from Flutter main, this is required in order for build_runner to work. Otherwise it gives an error like (reformatted): Failed to build build_runner:build_runner: ../../.pub-cache/hosted/pub.dev/watcher-1.0.2/lib/src/constructable_file_system_event.dart:7:57: Error: The class 'FileSystemEvent' can't be extended, implemented, or mixed in outside of its library because it's a sealed class. abstract class _ConstructableFileSystemEvent implements FileSystemEvent { --- pubspec.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 5e21651ad3..f9559f64a2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -929,10 +929,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" web_socket_channel: dependency: transitive description: From 06f853cee420cf8f5a86b6cccb6544905242c13b Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 30 May 2023 15:27:18 -0700 Subject: [PATCH 4/5] deps: Upgrade Flutter to latest main, 3.11.0-16.0.pre.11 --- pubspec.lock | 4 ++-- pubspec.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f9559f64a2..56ecb590dd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -982,5 +982,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-129.0.dev <4.0.0" - flutter: ">=3.11.0-11.0.pre.15" + dart: ">=3.1.0-155.0.dev <4.0.0" + flutter: ">=3.11.0-16.0.pre.11" diff --git a/pubspec.yaml b/pubspec.yaml index e2603fb23f..07225b8d73 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.1.0-129.0.dev <4.0.0' - flutter: '>=3.11.0-11.0.pre.15' + sdk: '>=3.1.0-155.0.dev <4.0.0' + flutter: '>=3.11.0-16.0.pre.11' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From f28dd0bfcb5253fd34a311b0daf896c1266690c0 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 30 May 2023 15:30:24 -0700 Subject: [PATCH 5/5] deps: Upgrade packages within constraints (flutter pub upgrade) There are currently no upgrades that `--major-versions` would add beyond these. --- pubspec.lock | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 56ecb590dd..53300e066d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "405666cd3cf0ee0a48d21ec67e65406aad2c726d9fa58840d3375e7bdcd32a07" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "60.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "1952250bd005bacb895a01bf1b4dc00e3ba1c526cf47dca54dfe24979c65f5b3" + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.12.0" + version: "5.13.0" analyzer_plugin: dependency: transitive description: @@ -93,18 +93,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "87e06c939450b9b94e3e1bb2d46e0e9780adbff5500d3969f2ba2de6bbb860cb" + sha256: "220ae4553e50d7c21a17c051afc7b183d28a24a420502e842f303f8e4e6edced" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "30859c90e9ddaccc484f56303931f477b1f1ba2bab74aa32ed5d6ce15870f8cf" + sha256: "88a57f2ac99849362e73878334caa9f06ee25f31d2adced882b8337838c84e1e" url: "https://pub.dev" source: hosted - version: "7.2.8" + version: "7.2.9" built_collection: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d" + sha256: "7dd62d9faf105c434f3d829bbe9c4be02ec67f5ed94832222116122df67c5452" url: "https://pub.dev" source: hosted - version: "8.5.0" + version: "8.6.0" characters: dependency: transitive description: @@ -221,10 +221,10 @@ packages: dependency: transitive description: name: csslib - sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" url: "https://pub.dev" source: hosted - version: "0.17.2" + version: "0.17.3" cupertino_icons: dependency: "direct main" description: @@ -245,10 +245,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "9b1a0c32b2a503f8fe9f8764fac7b5fcd4f6bd35d8f49de5350bccf9e2a33b8a" + sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b" url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "9.0.2" device_info_plus_platform_interface: dependency: transitive description: @@ -301,10 +301,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: c7a8e25ca60e7f331b153b0cb3d405828f18d3e72a6fa1d9440c86556fffc877 + sha256: "9d6e95ec73abbd31ec54d0e0df8a961017e165aba1395e462e5b31ea0c165daf" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.3.1" fixnum: dependency: transitive description: @@ -330,10 +330,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0" + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.0.15" flutter_test: dependency: "direct dev" description: flutter @@ -356,18 +356,18 @@ packages: dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" graphs: dependency: transitive description: name: graphs - sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" html: dependency: "direct main" description: @@ -404,18 +404,18 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "3da954c3b8906d82ecb50fd5e2b5401758f06d5678904eed6cbc06172283a263" + sha256: "9978d3510af4e6a902e545ce19229b926e6de6a1828d6134d3aab2e129a4d270" url: "https://pub.dev" source: hosted - version: "0.8.7+4" + version: "0.8.7+5" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: "271e0448e82268b3fa1cb2a48e4a911cbc2135587123d7df8e7ca703c5b10da2" + sha256: c2f3c66400649bd132f721c88218945d6406f693092b2f741b79ae9cdb046e59 url: "https://pub.dev" source: hosted - version: "0.8.6+11" + version: "0.8.6+16" image_picker_for_web: dependency: transitive description: @@ -428,10 +428,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: a1546ff5861fc15812953d4733b520c3d371cec3d2859a001ff04c46c4d81883 + sha256: d779210bda268a03b57e923fb1e410f32f5c5e708ad256348bcbf1f44f558fd0 url: "https://pub.dev" source: hosted - version: "0.8.7+3" + version: "0.8.7+4" image_picker_platform_interface: dependency: transitive description: @@ -476,10 +476,10 @@ packages: dependency: "direct dev" description: name: json_serializable - sha256: "43793352f90efa5d8b251893a63d767b2f7c833120e3cc02adad55eefec04dc7" + sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4" url: "https://pub.dev" source: hosted - version: "6.6.2" + version: "6.7.0" lints: dependency: transitive description: @@ -492,10 +492,10 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" matcher: dependency: transitive description: @@ -596,10 +596,10 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.1.11" path_provider_platform_interface: dependency: transitive description: @@ -676,10 +676,10 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "322a1ec9d9fe07e2e2252c098ce93d12dbd06133cc4c00ffe6a4ef505c295c17" + sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.2" share_plus_platform_interface: dependency: transitive description: @@ -729,10 +729,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "378a173055cd1fcd2a36e94bf254786d6812688b5f53b6038a2fd180a5a5e210" + sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" source_helper: dependency: transitive description: @@ -769,18 +769,18 @@ packages: dependency: transitive description: name: sqlite3 - sha256: a3ba4b66a7ab170ce7aa3f5ac43c19ee8d6637afbe7b7c95c94112b4f4d91566 + sha256: "2cef47b59d310e56f8275b13734ee80a9cf4a48a43172020cb55a620121fbf66" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "02f80aea54a19a36b347dedf6d4181ecd9107f5831ea6139cfd0376a3de197ba" + sha256: "1e20a88d5c7ae8400e009f38ddbe8b001800a6dffa37832481a86a219bc904c7" url: "https://pub.dev" source: hosted - version: "0.5.13" + version: "0.5.15" sqlparser: dependency: transitive description: @@ -889,10 +889,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab" url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" url_launcher_windows: dependency: transitive description: @@ -921,10 +921,10 @@ packages: dependency: transitive description: name: vm_service - sha256: d1ba6ce3fa60807433511f943b51607bd7073f8fe5c14286d66fec8e05c8d24c + sha256: f3743ca475e0c9ef71df4ba15eb2d7684eecd5c8ba20a462462e4e8b561b2e11 url: "https://pub.dev" source: hosted - version: "11.5.0" + version: "11.6.0" watcher: dependency: transitive description: