From 6f927355697d7e2b63562290c5a150a6c32c126f Mon Sep 17 00:00:00 2001 From: Daniel Chevalier Date: Thu, 21 Mar 2024 16:52:00 -0400 Subject: [PATCH] Dependency bumps for devtools_app_shared and devtools_shared (#7412) --- .../lib/src/framework/app_bar.dart | 2 +- .../standalone_ui/vs_code_mock_editor.dart | 2 +- packages/devtools_app_shared/CHANGELOG.md | 3 +- .../lib/src/ui/theme/theme.dart | 6 +- packages/devtools_app_shared/pubspec.yaml | 58 +++++++++---------- packages/devtools_extensions/CHANGELOG.md | 3 +- packages/devtools_extensions/pubspec.yaml | 8 +-- 7 files changed, 42 insertions(+), 40 deletions(-) diff --git a/packages/devtools_app/lib/src/framework/app_bar.dart b/packages/devtools_app/lib/src/framework/app_bar.dart index 6ff4485549d..87320fc9cc1 100644 --- a/packages/devtools_app/lib/src/framework/app_bar.dart +++ b/packages/devtools_app/lib/src/framework/app_bar.dart @@ -201,7 +201,7 @@ class TabOverflowButton extends StatelessWidget { height: defaultToolbarHeight, child: MenuItemButton( style: const ButtonStyle().copyWith( - textStyle: MaterialStateProperty.resolveWith((_) { + textStyle: WidgetStateProperty.resolveWith((_) { return theme.textTheme.titleSmall!; }), ), diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/vs_code_mock_editor.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/vs_code_mock_editor.dart index c5a03b71079..e42cffdca29 100644 --- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/vs_code_mock_editor.dart +++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/vs_code_mock_editor.dart @@ -216,7 +216,7 @@ class _VsCodeFlutterPanelMockEditorState ElevatedButton( onPressed: () => api.endSessions(), style: theme.elevatedButtonTheme.style!.copyWith( - backgroundColor: const MaterialStatePropertyAll( + backgroundColor: const WidgetStatePropertyAll( Colors.red, ), ), diff --git a/packages/devtools_app_shared/CHANGELOG.md b/packages/devtools_app_shared/CHANGELOG.md index e149cdbdb78..f3bdd5d7761 100644 --- a/packages/devtools_app_shared/CHANGELOG.md +++ b/packages/devtools_app_shared/CHANGELOG.md @@ -4,7 +4,8 @@ and `darkColorScheme`. * Rename `Split` to `SplitPane`. * Add `ServiceManager.serviceUri` field to store the connected VM service URI. * Update readme to use `pub add` instead of explicit package version. -* Update `package:dtd` to `2.0.0` +* Update `package:dtd` to `^2.0.0` +* Update `package:devtools_shared` to `^8.1.0` ## 0.0.10 * Add `DTDManager` class and export from `service.dart`. diff --git a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart b/packages/devtools_app_shared/lib/src/ui/theme/theme.dart index e18adfea0fe..0ece1579e89 100644 --- a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart +++ b/packages/devtools_app_shared/lib/src/ui/theme/theme.dart @@ -109,8 +109,8 @@ ThemeData _baseTheme({ ), menuButtonTheme: MenuButtonThemeData( style: ButtonStyle( - textStyle: MaterialStatePropertyAll(theme.regularTextStyle), - fixedSize: const MaterialStatePropertyAll(Size.fromHeight(24.0)), + textStyle: WidgetStatePropertyAll(theme.regularTextStyle), + fixedSize: const WidgetStatePropertyAll(Size.fromHeight(24.0)), ), ), dropdownMenuTheme: DropdownMenuThemeData( @@ -547,7 +547,7 @@ ButtonStyle _generateButtonStyle({ }) { if (!isScreenWiderThan(context, minScreenWidthForTextBeforeScaling)) { buttonStyle = buttonStyle.copyWith( - padding: MaterialStateProperty.resolveWith((_) { + padding: WidgetStateProperty.resolveWith((_) { return EdgeInsets.zero; }), ); diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml index 04b810d1333..4be862285f6 100644 --- a/packages/devtools_app_shared/pubspec.yaml +++ b/packages/devtools_app_shared/pubspec.yaml @@ -4,12 +4,12 @@ version: 0.1.0 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app_shared environment: - sdk: '>=3.3.0-91.0.dev <4.0.0' - flutter: '>=3.17.0-0.0.pre' + sdk: ">=3.3.0-91.0.dev <4.0.0" + flutter: ">=3.17.0-0.0.pre" dependencies: collection: ^1.15.0 - devtools_shared: ^6.0.1 + devtools_shared: ^8.1.0 dtd: ^2.0.0 flutter: sdk: flutter @@ -29,32 +29,32 @@ dev_dependencies: flutter: uses-material-design: true fonts: - - family: Roboto - fonts: - - asset: fonts/Roboto/Roboto-Thin.ttf - weight: 100 - - asset: fonts/Roboto/Roboto-Light.ttf - weight: 300 - - asset: fonts/Roboto/Roboto-Regular.ttf - weight: 400 - - asset: fonts/Roboto/Roboto-Medium.ttf - weight: 500 - - asset: fonts/Roboto/Roboto-Bold.ttf - weight: 700 - - asset: fonts/Roboto/Roboto-Black.ttf - weight: 900 - - family: RobotoMono - fonts: - - asset: fonts/Roboto_Mono/RobotoMono-Thin.ttf - weight: 100 - - asset: fonts/Roboto_Mono/RobotoMono-Light.ttf - weight: 300 - - asset: fonts/Roboto_Mono/RobotoMono-Regular.ttf - weight: 400 - - asset: fonts/Roboto_Mono/RobotoMono-Medium.ttf - weight: 500 - - asset: fonts/Roboto_Mono/RobotoMono-Bold.ttf - weight: 700 + - family: Roboto + fonts: + - asset: fonts/Roboto/Roboto-Thin.ttf + weight: 100 + - asset: fonts/Roboto/Roboto-Light.ttf + weight: 300 + - asset: fonts/Roboto/Roboto-Regular.ttf + weight: 400 + - asset: fonts/Roboto/Roboto-Medium.ttf + weight: 500 + - asset: fonts/Roboto/Roboto-Bold.ttf + weight: 700 + - asset: fonts/Roboto/Roboto-Black.ttf + weight: 900 + - family: RobotoMono + fonts: + - asset: fonts/Roboto_Mono/RobotoMono-Thin.ttf + weight: 100 + - asset: fonts/Roboto_Mono/RobotoMono-Light.ttf + weight: 300 + - asset: fonts/Roboto_Mono/RobotoMono-Regular.ttf + weight: 400 + - asset: fonts/Roboto_Mono/RobotoMono-Medium.ttf + weight: 500 + - asset: fonts/Roboto_Mono/RobotoMono-Bold.ttf + weight: 700 dependency_overrides: devtools_shared: diff --git a/packages/devtools_extensions/CHANGELOG.md b/packages/devtools_extensions/CHANGELOG.md index 1ec9ab7f697..ed5794ddf42 100644 --- a/packages/devtools_extensions/CHANGELOG.md +++ b/packages/devtools_extensions/CHANGELOG.md @@ -1,6 +1,7 @@ -## 0.0.15-wip +## 0.1.0 * Bump `devtools_app_shared` to ^0.1.0 * Update readme to use `pub add` instead of explicit package version. +* Bump `devtools_shared` to ^8.1.0 ## 0.0.14 * Add a global `dtdManager` for interacting with the Dart Tooling Daemon. diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml index 85d7840ba57..06ef135ab2b 100644 --- a/packages/devtools_extensions/pubspec.yaml +++ b/packages/devtools_extensions/pubspec.yaml @@ -1,19 +1,19 @@ name: devtools_extensions description: A package for building and supporting extensions for Dart DevTools. -version: 0.0.15-wip +version: 0.1.0 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions environment: - sdk: '>=3.3.0-91.0.dev <4.0.0' - flutter: '>=3.17.0-0.0.pre' + sdk: ">=3.3.0-91.0.dev <4.0.0" + flutter: ">=3.17.0-0.0.pre" executables: devtools_extensions: devtools_extensions dependencies: args: ^2.4.2 - devtools_shared: ^6.0.1 + devtools_shared: ^8.1.0 devtools_app_shared: ^0.1.0 flutter: sdk: flutter