From e09eec7f0b1dc24e4e004c00a5a39b2172b2de23 Mon Sep 17 00:00:00 2001
From: Eric Seidel <github@eseidel.com>
Date: Mon, 28 Aug 2023 12:00:43 +0000
Subject: [PATCH] Update to Flutter 3.13.0 / Dart 3.1

---
 coverage.sh                 | 13 +++++++--
 packages/types/pubspec.yaml |  4 ++-
 packages/ui/pubspec.lock    | 56 +++++++++++++++++++++----------------
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/coverage.sh b/coverage.sh
index 88d1895c..7839edd5 100755
--- a/coverage.sh
+++ b/coverage.sh
@@ -3,7 +3,8 @@
 # A script for computing combined coverage for all packages in the repo.
 # This can be used for viewing coverage locally in your editor.
 
-PACKAGES='cli db server types ui'
+# No ui tests yet, so not testing ui package.
+PACKAGES='cli db server types'
 
 dart pub global activate coverage
 
@@ -11,8 +12,14 @@ for PACKAGE_DIR in $PACKAGES
 do
     echo $PACKAGE_DIR
     cd packages/$PACKAGE_DIR
-    dart pub get
-    dart test --coverage=coverage
+    if [ $PACKAGE_DIR="ui" ]
+    then
+        flutter pub get
+        flutter test --coverage
+    else
+        dart pub get
+        dart test --coverage=coverage
+    fi
     dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=lib --check-ignore
     cd ../..
 done
diff --git a/packages/types/pubspec.yaml b/packages/types/pubspec.yaml
index edbfc8e7..4f68f8dc 100644
--- a/packages/types/pubspec.yaml
+++ b/packages/types/pubspec.yaml
@@ -12,7 +12,9 @@ dependencies:
   intl: ^0.17.0
   # We only want the model types.
   meta: ^1.9.1
-  more: ^4.0.1
+  # Flutter 3.13.0 is pinned to collection 1.17.2
+  # So we can't use more 4.0.1+ until Flutter upgrades collection.
+  more: ^4.0.0
   openapi:
     path: ../openapi
 
diff --git a/packages/ui/pubspec.lock b/packages/ui/pubspec.lock
index 06e8dc8b..92f95509 100644
--- a/packages/ui/pubspec.lock
+++ b/packages/ui/pubspec.lock
@@ -68,10 +68,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   crypto:
     dependency: transitive
     description:
@@ -158,14 +158,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   json_annotation:
     dependency: transitive
     description:
@@ -186,26 +178,26 @@ packages:
     dependency: transitive
     description:
       name: mason_logger
-      sha256: "389dda35ee44c8664490749b204de1ee2dd91fbe9a725c2798f3232010dc53de"
+      sha256: c12860ae81f0bdc5d05d7914fe473bfb294047e9dc64e8995b5753c7207e81b9
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.6"
+    version: "0.2.8"
   matcher:
     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:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
@@ -282,7 +274,7 @@ packages:
     description:
       path: "packages/scoped"
       ref: HEAD
-      resolved-ref: "2d6231459ce90dfac2e38f4ae53f022b7682398d"
+      resolved-ref: "5526748ecfc64ec22f921432a73aec509e60c125"
       url: "https://github.com/shorebirdtech/shorebird.git"
     source: git
     version: "0.1.0+1"
@@ -290,10 +282,10 @@ packages:
     dependency: transitive
     description:
       name: sembast
-      sha256: da8dd3774b6001bde09378da28e94c40bd4daecde32adb44837517c12e991321
+      sha256: "85ff944434f7b566fdc388be4f85b23e954736b7d6e51f965f4f419d966c15b1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.9"
+    version: "3.5.0+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -303,10 +295,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -359,10 +351,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -402,6 +394,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0+1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
 sdks:
-  dart: ">=3.0.6 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.3.0"