From 352d625eb4b04a52db2b0534d4ba1331030ae26d Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 19 Feb 2021 12:17:36 -0800 Subject: [PATCH 1/6] [video_player_web] Bump minimum version of the flutter SDK so video_player_web 2.0.0-nullsafety.4 is publishable. --- packages/video_player/video_player_web/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/video_player_web/pubspec.yaml b/packages/video_player/video_player_web/pubspec.yaml index d9628535e353..7b1e3e785c6b 100644 --- a/packages/video_player/video_player_web/pubspec.yaml +++ b/packages/video_player/video_player_web/pubspec.yaml @@ -25,4 +25,4 @@ dev_dependencies: environment: sdk: ">=2.12.0-0 <3.0.0" - flutter: ">=1.12.8" + flutter: ">=1.20.0" From fa53f1f0f37756cef34bc0d2167f1521d9f82b0c Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 19 Feb 2021 15:00:32 -0800 Subject: [PATCH 2/6] Bump version for NNBD stable --- .../video_player_web/CHANGELOG.md | 19 +++---------------- .../video_player_web/pubspec.yaml | 10 +++++----- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/packages/video_player/video_player_web/CHANGELOG.md b/packages/video_player/video_player_web/CHANGELOG.md index 4c58311508a2..ab3437874797 100644 --- a/packages/video_player/video_player_web/CHANGELOG.md +++ b/packages/video_player/video_player_web/CHANGELOG.md @@ -1,23 +1,10 @@ -## 2.0.0-nullsafety.4 +## 2.0.0 +* **Breaking changes**: + * Migrate to null safety. * Calling `setMixWithOthers()` now is silently ignored instead of throwing an exception. - -## 2.0.0-nullsafety.3 - -* Updated to video_player_platform_interface 4.0. - -## 2.0.0-nullsafety.2 - * Fixed an issue where `isBuffering` was not updating on Web. -## 2.0.0-nullsafety.1 - -* Bump Dart SDK to support null safety. - -## 2.0.0-nullsafety - -* Migrate to null safety. - ## 0.1.4+2 * Update Flutter SDK constraint. diff --git a/packages/video_player/video_player_web/pubspec.yaml b/packages/video_player/video_player_web/pubspec.yaml index 7b1e3e785c6b..4c0fad161d1f 100644 --- a/packages/video_player/video_player_web/pubspec.yaml +++ b/packages/video_player/video_player_web/pubspec.yaml @@ -1,7 +1,7 @@ name: video_player_web description: Web platform implementation of video_player. homepage: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player_web -version: 2.0.0-nullsafety.4 +version: 2.0.0 flutter: plugin: @@ -15,14 +15,14 @@ dependencies: sdk: flutter flutter_web_plugins: sdk: flutter - meta: ^1.3.0-nullsafety.3 - video_player_platform_interface: ^4.0.0-nullsafety.0 + meta: ^1.3.0 + video_player_platform_interface: ^4.0.0-0 dev_dependencies: flutter_test: sdk: flutter - pedantic: ^1.10.0-nullsafety.1 + pedantic: ^1.10.0 environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.12.0-259.9.beta <3.0.0" flutter: ">=1.20.0" From 2c49a7464d35a88c2af910216502674299e09c33 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 19 Feb 2021 15:11:14 -0800 Subject: [PATCH 3/6] emitsError is working weird? Revisit. --- .../video_player_web/test/video_player_web_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/video_player_web/test/video_player_web_test.dart b/packages/video_player/video_player_web/test/video_player_web_test.dart index 604bebf4e17a..78c0c8cc85a5 100644 --- a/packages/video_player/video_player_web/test/video_player_web_test.dart +++ b/packages/video_player/video_player_web/test/video_player_web_test.dart @@ -98,7 +98,7 @@ void main() { await VideoPlayerPlatform.instance.setVolume(videoPlayerId, 0); await VideoPlayerPlatform.instance.play(videoPlayerId); - expect(eventStream, emitsError(isA())); + expect(() async { await eventStream.last; }, throwsA(isA())); }); test('can pause', () { From 7dd6abe181ad91325e652a1787cecd1c9e7e65ca Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 19 Feb 2021 17:04:48 -0800 Subject: [PATCH 4/6] dartfmt -w . --- .../video_player_web/test/video_player_web_test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/video_player/video_player_web/test/video_player_web_test.dart b/packages/video_player/video_player_web/test/video_player_web_test.dart index 78c0c8cc85a5..aee5b0350570 100644 --- a/packages/video_player/video_player_web/test/video_player_web_test.dart +++ b/packages/video_player/video_player_web/test/video_player_web_test.dart @@ -98,7 +98,9 @@ void main() { await VideoPlayerPlatform.instance.setVolume(videoPlayerId, 0); await VideoPlayerPlatform.instance.play(videoPlayerId); - expect(() async { await eventStream.last; }, throwsA(isA())); + expect(() async { + await eventStream.last; + }, throwsA(isA())); }); test('can pause', () { From 9eab9791eb5de3f6e64abced2d5659ceced2b0e9 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 23 Feb 2021 11:10:52 -0800 Subject: [PATCH 5/6] Use published version of platform_interface --- packages/video_player/video_player_web/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/video_player_web/pubspec.yaml b/packages/video_player/video_player_web/pubspec.yaml index 4c0fad161d1f..7404896e04a4 100644 --- a/packages/video_player/video_player_web/pubspec.yaml +++ b/packages/video_player/video_player_web/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: flutter_web_plugins: sdk: flutter meta: ^1.3.0 - video_player_platform_interface: ^4.0.0-0 + video_player_platform_interface: ^4.0.0 dev_dependencies: flutter_test: From 04bb63c336b57c8e95c79bf6d139c1d87fc984cb Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Tue, 23 Feb 2021 11:47:19 -0800 Subject: [PATCH 6/6] Update CHANGELOG.md --- packages/video_player/video_player_web/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/video_player/video_player_web/CHANGELOG.md b/packages/video_player/video_player_web/CHANGELOG.md index ab3437874797..63d4e10ef8da 100644 --- a/packages/video_player/video_player_web/CHANGELOG.md +++ b/packages/video_player/video_player_web/CHANGELOG.md @@ -1,7 +1,6 @@ ## 2.0.0 -* **Breaking changes**: - * Migrate to null safety. +* Migrate to null safety. * Calling `setMixWithOthers()` now is silently ignored instead of throwing an exception. * Fixed an issue where `isBuffering` was not updating on Web.