From 9b2bd1e1492dc3648c4d66910897beb1d1e41793 Mon Sep 17 00:00:00 2001
From: adsonpleal <adsonpleal@gmail.com>
Date: Wed, 3 Dec 2025 18:05:46 -0300
Subject: [PATCH 1/3] [shared_preferences_tool] Update dependencies and fix
 deprecation

---
 .../shared_preferences/CHANGELOG.md           |  1 +
 .../lib/src/shared_preferences_tool_eval.dart |  1 +
 .../shared_preferences_tool/pubspec.yaml      | 10 ++++----
 ...preferences_state_notifier_test.mocks.dart | 16 +++++++------
 .../shared_preferences_tool_eval_test.dart    |  1 +
 .../test/src/ui/data_panel_test.dart          |  1 -
 .../test/src/ui/error_panel_test.dart         |  1 -
 .../test/src/ui/keys_panel_test.dart          |  1 -
 .../src/ui/shared_preferences_body_test.dart  |  1 -
 .../notifier_mocking_helpers.mocks.dart       |  4 +++-
 .../shared_preferences_tool/web/index.html    | 23 +------------------
 11 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md
index 4af79c663b2..b9089427258 100644
--- a/packages/shared_preferences/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## NEXT
 
+* Updates shared preferences devtools extension dependencies
 * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
 * Updates README to reflect currently supported OS versions for the latest
   versions of the endorsed platform implementations.
diff --git a/packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_tool_eval.dart b/packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_tool_eval.dart
index 9a61fd08f0b..deffd31a22f 100644
--- a/packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_tool_eval.dart
+++ b/packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_tool_eval.dart
@@ -6,6 +6,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:devtools_app_shared/service.dart';
+import 'package:devtools_app_shared/utils.dart';
 import 'package:vm_service/vm_service.dart';
 
 import 'shared_preferences_state.dart';
diff --git a/packages/shared_preferences/shared_preferences_tool/pubspec.yaml b/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
index bafd381ac21..09640167a1e 100644
--- a/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
@@ -5,20 +5,20 @@ publish_to: 'none'
 version: 1.0.1
 
 environment:
-  sdk: ^3.8.0
+  sdk: ^3.9.0
 
 dependencies:
-  devtools_app_shared: ^0.3.0
-  devtools_extensions: ^0.3.0
+  devtools_app_shared: ^0.4.0
+  devtools_extensions: ^0.4.0
   flutter:
     sdk: flutter
   vm_service: '>=14.3.0 <16.0.0'
 
 dev_dependencies:
-  build_runner: ^2.4.10
+  build_runner: ^2.10.4
   flutter_test:
     sdk: flutter
-  mockito: 5.4.4
+  mockito: 5.6.1
 
 flutter:
   uses-material-design: true
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
index 89fb66be1f0..e62396930c6 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in shared_preferences_tool/test/src/shared_preferences_state_notifier_test.dart.
 // Do not manually edit this file.
 
@@ -21,10 +21,12 @@ import 'package:shared_preferences_tool/src/shared_preferences_tool_eval.dart'
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeCompleter_0<T> extends _i1.SmartFake implements _i2.Completer<T> {
   _FakeCompleter_0(Object parent, Invocation parentInvocation)
@@ -120,12 +122,6 @@ class MockConnectedApp extends _i1.Mock implements _i6.ConnectedApp {
           )
           as _i2.Completer<bool>);
 
