diff --git a/packages/device_info_plus/device_info_plus_windows/lib/device_info_plus_windows.dart b/packages/device_info_plus/device_info_plus_windows/lib/device_info_plus_windows.dart index fb5cdc74e6..5e62aae61c 100644 --- a/packages/device_info_plus/device_info_plus_windows/lib/device_info_plus_windows.dart +++ b/packages/device_info_plus/device_info_plus_windows/lib/device_info_plus_windows.dart @@ -1,5 +1 @@ -// device_info_plus_windows is implemented using FFI; export a stub for -// platforms that don't support FFI (e.g., web) to avoid having transitive -// dependencies break web compilation. -export 'src/device_info_plus_windows_stub.dart' - if (dart.library.ffi) 'src/device_info_plus_windows_real.dart'; +export 'src/device_info_plus_windows.dart'; diff --git a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows_real.dart b/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart similarity index 100% rename from packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows_real.dart rename to packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart diff --git a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows_stub.dart b/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows_stub.dart deleted file mode 100644 index acfad30009..0000000000 --- a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows_stub.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:device_info_plus_platform_interface/device_info_plus_platform_interface.dart'; - -/// A stub implementation to satisfy compilation of multi-platform packages that -/// depend on device_info_plus_windows. This should never actually be created. -/// -/// Notably, because device_info_plus needs to manually register -/// device_info_plus_windows, anything with a transitive dependency on -/// device_info_plus will also depend on device_info_plus_windows, not just at -/// the pubspec level but the code level. -class DeviceInfoWindows extends DeviceInfoPlatform { - /// Errors on attempted instantiation of the stub. It exists only to satisfy - /// compile-time dependencies, and should never actually be created. - DeviceInfoWindows() { - assert(false); - } - - /// Stub - @override - Future? windowsInfo() { - return null; - } -} diff --git a/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart b/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart index d82af99456..0542a0717c 100644 --- a/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart +++ b/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart @@ -1,5 +1,5 @@ import 'package:device_info_plus_platform_interface/device_info_plus_platform_interface.dart'; -import 'package:device_info_plus_windows/src/device_info_plus_windows_real.dart'; +import 'package:device_info_plus_windows/src/device_info_plus_windows.dart'; import 'package:flutter_test/flutter_test.dart'; void main() {