From 7567756f237b4964f001189307504a71723c66b9 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 5 Jun 2023 13:00:52 -0700 Subject: [PATCH 1/3] deps: Upgrade Flutter to latest main, 3.11.0-18.0.pre.81 And update Flutter's supporting libraries to match, namely matcher, test, test_api, and test_core. --- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 53300e066d..a796698bf0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -500,10 +500,10 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: @@ -833,26 +833,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "4f92f103ef63b1bbac6f4bd1930624fca81b2574464482512c4f0896319be575" + sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" url: "https://pub.dev" source: hosted - version: "1.24.2" + version: "1.24.3" test_api: dependency: transitive description: name: test_api - sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.2" + version: "0.6.0" test_core: dependency: transitive description: name: test_core - sha256: "3642b184882f79e76ca57a9230fb971e494c3c1fd09c21ae3083ce891bcc0aa1" + sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" url: "https://pub.dev" source: hosted - version: "0.5.2" + version: "0.5.3" timing: dependency: transitive description: @@ -982,5 +982,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-155.0.dev <4.0.0" - flutter: ">=3.11.0-16.0.pre.11" + dart: ">=3.1.0-163.0.dev <4.0.0" + flutter: ">=3.11.0-18.0.pre.81" diff --git a/pubspec.yaml b/pubspec.yaml index 86325e1a73..7ade5cf673 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-155.0.dev <4.0.0' - flutter: '>=3.11.0-16.0.pre.11' + sdk: '>=3.1.0-163.0.dev <4.0.0' + flutter: '>=3.11.0-18.0.pre.81' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 38bb7688c228cc307ba0fcccc72481db57ffa803 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 5 Jun 2023 13:04:16 -0700 Subject: [PATCH 2/3] deps: Upgrade packages within constraints (flutter pub upgrade) There are currently no upgrades that `--major-versions` would add beyond these. --- pubspec.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a796698bf0..31e5f7f2b4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: args - sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" async: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: "7dd62d9faf105c434f3d829bbe9c4be02ec67f5ed94832222116122df67c5452" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" url: "https://pub.dev" source: hosted - version: "8.6.0" + version: "8.6.1" characters: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: @@ -261,18 +261,18 @@ packages: dependency: "direct main" description: name: drift - sha256: "21abd7b1c1a637a264f58f9f05c7b910d29c204aab1cbfcb4d9fada1e98a9303" + sha256: "708ca5cba66a0f18a2632ffbf3d5181d63bc67e746b370dbe403758120e32f0e" url: "https://pub.dev" source: hosted - version: "2.8.0" + version: "2.8.1" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: "387a3a70047ae90cbef4c9262a7f833c7c274b7cc22133faf067c2e9cef84c60" + sha256: "4704966d9eb8f5717bebad7e722397d8150235f4bb1d64eb8b22c55d4566cf6a" url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.8.3" fake_async: dependency: "direct dev" description: @@ -412,10 +412,10 @@ packages: dependency: transitive description: name: image_picker_android - sha256: c2f3c66400649bd132f721c88218945d6406f693092b2f741b79ae9cdb046e59 + sha256: "3083c3a3245adf9f3eb7bacf0eaa6a1f087dd538fab73a13a2f7907602601692" url: "https://pub.dev" source: hosted - version: "0.8.6+16" + version: "0.8.6+19" image_picker_for_web: dependency: transitive description: @@ -484,10 +484,10 @@ packages: dependency: transitive description: name: lints - sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" logging: dependency: transitive description: @@ -548,10 +548,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "28386bbe89ab5a7919a47cea99cdd1128e5a6e0bbd7eaafe20440ead84a15de3" + sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" package_info_plus_platform_interface: dependency: transitive description: @@ -769,10 +769,10 @@ packages: dependency: transitive description: name: sqlite3 - sha256: "2cef47b59d310e56f8275b13734ee80a9cf4a48a43172020cb55a620121fbf66" + sha256: "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.2" sqlite3_flutter_libs: dependency: "direct main" description: @@ -785,10 +785,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: "0d2c9a3b554baa10b2560d69a1c7cabd4687cc08041a7dd3d2dc6992f607b400" + sha256: "72f15efc63aacce81ed5081e408e2610f7dc1f5846df4a2acbd21ac6a7138577" url: "https://pub.dev" source: hosted - version: "0.30.0" + version: "0.30.1" stack_trace: dependency: transitive description: From b797009bcc9ec27cb3516581ec7f25e3a52ae8b5 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 5 Jun 2023 13:07:07 -0700 Subject: [PATCH 3/3] deps: Bump json_annotation lower bound to latest, 4.8.1 Otherwise we get the following warning when running build_runner (wrapped here for readability): [WARNING] json_serializable on lib/api/route/users.dart: The version constraint "^4.8.0" on json_annotation allows versions before 4.8.1 which is not allowed. I believe that warning was introduced with the json_serializable upgrade from 6.6.2 to 6.7.0 in f28dd0bfc / #137. --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7ade5cf673..43fee0a3a4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -41,7 +41,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - json_annotation: ^4.8.0 + json_annotation: ^4.8.1 http: ^0.13.5 html: ^0.15.1 intl: ^0.18.0