From 7d0cb1916c4a5002005a1f6184f282bab2303225 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Thu, 24 Dec 2020 18:14:21 -0500 Subject: [PATCH 1/3] battery null safety --- packages/battery/battery/CHANGELOG.md | 4 ++++ .../battery/integration_test/battery_test.dart | 2 ++ packages/battery/battery/pubspec.yaml | 14 +++++++++----- packages/battery/battery/test/battery_test.dart | 2 ++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/battery/battery/CHANGELOG.md b/packages/battery/battery/CHANGELOG.md index c9268d4d4e3c..4eb6009151cf 100644 --- a/packages/battery/battery/CHANGELOG.md +++ b/packages/battery/battery/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety + +* Migrate to null safety. + ## 1.0.10 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276)) diff --git a/packages/battery/battery/integration_test/battery_test.dart b/packages/battery/battery/integration_test/battery_test.dart index ed7b6fe5a0e4..2b0e26967b6c 100644 --- a/packages/battery/battery/integration_test/battery_test.dart +++ b/packages/battery/battery/integration_test/battery_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart = 2.9 + import 'package:flutter_test/flutter_test.dart'; import 'package:battery/battery.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml index d3c823d73ad2..c009a8aabfa8 100644 --- a/packages/battery/battery/pubspec.yaml +++ b/packages/battery/battery/pubspec.yaml @@ -2,7 +2,7 @@ name: battery description: Flutter plugin for accessing information about the battery state (full, charging, discharging) on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery -version: 1.0.10 +version: 2.0.0-nullsafety flutter: plugin: @@ -16,13 +16,17 @@ flutter: dependencies: flutter: sdk: flutter - meta: ^1.0.5 - battery_platform_interface: ^1.0.0 + meta: ^1.3.0-nullsafety.6 + battery_platform_interface: + git: + url: https://github.com/bparrishMines/plugins.git + ref: batter_interface_nnbd + path: packages/battery/battery_platform_interface dev_dependencies: async: ^2.0.8 test: ^1.3.0 - mockito: ^4.1.1 + mockito: ^5.0.0-nullsafety.0 flutter_test: sdk: flutter plugin_platform_interface: ^1.0.0 @@ -31,5 +35,5 @@ dev_dependencies: pedantic: ^1.8.0 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5" diff --git a/packages/battery/battery/test/battery_test.dart b/packages/battery/battery/test/battery_test.dart index 5c789207d7eb..ccef41bb84af 100644 --- a/packages/battery/battery/test/battery_test.dart +++ b/packages/battery/battery/test/battery_test.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// @dart = 2.9 + import 'dart:async'; import 'package:battery_platform_interface/battery_platform_interface.dart'; From 1ea1508a75eaacd65cc769cdc3e1dd38f77a3a59 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Wed, 30 Dec 2020 12:30:44 -0500 Subject: [PATCH 2/3] finish null safety --- packages/battery/battery/example/lib/main.dart | 8 ++++---- packages/battery/battery/example/pubspec.yaml | 2 +- packages/battery/battery/pubspec.yaml | 2 -- packages/battery/battery/test/battery_test.dart | 6 ++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/battery/battery/example/lib/main.dart b/packages/battery/battery/example/lib/main.dart index 1c1dfcf252b6..ea05d5221e4e 100644 --- a/packages/battery/battery/example/lib/main.dart +++ b/packages/battery/battery/example/lib/main.dart @@ -27,7 +27,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - MyHomePage({Key key, this.title}) : super(key: key); + MyHomePage({Key? key, required this.title}) : super(key: key); final String title; @@ -36,10 +36,10 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - Battery _battery = Battery(); + final Battery _battery = Battery(); - BatteryState _batteryState; - StreamSubscription _batteryStateSubscription; + BatteryState? _batteryState; + late StreamSubscription _batteryStateSubscription; @override void initState() { diff --git a/packages/battery/battery/example/pubspec.yaml b/packages/battery/battery/example/pubspec.yaml index 4e7b9ef035eb..a4385ce124e7 100644 --- a/packages/battery/battery/example/pubspec.yaml +++ b/packages/battery/battery/example/pubspec.yaml @@ -18,5 +18,5 @@ flutter: uses-material-design: true environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml index c009a8aabfa8..7349cb914b2a 100644 --- a/packages/battery/battery/pubspec.yaml +++ b/packages/battery/battery/pubspec.yaml @@ -24,8 +24,6 @@ dependencies: path: packages/battery/battery_platform_interface dev_dependencies: - async: ^2.0.8 - test: ^1.3.0 mockito: ^5.0.0-nullsafety.0 flutter_test: sdk: flutter diff --git a/packages/battery/battery/test/battery_test.dart b/packages/battery/battery/test/battery_test.dart index ccef41bb84af..43155c59692c 100644 --- a/packages/battery/battery/test/battery_test.dart +++ b/packages/battery/battery/test/battery_test.dart @@ -2,19 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.9 - import 'dart:async'; import 'package:battery_platform_interface/battery_platform_interface.dart'; +import 'package:flutter_test/flutter_test.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; -import 'package:test/test.dart'; import 'package:battery/battery.dart'; import 'package:mockito/mockito.dart'; void main() { group('battery', () { - Battery battery; + late Battery battery; MockBatteryPlatform fakePlatform; setUp(() async { fakePlatform = MockBatteryPlatform(); From 293dd97e32f41a8f8a2a4fdc2d0473f31951bea4 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Thu, 7 Jan 2021 14:16:40 -0500 Subject: [PATCH 3/3] use min dependencies and add battery to nnbd plugin list --- packages/battery/battery/example/pubspec.yaml | 2 +- packages/battery/battery/pubspec.yaml | 6 +++--- script/nnbd_plugins.sh | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/battery/battery/example/pubspec.yaml b/packages/battery/battery/example/pubspec.yaml index a4385ce124e7..748660adf284 100644 --- a/packages/battery/battery/example/pubspec.yaml +++ b/packages/battery/battery/example/pubspec.yaml @@ -12,7 +12,7 @@ dev_dependencies: sdk: flutter integration_test: path: ../../../integration_test - pedantic: ^1.8.0 + pedantic: ^1.10.0-nullsafety flutter: uses-material-design: true diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml index 7349cb914b2a..51f611c558df 100644 --- a/packages/battery/battery/pubspec.yaml +++ b/packages/battery/battery/pubspec.yaml @@ -16,7 +16,7 @@ flutter: dependencies: flutter: sdk: flutter - meta: ^1.3.0-nullsafety.6 + meta: ^1.3.0-nullsafety battery_platform_interface: git: url: https://github.com/bparrishMines/plugins.git @@ -27,10 +27,10 @@ dev_dependencies: mockito: ^5.0.0-nullsafety.0 flutter_test: sdk: flutter - plugin_platform_interface: ^1.0.0 + plugin_platform_interface: ^1.1.0-nullsafety integration_test: path: ../../integration_test - pedantic: ^1.8.0 + pedantic: ^1.10.0-nullsafety environment: sdk: ">=2.12.0-0 <3.0.0" diff --git a/script/nnbd_plugins.sh b/script/nnbd_plugins.sh index 0cab28abe2ab..7bc5ac35a3a5 100644 --- a/script/nnbd_plugins.sh +++ b/script/nnbd_plugins.sh @@ -6,6 +6,7 @@ readonly NNBD_PLUGINS_LIST=( "android_intent" + "battery" "connectivity" "device_info" "flutter_plugin_android_lifecycle"