-  @override
-  set initialized(_i2.Completer<bool>? _initialized) => super.noSuchMethod(
-    Invocation.setter(#initialized, _initialized),
-    returnValueForMissingStub: null,
-  );
-
   @override
   bool get connectedAppInitialized =>
       (super.noSuchMethod(
@@ -222,6 +218,12 @@ class MockConnectedApp extends _i1.Mock implements _i6.ConnectedApp {
           )
           as bool);
 
+  @override
+  set initialized(_i2.Completer<bool>? value) => super.noSuchMethod(
+    Invocation.setter(#initialized, value),
+    returnValueForMissingStub: null,
+  );
+
   @override
   _i2.Future<void> initializeValues({void Function()? onComplete}) =>
       (super.noSuchMethod(
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_tool_eval_test.dart b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_tool_eval_test.dart
index f27d6887d32..ed3dfb74c9b 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_tool_eval_test.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_tool_eval_test.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/service.dart';
+import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences_tool/src/shared_preferences_state.dart';
 import 'package:shared_preferences_tool/src/shared_preferences_tool_eval.dart';
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/ui/data_panel_test.dart b/packages/shared_preferences/shared_preferences_tool/test/src/ui/data_panel_test.dart
index 44619279f3e..76b4ae549d2 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/ui/data_panel_test.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/ui/data_panel_test.dart
@@ -32,7 +32,6 @@ void main() {
     Future<void> pumpDataPanel(WidgetTester tester) {
       return tester.pumpWidget(
         DevToolsExtension(
-          requiresRunningApplication: false,
           child: InnerSharedPreferencesStateProvider(
             notifier: notifierMock,
             child: const DataPanel(),
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/ui/error_panel_test.dart b/packages/shared_preferences/shared_preferences_tool/test/src/ui/error_panel_test.dart
index 2bf2196c8c7..28558557239 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/ui/error_panel_test.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/ui/error_panel_test.dart
@@ -20,7 +20,6 @@ void main() {
 
       await tester.pumpWidget(
         DevToolsExtension(
-          requiresRunningApplication: false,
           child: Directionality(
             textDirection: TextDirection.ltr,
             child: ErrorPanel(error: error, stackTrace: stackTrace),
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/ui/keys_panel_test.dart b/packages/shared_preferences/shared_preferences_tool/test/src/ui/keys_panel_test.dart
index f3fd9f75f04..6da48a540cc 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/ui/keys_panel_test.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/ui/keys_panel_test.dart
@@ -32,7 +32,6 @@ void main() {
     Future<void> pumpKeysPanel(WidgetTester tester) {
       return tester.pumpWidget(
         DevToolsExtension(
-          requiresRunningApplication: false,
           child: InnerSharedPreferencesStateProvider(
             notifier: notifierMock,
             child: const KeysPanel(),
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/ui/shared_preferences_body_test.dart b/packages/shared_preferences/shared_preferences_tool/test/src/ui/shared_preferences_body_test.dart
index f4df02df342..bf1c06f47a5 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/ui/shared_preferences_body_test.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/ui/shared_preferences_body_test.dart
@@ -29,7 +29,6 @@ void main() {
 
       await tester.pumpWidget(
         DevToolsExtension(
-          requiresRunningApplication: false,
           child: InnerSharedPreferencesStateProvider(
             notifier: notifier,
             child: const SharedPreferencesBody(),
diff --git a/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart b/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
index 23a8c13db0a..d165ac8e117 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.dart.
 // Do not manually edit this file.
 
@@ -20,10 +20,12 @@ import 'package:shared_preferences_tool/src/shared_preferences_state_notifier.da
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeSharedPreferencesState_0 extends _i1.SmartFake
     implements _i2.SharedPreferencesState {
diff --git a/packages/shared_preferences/shared_preferences_tool/web/index.html b/packages/shared_preferences/shared_preferences_tool/web/index.html
index e26482defa4..596cd6bc8b4 100644
--- a/packages/shared_preferences/shared_preferences_tool/web/index.html
+++ b/packages/shared_preferences/shared_preferences_tool/web/index.html
@@ -29,29 +29,8 @@
 
   <title>shared_preferences_tool</title>
   <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
 </head>
 <body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>

From a493ccdbf635fab06cf2d6982bb15a6bd97588c3 Mon Sep 17 00:00:00 2001
From: adsonpleal <adsonpleal@gmail.com>
Date: Thu, 4 Dec 2025 11:24:19 -0300
Subject: [PATCH 2/3] update version and readme

---
 packages/shared_preferences/shared_preferences/CHANGELOG.md | 4 ++--
 packages/shared_preferences/shared_preferences/pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md
index b9089427258..5cf4a09e2cb 100644
--- a/packages/shared_preferences/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md
@@ -1,6 +1,6 @@
-## NEXT
+## 2.5.4
 
-* Updates shared preferences devtools extension dependencies
+* Updates dependencies for the `shared_preferences_tool` DevTools extension and fixes related deprecations.
 * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
 * Updates README to reflect currently supported OS versions for the latest
   versions of the endorsed platform implementations.
diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml
index 532500c6903..d3c8a52238f 100644
--- a/packages/shared_preferences/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
-version: 2.5.3
+version: 2.5.4
 
 environment:
   sdk: ^3.9.0

From 51d554b62e3c3b316578c52584a6a228457ba4ea Mon Sep 17 00:00:00 2001
From: adsonpleal <adsonpleal@gmail.com>
Date: Thu, 4 Dec 2025 14:55:14 -0300
Subject: [PATCH 3/3] revert build runner and mockito version changes

---
 .../shared_preferences_tool/pubspec.yaml         |  4 ++--
 ...ed_preferences_state_notifier_test.mocks.dart | 16 +++++++---------
 .../notifier_mocking_helpers.mocks.dart          |  4 +---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/shared_preferences/shared_preferences_tool/pubspec.yaml b/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
index 09640167a1e..4180373667a 100644
--- a/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_tool/pubspec.yaml
@@ -15,10 +15,10 @@ dependencies:
   vm_service: '>=14.3.0 <16.0.0'
 
 dev_dependencies:
-  build_runner: ^2.10.4
+  build_runner: ^2.4.10
   flutter_test:
     sdk: flutter
-  mockito: 5.6.1
+  mockito: ^5.4.4
 
 flutter:
   uses-material-design: true
diff --git a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
index e62396930c6..89fb66be1f0 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.6 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in shared_preferences_tool/test/src/shared_preferences_state_notifier_test.dart.
 // Do not manually edit this file.
 
@@ -21,12 +21,10 @@ import 'package:shared_preferences_tool/src/shared_preferences_tool_eval.dart'
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
-// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeCompleter_0<T> extends _i1.SmartFake implements _i2.Completer<T> {
   _FakeCompleter_0(Object parent, Invocation parentInvocation)
@@ -122,6 +120,12 @@ class MockConnectedApp extends _i1.Mock implements _i6.ConnectedApp {
           )
           as _i2.Completer<bool>);
 
+  @override
+  set initialized(_i2.Completer<bool>? _initialized) => super.noSuchMethod(
+    Invocation.setter(#initialized, _initialized),
+    returnValueForMissingStub: null,
+  );
+
   @override
   bool get connectedAppInitialized =>
       (super.noSuchMethod(
@@ -218,12 +222,6 @@ class MockConnectedApp extends _i1.Mock implements _i6.ConnectedApp {
           )
           as bool);
 
-  @override
-  set initialized(_i2.Completer<bool>? value) => super.noSuchMethod(
-    Invocation.setter(#initialized, value),
-    returnValueForMissingStub: null,
-  );
-
   @override
   _i2.Future<void> initializeValues({void Function()? onComplete}) =>
       (super.noSuchMethod(
diff --git a/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart b/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
index d165ac8e117..23a8c13db0a 100644
--- a/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
+++ b/packages/shared_preferences/shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.6 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in shared_preferences_tool/test/test_helpers/notifier_mocking_helpers.dart.
 // Do not manually edit this file.
 
@@ -20,12 +20,10 @@ import 'package:shared_preferences_tool/src/shared_preferences_state_notifier.da
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
-// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeSharedPreferencesState_0 extends _i1.SmartFake
     implements _i2.SharedPreferencesState {