From 9737399d9f47bc5e6438121421a69e57e62eaea8 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Thu, 28 Oct 2021 09:48:08 +0300 Subject: [PATCH 1/3] [battery_plus_linux] rename plugin class --- .../lib/src/battery_plus_linux_real.dart | 4 ++-- .../lib/src/battery_plus_linux_stub.dart | 4 ++-- .../battery_plus_linux/test/battery_plus_linux_test.dart | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart index 525908f2cc..8923e4fae1 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart @@ -25,10 +25,10 @@ extension _ToBatteryState on UPowerBatteryState { typedef UPowerDeviceFactory = UPowerDevice Function(); /// The Linux implementation of BatteryPlatform. -class BatteryPlusLinux extends BatteryPlatform { +class BatteryLinux extends BatteryPlatform { /// Register this dart class as the platform implementation for linux static void registerWith() { - BatteryPlatform.instance = BatteryPlusLinux(); + BatteryPlatform.instance = BatteryLinux(); } /// Returns the current battery level in percent. diff --git a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart index 40c49c50cb..0b9d6678de 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart @@ -6,10 +6,10 @@ import 'package:battery_plus_platform_interface/battery_plus_platform_interface. /// Notably, because battery_plus needs to manually register battery_plus_linux, /// anything with a transitive dependency on battery_plus will also depend on /// battery_plus_linux, not just at the pubspec level but the code level. -class BatteryPlusLinux extends BatteryPlatform { +class BatteryLinux extends BatteryPlatform { /// Errors on attempted instantiation of the stub. It exists only to satisfy /// compile-time dependencies, and should never actually be created. - BatteryPlusLinux() { + BatteryLinux() { assert(false); } } diff --git a/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart b/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart index e3d448ba03..8e133cca10 100644 --- a/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart +++ b/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart @@ -10,11 +10,11 @@ import 'package:flutter_test/flutter_test.dart'; void main() { test('registered instance', () { - BatteryPlusLinux.registerWith(); - expect(BatteryPlatform.instance, isA()); + BatteryLinux.registerWith(); + expect(BatteryPlatform.instance, isA()); }); test('battery level', () async { - final battery = BatteryPlusLinux(); + final battery = BatteryLinux(); battery.createDevice = () { return MockDevice(); }; @@ -22,7 +22,7 @@ void main() { }); test('battery state changes', () { - final battery = BatteryPlusLinux(); + final battery = BatteryLinux(); battery.createDevice = () { return MockDevice(); }; From 44c1d069974ed27a79bfb41ea6e325caca0df74d Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Tue, 2 Nov 2021 09:27:36 +0300 Subject: [PATCH 2/3] Revert "[battery_plus_linux] rename plugin class" This reverts commit 9737399d9f47bc5e6438121421a69e57e62eaea8. --- .../lib/src/battery_plus_linux_real.dart | 4 ++-- .../lib/src/battery_plus_linux_stub.dart | 4 ++-- .../battery_plus_linux/test/battery_plus_linux_test.dart | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart index 8923e4fae1..525908f2cc 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_real.dart @@ -25,10 +25,10 @@ extension _ToBatteryState on UPowerBatteryState { typedef UPowerDeviceFactory = UPowerDevice Function(); /// The Linux implementation of BatteryPlatform. -class BatteryLinux extends BatteryPlatform { +class BatteryPlusLinux extends BatteryPlatform { /// Register this dart class as the platform implementation for linux static void registerWith() { - BatteryPlatform.instance = BatteryLinux(); + BatteryPlatform.instance = BatteryPlusLinux(); } /// Returns the current battery level in percent. diff --git a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart index 0b9d6678de..40c49c50cb 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/battery_plus_linux_stub.dart @@ -6,10 +6,10 @@ import 'package:battery_plus_platform_interface/battery_plus_platform_interface. /// Notably, because battery_plus needs to manually register battery_plus_linux, /// anything with a transitive dependency on battery_plus will also depend on /// battery_plus_linux, not just at the pubspec level but the code level. -class BatteryLinux extends BatteryPlatform { +class BatteryPlusLinux extends BatteryPlatform { /// Errors on attempted instantiation of the stub. It exists only to satisfy /// compile-time dependencies, and should never actually be created. - BatteryLinux() { + BatteryPlusLinux() { assert(false); } } diff --git a/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart b/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart index 8e133cca10..e3d448ba03 100644 --- a/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart +++ b/packages/battery_plus/battery_plus_linux/test/battery_plus_linux_test.dart @@ -10,11 +10,11 @@ import 'package:flutter_test/flutter_test.dart'; void main() { test('registered instance', () { - BatteryLinux.registerWith(); - expect(BatteryPlatform.instance, isA()); + BatteryPlusLinux.registerWith(); + expect(BatteryPlatform.instance, isA()); }); test('battery level', () async { - final battery = BatteryLinux(); + final battery = BatteryPlusLinux(); battery.createDevice = () { return MockDevice(); }; @@ -22,7 +22,7 @@ void main() { }); test('battery state changes', () { - final battery = BatteryLinux(); + final battery = BatteryPlusLinux(); battery.createDevice = () { return MockDevice(); }; From cc62efd70b88e7af9173219bc05f1eee58bb1f80 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Tue, 2 Nov 2021 09:29:41 +0300 Subject: [PATCH 3/3] fix linux plugin class name --- packages/battery_plus/battery_plus_linux/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/battery_plus/battery_plus_linux/pubspec.yaml b/packages/battery_plus/battery_plus_linux/pubspec.yaml index 909b5c29ee..e867403925 100644 --- a/packages/battery_plus/battery_plus_linux/pubspec.yaml +++ b/packages/battery_plus/battery_plus_linux/pubspec.yaml @@ -25,5 +25,5 @@ flutter: implements: battery_plus platforms: linux: - dartPluginClass: BatteryLinux + dartPluginClass: BatteryPlusLinux pluginClass: none