From 0de009527a9ba0775547fe7bb3b177be2996cd70 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Thu, 1 Aug 2024 16:00:07 -0700
Subject: [PATCH 1/2] Update a number of dependencies

Fixes https://github.com/flutter/devtools/issues/4569
---
 packages/devtools_app/pubspec.yaml        | 9 ++++-----
 packages/devtools_app_shared/pubspec.yaml | 4 ++--
 packages/devtools_extensions/pubspec.yaml | 2 +-
 packages/devtools_shared/pubspec.yaml     | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index 172d038a0bd..d9ac6ab2c9b 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml
@@ -31,8 +31,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_markdown: ^0.7.1
-  # TODO: https://github.com/flutter/devtools/issues/4569 - unpin this version
-  flutter_riverpod: 2.0.0-dev.9
+  flutter_riverpod: ^2.5.1
   flutter_web_plugins:
     sdk: flutter
   http: ^1.1.0
@@ -45,7 +44,7 @@ dependencies:
   path: ^1.8.0
   perfetto_ui_compiled:
     path: ../../third_party/packages/perfetto_ui_compiled
-  pointer_interceptor: ^0.9.3+3
+  pointer_interceptor: ^0.10.1+1
   provider: ^6.0.2
   # Only used for debug mode logic.
   shared_preferences: ^2.0.15
@@ -57,8 +56,8 @@ dependencies:
   vm_service: ^14.2.1
   vm_service_protos: ^1.0.0
   vm_snapshot_analysis: ^0.7.6
-  web: ^0.5.0
-  web_socket_channel: ^2.1.0
+  web: ^1.0.0
+  web_socket_channel: ^3.0.0
 
 dev_dependencies:
   args: ^2.4.2
diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml
index 4042f9bf0bb..cc332f2f82b 100644
--- a/packages/devtools_app_shared/pubspec.yaml
+++ b/packages/devtools_app_shared/pubspec.yaml
@@ -17,10 +17,10 @@ dependencies:
   logging: ^1.1.1
   meta: ^1.9.1
   path: ^1.8.0
-  pointer_interceptor: ^0.9.3+3
+  pointer_interceptor: ^0.10.1+1
   url_launcher: ^6.1.0
   vm_service: ^14.2.1
-  web: ^0.5.0
+  web: ^1.0.0
 
 dev_dependencies:
   flutter_lints: ^4.0.0
diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml
index ecf12b95b23..fee9c4e960a 100644
--- a/packages/devtools_extensions/pubspec.yaml
+++ b/packages/devtools_extensions/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   path: ^1.8.0
   logging: ^1.1.1
   vm_service: ^14.2.1
-  web: ^0.5.0
+  web: ^1.0.0
   yaml: ^3.1.2
 
 dev_dependencies:
diff --git a/packages/devtools_shared/pubspec.yaml b/packages/devtools_shared/pubspec.yaml
index d75b29362c3..bddb0847722 100644
--- a/packages/devtools_shared/pubspec.yaml
+++ b/packages/devtools_shared/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   shelf: ^1.1.0
   sse: ^4.1.2
   vm_service: ">=13.0.0 <15.0.0"
-  web_socket_channel: ^2.4.0
+  web_socket_channel: ^3.0.0
   webkit_inspection_protocol: ">=0.5.0 <2.0.0"
   yaml: ^3.1.2
   yaml_edit: ^2.1.1

From 1898b6f9f294f41bea8c74d131d98b409da71c64 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Thu, 1 Aug 2024 17:15:35 -0700
Subject: [PATCH 2/2] do not touch riverpod

---
 packages/devtools_app/pubspec.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index d9ac6ab2c9b..d6c9c5bf5ad 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml
@@ -25,13 +25,14 @@ dependencies:
   devtools_extensions: ^0.3.0-wip
   devtools_shared: ^10.0.1
   dtd: ^2.3.0
-  file: ">=6.0.0 <8.0.0"
+  file: ^7.0.0
   file_selector: ^1.0.0
   fixnum: ^1.1.0
   flutter:
     sdk: flutter
   flutter_markdown: ^0.7.1
-  flutter_riverpod: ^2.5.1
+  # TODO: https://github.com/flutter/devtools/issues/4569 - unpin this version
+  flutter_riverpod: 2.0.0-dev.9
   flutter_web_plugins:
     sdk: flutter
   http: ^1.1.0