From dd9128b41c468817e1052901095ab5de4b181c6b Mon Sep 17 00:00:00 2001 From: Dustin Pauze Date: Wed, 20 Nov 2024 15:03:31 -0500 Subject: [PATCH 1/2] FEDX-1997: adjust `manageAndReturnTypedDisposable` --- .../component_declaration/disposable_manager_proxy.dart | 4 ++-- pubspec.yaml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/component_declaration/disposable_manager_proxy.dart b/lib/src/component_declaration/disposable_manager_proxy.dart index 526456815..c2c467d36 100644 --- a/lib/src/component_declaration/disposable_manager_proxy.dart +++ b/lib/src/component_declaration/disposable_manager_proxy.dart @@ -111,6 +111,6 @@ mixin DisposableManagerProxy on react.Component implements DisposableManagerV7 { /// /// The parameter may not be `null`. @override - T manageAndReturnTypedDisposable(T disposable) => - _getDisposableProxy().manageAndReturnTypedDisposable(disposable); + T manageAndReturnTypedDisposable(T disposable) => + _getDisposableProxy().manageAndReturnTypedDisposable(disposable); } diff --git a/pubspec.yaml b/pubspec.yaml index 65be76a6d..c6fe6f08c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,6 +5,13 @@ homepage: https://github.com/Workiva/over_react/ environment: sdk: '>=2.19.0 <4.0.0' +dependency_overrides: + w_common: + git: + url: https://github.com/Workiva/w_common.git + ref: FEDX-1991 + path: w_common + dependencies: collection: ^1.15.0 analyzer: '>=5.13.0 <7.0.0' From eccf91dd3e90bf7251bb603e7691691c4cd706c4 Mon Sep 17 00:00:00 2001 From: Dustin Pauze Date: Wed, 20 Nov 2024 15:58:44 -0500 Subject: [PATCH 2/2] FEDX-1997: use the proper deps --- pubspec.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index c6fe6f08c..f99cd7605 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,13 +5,6 @@ homepage: https://github.com/Workiva/over_react/ environment: sdk: '>=2.19.0 <4.0.0' -dependency_overrides: - w_common: - git: - url: https://github.com/Workiva/w_common.git - ref: FEDX-1991 - path: w_common - dependencies: collection: ^1.15.0 analyzer: '>=5.13.0 <7.0.0' @@ -26,7 +19,7 @@ dependencies: redux: ^5.0.0 source_span: ^1.4.1 transformer_utils: ^0.2.6 - w_common: ^3.0.0 + w_common: ^3.3.0 w_flux: ^3.0.0 platform_detect: ^2.0.0 quiver: ^3.0.0