diff --git a/packages/mason_logger/CHANGELOG.md b/packages/mason_logger/CHANGELOG.md index d39b474b2..82c477ef3 100644 --- a/packages/mason_logger/CHANGELOG.md +++ b/packages/mason_logger/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.3.5 + +- revert: upgrade `pkg:win32` to `^6.0.0` + - due to use of native assets this was breaking hook execution on windows + # 0.3.4 - deps: upgrade `pkg:win32` to `^6.0.0` ([#1650](https://github.com/felangel/mason/pull/1650)) diff --git a/packages/mason_logger/lib/src/ffi/windows_terminal.dart b/packages/mason_logger/lib/src/ffi/windows_terminal.dart index 1c6752f04..4a272d471 100644 --- a/packages/mason_logger/lib/src/ffi/windows_terminal.dart +++ b/packages/mason_logger/lib/src/ffi/windows_terminal.dart @@ -6,27 +6,25 @@ import 'package:win32/win32.dart'; class WindowsTerminal implements Terminal { WindowsTerminal() { - outputHandle = GetStdHandle(STD_OUTPUT_HANDLE).value; - inputHandle = GetStdHandle(STD_INPUT_HANDLE).value; + outputHandle = GetStdHandle(STD_OUTPUT_HANDLE); + inputHandle = GetStdHandle(STD_INPUT_HANDLE); } - late final HANDLE inputHandle; - late final HANDLE outputHandle; + late final int inputHandle; + late final int outputHandle; @override void enableRawMode() { - const dwMode = CONSOLE_MODE( - (~ENABLE_ECHO_INPUT) & - (~ENABLE_PROCESSED_INPUT) & - (~ENABLE_LINE_INPUT) & - (~ENABLE_WINDOW_INPUT), - ); + const dwMode = (~ENABLE_ECHO_INPUT) & + (~ENABLE_PROCESSED_INPUT) & + (~ENABLE_LINE_INPUT) & + (~ENABLE_WINDOW_INPUT); SetConsoleMode(inputHandle, dwMode); } @override void disableRawMode() { - final dwMode = ENABLE_ECHO_INPUT | + const dwMode = ENABLE_ECHO_INPUT | ENABLE_EXTENDED_FLAGS | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | diff --git a/packages/mason_logger/pubspec.yaml b/packages/mason_logger/pubspec.yaml index 1da783023..5d88bee8b 100644 --- a/packages/mason_logger/pubspec.yaml +++ b/packages/mason_logger/pubspec.yaml @@ -1,6 +1,6 @@ name: mason_logger description: A reusable Dart logger used by the Mason CLI (package:mason_cli). -version: 0.3.4 +version: 0.3.5 homepage: https://github.com/felangel/mason repository: https://github.com/felangel/mason issue_tracker: https://github.com/felangel/mason/issues @@ -21,7 +21,7 @@ environment: dependencies: ffi: ^2.1.3 io: ^1.0.4 - win32: ^6.0.0 + win32: ^5.11.0 dev_dependencies: meta: ^1.15.0