From 198e07ab309e21673003d58cf8e081ee6b383f00 Mon Sep 17 00:00:00 2001
From: Khuram Khalid <khuramkhalid@mta.tv>
Date: Sun, 13 Sep 2020 17:32:05 +0100
Subject: [PATCH 1/5] 1.0.41

* removed isEmtpy check when setting text track language
---
 CHANGELOG.md   | 4 ++++
 lib/video.dart | 1 -
 pubspec.yaml   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f99ed46..ba0d01e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.41 [September 13, 2020]
+
+* removed isEmpty check when setting text track language
+
 ## 1.0.40 [September 7, 2020]
 
 * added support for text tracks for Android
diff --git a/lib/video.dart b/lib/video.dart
index 916ab47..a344e7e 100644
--- a/lib/video.dart
+++ b/lib/video.dart
@@ -218,7 +218,6 @@ class _VideoState extends State<Video> {
   void _onPreferredTextLanguageChanged() async {
     if (_methodChannel != null &&
         widget.preferredTextLanguage != null &&
-        widget.preferredTextLanguage.isNotEmpty &&
         !Platform.isIOS) {
       _methodChannel.invokeMethod(
           "setPreferredTextLanguage", {"code": widget.preferredTextLanguage});
diff --git a/pubspec.yaml b/pubspec.yaml
index 94393ef..5bdd02e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_playout
 description: This plugin provides audio/video playback from a URL with background audio support, lock screen
   controls & player events for both iOS and Android.
-version: 1.0.40
+version: 1.0.41
 author: Muslim Television Ahmadiyya International <developer@mta.tv>
 homepage: https://www.mta.tv
 repository: https://github.com/muslimtv/flutter_playout

From a0e79be08874eb7c276f7ea4d74e145759fce32c Mon Sep 17 00:00:00 2001
From: Khuram Khalid <khuramkhalid@mta.tv>
Date: Wed, 11 Nov 2020 13:58:45 +0000
Subject: [PATCH 2/5] 1.0.42

* Merged [PR](https://github.com/muslimtv/flutter_playout/pull/70)
---
 CHANGELOG.md                          |  4 +++
 LICENSE.md => LICENSE                 |  0
 example/.flutter-plugins-dependencies |  2 +-
 example/README.md                     |  1 +
 example/ios/Flutter/.last_build_id    |  2 +-
 example/lib/video.dart                |  3 +-
 example/pubspec.lock                  | 40 +++++++++++++--------------
 pubspec.yaml                          | 12 +++++---
 8 files changed, 37 insertions(+), 27 deletions(-)
 rename LICENSE.md => LICENSE (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba0d01e..7428dba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.42 [November 10, 2020]
+
+* Merged [PR](https://github.com/muslimtv/flutter_playout/pull/70)
+
 ## 1.0.41 [September 13, 2020]
 
 * removed isEmpty check when setting text track language
diff --git a/LICENSE.md b/LICENSE
similarity index 100%
rename from LICENSE.md
rename to LICENSE
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index 2c40f70..b0aa46a 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2020-09-07 14:04:25.413425","version":"1.20.3"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2020-11-11 13:30:13.472876","version":"1.22.3"}
\ No newline at end of file
diff --git a/example/README.md b/example/README.md
index df629a9..c65a8fe 100644
--- a/example/README.md
+++ b/example/README.md
@@ -239,6 +239,7 @@ class _VideoPlayoutState extends State<VideoPlayout>
                     languageCode: "fr",
                     uri: "https://texttracks.example.com/french.vtt"),
               ],
+              loop: false,
             ),
           ),
           /* multi language menu */
diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id
index 81dd376..dd2e70b 100644
--- a/example/ios/Flutter/.last_build_id
+++ b/example/ios/Flutter/.last_build_id
@@ -1 +1 @@
-46421090b226fe359c3c6937c1ad9913
\ No newline at end of file
+7e31c1523c8179c5a7977e376350a63f
\ No newline at end of file
diff --git a/example/lib/video.dart b/example/lib/video.dart
index 04e874b..3fd3913 100644
--- a/example/lib/video.dart
+++ b/example/lib/video.dart
@@ -51,12 +51,13 @@ class _VideoPlayoutState extends State<VideoPlayout>
               title: "MTA International",
               subtitle: "Reaching The Corners Of The Earth",
               preferredAudioLanguage: "eng",
-              isLiveStream: true,
+              isLiveStream: false,
               position: 0,
               url: _url,
               onViewCreated: _onViewCreated,
               desiredState: widget.desiredState,
               preferredTextLanguage: "en",
+              loop: false,
             ),
           ),
           /* multi language menu */
diff --git a/example/pubspec.lock b/example/pubspec.lock
index c592964..821e4a5 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,42 +7,42 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0-nullsafety.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0-nullsafety.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0-nullsafety.1"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0-nullsafety.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -68,7 +68,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.39"
+    version: "1.0.42"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -94,21 +94,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.3"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.1"
   pedantic:
     dependency: transitive
     description:
@@ -127,55 +127,55 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0-nullsafety.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19-nullsafety.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0-nullsafety.3"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
+  dart: ">=2.10.0-110 <2.11.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5bdd02e..fac62de 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: flutter_playout
 description: This plugin provides audio/video playback from a URL with background audio support, lock screen
   controls & player events for both iOS and Android.
-version: 1.0.41
-author: Muslim Television Ahmadiyya International <developer@mta.tv>
+version: 1.0.42
 homepage: https://www.mta.tv
 repository: https://github.com/muslimtv/flutter_playout
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.6 <2.0.0"
 
 dependencies:
   flutter:
@@ -27,8 +27,12 @@ flutter:
   # be modified. They are used by the tooling to maintain consistency when
   # adding or updating assets for this project.
   plugin:
-    androidPackage: tv.mta.flutter_playout
-    pluginClass: FlutterPlayoutPlugin
+    platforms:
+      android:
+        package: tv.mta.flutter_playout
+        pluginClass: FlutterPlayoutPlugin
+      ios:
+        pluginClass: FlutterPlayoutPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets:

From 08447c60d7bc497239edf7f0faa53e66e6ffd662 Mon Sep 17 00:00:00 2001
From: Khuram Khalid <khuramkhalid@mta.tv>
Date: Tue, 8 Jun 2021 09:50:06 +0100
Subject: [PATCH 3/5] 1.0.43

* Updated iOS deployment target to 9.0
---
 CHANGELOG.md                                  |  4 ++
 example/.flutter-plugins-dependencies         |  2 +-
 example/ios/Flutter/Flutter.podspec           |  8 +--
 example/ios/Podfile.lock                      |  4 +-
 example/ios/Runner.xcodeproj/project.pbxproj  |  8 +--
 .../contents.xcworkspacedata                  |  2 +-
 example/pubspec.lock                          | 39 ++++++------
 ios/Classes/AudioPlayer.swift                 | 61 ++++++++++---------
 ios/Classes/VideoPlayer.swift                 | 41 +++++++------
 pubspec.lock                                  | 39 ++++++------
 pubspec.yaml                                  |  2 +-
 11 files changed, 111 insertions(+), 99 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7428dba..23c841e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.43 [June 8, 2021]
+
+* Updated iOS deployment target to 9.0
+
 ## 1.0.42 [November 10, 2020]
 
 * Merged [PR](https://github.com/muslimtv/flutter_playout/pull/70)
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index b0aa46a..92efb87 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2020-11-11 13:30:13.472876","version":"1.22.3"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2021-06-08 09:45:33.842560","version":"2.2.1"}
\ No newline at end of file
diff --git a/example/ios/Flutter/Flutter.podspec b/example/ios/Flutter/Flutter.podspec
index 5ca3041..2c4421c 100644
--- a/example/ios/Flutter/Flutter.podspec
+++ b/example/ios/Flutter/Flutter.podspec
@@ -1,18 +1,18 @@
 #
 # NOTE: This podspec is NOT to be published. It is only used as a local source!
+#       This is a generated file; do not edit or check into version control.
 #
 
 Pod::Spec.new do |s|
   s.name             = 'Flutter'
   s.version          = '1.0.0'
   s.summary          = 'High-performance, high-fidelity mobile apps.'
-  s.description      = <<-DESC
-Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
-                       DESC
   s.homepage         = 'https://flutter.io'
   s.license          = { :type => 'MIT' }
   s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
   s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
-  s.vendored_frameworks = 'Flutter.framework'
+  # Framework linking is handled by Flutter tooling, not CocoaPods.
+  # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
+  s.vendored_frameworks = 'path/to/nothing'
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 4914249..40e9a18 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_playout/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_playout: a5aed32b3003b02eb4432815ecfe0c0e42a801ff
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.8.3
+COCOAPODS: 1.10.0
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 61c0645..405b015 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -263,12 +263,10 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_playout/flutter_playout.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_playout.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -351,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -434,7 +432,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -483,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a1..919434a 100644
--- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 821e4a5..68a4041 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,42 +7,42 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -94,21 +94,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   pedantic:
     dependency: transitive
     description:
@@ -127,55 +127,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.3.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.6"
diff --git a/ios/Classes/AudioPlayer.swift b/ios/Classes/AudioPlayer.swift
index 8803312..ffdb56d 100644
--- a/ios/Classes/AudioPlayer.swift
+++ b/ios/Classes/AudioPlayer.swift
@@ -160,7 +160,11 @@ class AudioPlayer: NSObject, FlutterPlugin, FlutterStreamHandler {
                         /* Add observer for AVPlayer status and AVPlayerItem status */
                         self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayer.status), options: [.new, .initial], context: nil)
                         self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayerItem.status), options:[.old, .new, .initial], context: nil)
-                        self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayer.timeControlStatus), options:[.old, .new, .initial], context: nil)
+                        if #available(iOS 10.0, *) {
+                            self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayer.timeControlStatus), options:[.old, .new, .initial], context: nil)
+                        } else {
+                            // Fallback on earlier versions
+                        }
                         
                         let interval = CMTime(seconds: 1.0,
                         preferredTimescale: CMTimeScale(NSEC_PER_SEC))
@@ -201,48 +205,47 @@ class AudioPlayer: NSObject, FlutterPlugin, FlutterStreamHandler {
     /* Observe If AVPlayerItem.status Changed to Fail */
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         
-        if keyPath == #keyPath(AVPlayerItem.status) {
-            
-            let newStatus: AVPlayerItem.Status
-            
-            if let newStatusAsNumber = change?[NSKeyValueChangeKey.newKey] as? NSNumber {
-                newStatus = AVPlayerItem.Status(rawValue: newStatusAsNumber.intValue)!
-            } else {
-                newStatus = .unknown
-            }
-            
-            if newStatus == .failed {
-                self.flutterEventSink?(["name":"onError", "error":(String(describing: self.audioPlayer.currentItem?.error))])
-            } else if newStatus == .readyToPlay {
-                self.flutterEventSink?(["name":"onReady"])
-            }
-        }
-        
-        else if keyPath == #keyPath(AVPlayer.timeControlStatus) {
-            
-            guard let p = object as! AVPlayer? else {
-                return
+            if keyPath == #keyPath(AVPlayerItem.status) {
+                
+                let newStatus: AVPlayerItem.Status
+                
+                if let newStatusAsNumber = change?[NSKeyValueChangeKey.newKey] as? NSNumber {
+                    newStatus = AVPlayerItem.Status(rawValue: newStatusAsNumber.intValue)!
+                } else {
+                    newStatus = .unknown
+                }
+                
+                if newStatus == .failed {
+                    self.flutterEventSink?(["name":"onError", "error":(String(describing: self.audioPlayer.currentItem?.error))])
+                } else if newStatus == .readyToPlay {
+                    self.flutterEventSink?(["name":"onReady"])
+                }
             }
             
-            if #available(iOS 10.0, *) {
+        if #available(iOS 10.0, *) {
+            if keyPath == #keyPath(AVPlayer.timeControlStatus) {
+                
+                guard let p = object as! AVPlayer? else {
+                    return
+                }
                 
                 switch (p.timeControlStatus) {
                 
-                case AVPlayerTimeControlStatus.paused:
+                case AVPlayer.TimeControlStatus.paused:
                     self.flutterEventSink?(["name":"onPause"])
                     break
-                
-                case AVPlayerTimeControlStatus.playing:
+                    
+                case AVPlayer.TimeControlStatus.playing:
                     self.flutterEventSink?(["name":"onPlay"])
                     break
-                
+                    
                 case .waitingToPlayAtSpecifiedRate: break
                 @unknown default:
                     break
                 }
-            } else {
-                // Fallback on earlier versions
             }
+        } else {
+            // Fallback on earlier versions
         }
     }
     
diff --git a/ios/Classes/VideoPlayer.swift b/ios/Classes/VideoPlayer.swift
index 8e51335..ce04cf8 100644
--- a/ios/Classes/VideoPlayer.swift
+++ b/ios/Classes/VideoPlayer.swift
@@ -247,7 +247,11 @@ class VideoPlayer: NSObject, FlutterPlugin, FlutterStreamHandler, FlutterPlatfor
             /* Add observer for AVPlayer status and AVPlayerItem status */
             self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayer.status), options: [.new, .initial], context: nil)
             self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayerItem.status), options:[.old, .new, .initial], context: nil)
-            self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayer.timeControlStatus), options:[.old, .new, .initial], context: nil)
+            if #available(iOS 10.0, *) {
+                self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayer.timeControlStatus), options:[.old, .new, .initial], context: nil)
+            } else {
+                // Fallback on earlier versions
+            }
 
             /* setup callback for onTime */
             let interval = CMTime(seconds: 1.0, preferredTimescale: CMTimeScale(NSEC_PER_SEC))
@@ -355,38 +359,39 @@ class VideoPlayer: NSObject, FlutterPlugin, FlutterStreamHandler, FlutterPlatfor
             }
         }
         
-        else if keyPath == #keyPath(AVPlayer.timeControlStatus) {
-            
-            guard let p = object as! AVPlayer? else {
-                return
-            }
-            
-            if #available(iOS 10.0, *) {
+        if #available(iOS 10.0, *) {
+            if keyPath == #keyPath(AVPlayer.timeControlStatus) {
+                
+                guard let p = object as! AVPlayer? else {
+                    return
+                }
                 
                 switch (p.timeControlStatus) {
                 
-                case AVPlayerTimeControlStatus.paused:
+                case AVPlayer.TimeControlStatus.paused:
                     isPlaying = false
                     self.flutterEventSink?(["name":"onPause"])
                     break
-                
-                case AVPlayerTimeControlStatus.playing:
+                    
+                case AVPlayer.TimeControlStatus.playing:
                     isPlaying = true
                     self.flutterEventSink?(["name":"onPlay"])
                     break
-                
+                    
                 case .waitingToPlayAtSpecifiedRate: break
                 @unknown default:
                     break
                 }
+                
+            } else {
+                super.observeValue(forKeyPath: keyPath,
+                                   of: object,
+                                   change: change,
+                                   context: context)
+                return
             }
-            
         } else {
-            super.observeValue(forKeyPath: keyPath,
-                               of: object,
-                               change: change,
-                               context: context)
-            return
+            // Fallback on earlier versions
         }
     }
     
diff --git a/pubspec.lock b/pubspec.lock
index 9477cdd..f1411a2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,49 +7,49 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.2"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,21 +66,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -92,55 +92,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.17"
+    version: "0.3.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.6"
diff --git a/pubspec.yaml b/pubspec.yaml
index fac62de..3280754 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_playout
 description: This plugin provides audio/video playback from a URL with background audio support, lock screen
   controls & player events for both iOS and Android.
-version: 1.0.42
+version: 1.0.43
 homepage: https://www.mta.tv
 repository: https://github.com/muslimtv/flutter_playout
 

From 2d9fcce7266de84ea09e53aeb9b3266f76f642bc Mon Sep 17 00:00:00 2001
From: Khuram Khalid <khuramkhalid@mta.tv>
Date: Fri, 11 Jun 2021 21:35:03 +0100
Subject: [PATCH 4/5] 2.0.0

* Migrated to null-safety
---
 CHANGELOG.md                            |  4 ++
 example/.flutter-plugins-dependencies   |  2 +-
 example/lib/video.dart                  |  2 +-
 example/pubspec.lock                    |  2 +-
 lib/audio.dart                          | 14 +++----
 lib/multiaudio/HLSManifestLanguage.dart |  9 ++---
 lib/multiaudio/MultiAudioSupport.dart   |  9 ++---
 lib/player_observer.dart                | 12 +++---
 lib/textTrack.dart                      |  8 ++--
 lib/video.dart                          | 49 ++++++++++++-------------
 pubspec.yaml                            |  6 +--
 11 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c841e..5ca65ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0 [June 11, 2021]
+
+* Migrated to null-safety
+
 ## 1.0.43 [June 8, 2021]
 
 * Updated iOS deployment target to 9.0
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index 92efb87..b431dba 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2021-06-08 09:45:33.842560","version":"2.2.1"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2021-06-11 20:46:02.911292","version":"2.2.1"}
\ No newline at end of file
diff --git a/example/lib/video.dart b/example/lib/video.dart
index 3fd3913..3236471 100644
--- a/example/lib/video.dart
+++ b/example/lib/video.dart
@@ -22,7 +22,7 @@ class VideoPlayout extends StatefulWidget {
 class _VideoPlayoutState extends State<VideoPlayout>
     with PlayerObserver, MultiAudioSupport {
   final String _url = null;
-  List<HLSManifestLanguage> _hlsLanguages = List<HLSManifestLanguage>();
+  List<HLSManifestLanguage> _hlsLanguages = [];
 
   @override
   void initState() {
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 68a4041..0fe0d44 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -68,7 +68,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.42"
+    version: "1.0.44"
   flutter_test:
     dependency: "direct dev"
     description: flutter
diff --git a/lib/audio.dart b/lib/audio.dart
index 061ee50..9044b13 100644
--- a/lib/audio.dart
+++ b/lib/audio.dart
@@ -7,19 +7,19 @@ class Audio {
 
   Audio._();
 
-  static Audio _instance;
-  static Audio instance() {
+  static Audio? _instance;
+  static Audio? instance() {
     if (_instance == null) {
       _instance = Audio._();
     }
     return _instance;
   }
 
-  String _url;
-  String _title;
-  String _subtitle;
-  Duration _position;
-  bool _isLiveStream;
+  String? _url;
+  String? _title;
+  String? _subtitle;
+  Duration? _position;
+  bool? _isLiveStream;
 
   /// Plays given [url] with native player. The [title] and [subtitle]
   /// are used for lock screen info panel on both iOS & Android. Optionally pass
diff --git a/lib/multiaudio/HLSManifestLanguage.dart b/lib/multiaudio/HLSManifestLanguage.dart
index 94bb7a2..59123c3 100644
--- a/lib/multiaudio/HLSManifestLanguage.dart
+++ b/lib/multiaudio/HLSManifestLanguage.dart
@@ -1,8 +1,8 @@
 class HLSManifestLanguage {
-  final String code;
-  final String name;
-  final String nativeName;
-  String url;
+  final String? code;
+  final String? name;
+  final String? nativeName;
+  String? url;
 
   HLSManifestLanguage(this.code, this.name, {this.nativeName, this.url});
 
@@ -25,7 +25,6 @@ class HLSManifestLanguage {
   }
 
   static List<dynamic> toJsonFromList(List<HLSManifestLanguage> languages) {
-    if (languages == null) return List<dynamic>();
     return languages.map((a) => a.toJson()).toList();
   }
 }
diff --git a/lib/multiaudio/MultiAudioSupport.dart b/lib/multiaudio/MultiAudioSupport.dart
index beafad8..1090915 100644
--- a/lib/multiaudio/MultiAudioSupport.dart
+++ b/lib/multiaudio/MultiAudioSupport.dart
@@ -6,7 +6,7 @@ import 'package:flutter/services.dart';
 /// for HLS manifest. Use [setPreferredAudioLanguage] to set/change
 /// language for the currently playing asset.
 mixin MultiAudioSupport {
-  MethodChannel _methodChannel;
+  MethodChannel? _methodChannel;
   Future<void> enableMultiAudioSupport(int viewId) async {
     _methodChannel =
         MethodChannel("tv.mta/NativeVideoPlayerMethodChannel_$viewId");
@@ -16,11 +16,8 @@ mixin MultiAudioSupport {
   /// is based on ISO_639_2 language codes. Please see
   /// [lib/multiaudio/ISO_639_2_LanguageCode.dart]
   void setPreferredAudioLanguage(String languageCode) async {
-    if (_methodChannel != null &&
-        languageCode != null &&
-        languageCode.isNotEmpty &&
-        !Platform.isIOS) {
-      _methodChannel.invokeListMethod(
+    if (_methodChannel != null && languageCode.isNotEmpty && !Platform.isIOS) {
+      _methodChannel!.invokeListMethod(
           "setPreferredAudioLanguage", {"code": languageCode});
     }
   }
diff --git a/lib/player_observer.dart b/lib/player_observer.dart
index f98b8b0..234fc12 100644
--- a/lib/player_observer.dart
+++ b/lib/player_observer.dart
@@ -28,24 +28,24 @@ mixin PlayerObserver {
 
   /// Override this method to get update when playhead moves. This method
   /// fires every second with [position] as seconds.
-  void onTime(int position) {/* user implementation */}
+  void onTime(int? position) {/* user implementation */}
 
   /// Override this method to get notifications when a seek operation has
   /// finished. This will occur when user finishes scrubbing media.
   /// [position] is position in seconds before seek started.
   /// [offset] is seconds after seek processed.
-  void onSeek(int position, double offset) {/* user implementation */}
+  void onSeek(int? position, double offset) {/* user implementation */}
 
   /// Override this method to get notifications when media duration is
   /// set or changed.
   /// [duration] is in milliseconds. Returns -1 for live stream
-  void onDuration(int duration) {/* user implementation */}
+  void onDuration(int? duration) {/* user implementation */}
 
   /// Override this method to get errors thrown by the player
-  void onError(String error) {/* user implementation */}
+  void onError(String? error) {/* user implementation */}
 
   void _processEvent(dynamic event) async {
-    String eventName = event["name"];
+    String? eventName = event["name"];
 
     switch (eventName) {
 
@@ -73,7 +73,7 @@ mixin PlayerObserver {
       case "onSeek":
 
         /* position of the player before the player seeks (in seconds) */
-        int position = (event["position"]).toInt();
+        int? position = (event["position"]).toInt();
 
         /* requested position to seek to (in seconds) */
         double offset = double.parse("${event["offset"]}");
diff --git a/lib/textTrack.dart b/lib/textTrack.dart
index 5584fac..33f23e9 100644
--- a/lib/textTrack.dart
+++ b/lib/textTrack.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/cupertino.dart';
-
 /// Used for adding text tracks to the player. [mimetype] is the type of text
 /// track for example text/webvtt. [languageCode] is the language of the track
 /// for example `en` or `fr` and [uri] is the location for the track.
@@ -11,9 +9,9 @@ class TextTrack {
   TextTrack(this.mimetype, this.languageCode, this.uri);
 
   factory TextTrack.from(
-      {@required String mimetype,
-      @required String languageCode,
-      @required String uri}) {
+      {required String mimetype,
+      required String languageCode,
+      required String uri}) {
     return new TextTrack(mimetype, languageCode, uri);
   }
 
diff --git a/lib/video.dart b/lib/video.dart
index ec80c81..7ef8ad9 100644
--- a/lib/video.dart
+++ b/lib/video.dart
@@ -28,19 +28,19 @@ class Video extends StatefulWidget {
   final bool autoPlay;
   final bool loop;
   final bool showControls;
-  final String url;
-  final String title;
-  final String subtitle;
-  final String preferredAudioLanguage;
-  final List<TextTrack> textTracks;
-  final String preferredTextLanguage;
+  final String? url;
+  final String? title;
+  final String? subtitle;
+  final String? preferredAudioLanguage;
+  final List<TextTrack>? textTracks;
+  final String? preferredTextLanguage;
   final bool isLiveStream;
   final double position;
-  final Function onViewCreated;
+  final Function? onViewCreated;
   final PlayerState desiredState;
 
   const Video(
-      {Key key,
+      {Key? key,
       this.autoPlay = false,
       this.loop = false,
       this.showControls = true,
@@ -61,8 +61,8 @@ class Video extends StatefulWidget {
 }
 
 class _VideoState extends State<Video> {
-  MethodChannel _methodChannel;
-  int _platformViewId;
+  MethodChannel? _methodChannel;
+  int? _platformViewId;
   Widget _playerWidget = Container();
 
   @override
@@ -80,7 +80,7 @@ class _VideoState extends State<Video> {
   }
 
   void _setupPlayer() {
-    if (widget.url != null && widget.url.isNotEmpty) {
+    if (widget.url != null && widget.url!.isNotEmpty) {
       /* Android */
       if (Platform.isAndroid) {
         _playerWidget = AndroidView(
@@ -95,15 +95,14 @@ class _VideoState extends State<Video> {
             "preferredAudioLanguage": widget.preferredAudioLanguage ?? "mul",
             "isLiveStream": widget.isLiveStream,
             "position": widget.position,
-            "textTracks": TextTrack.toJsonFromList(
-                widget.textTracks ?? List<TextTrack>()),
+            "textTracks": TextTrack.toJsonFromList(widget.textTracks ?? []),
             "preferredTextLanguage": widget.preferredTextLanguage ?? "",
           },
           creationParamsCodec: const JSONMessageCodec(),
           onPlatformViewCreated: (viewId) {
             _onPlatformViewCreated(viewId);
             if (widget.onViewCreated != null) {
-              widget.onViewCreated(viewId);
+              widget.onViewCreated!(viewId);
             }
           },
           gestureRecognizers: <Factory<OneSequenceGestureRecognizer>>[
@@ -133,7 +132,7 @@ class _VideoState extends State<Video> {
           onPlatformViewCreated: (viewId) {
             _onPlatformViewCreated(viewId);
             if (widget.onViewCreated != null) {
-              widget.onViewCreated(viewId);
+              widget.onViewCreated!(viewId);
             }
           },
           gestureRecognizers: <Factory<OneSequenceGestureRecognizer>>[
@@ -148,7 +147,7 @@ class _VideoState extends State<Video> {
 
   @override
   void didUpdateWidget(Video oldWidget) {
-    if (widget.url == null || widget.url.isEmpty) {
+    if (widget.url == null || widget.url!.isEmpty) {
       _disposePlatformView();
     }
     if (oldWidget.url != widget.url ||
@@ -204,7 +203,7 @@ class _VideoState extends State<Video> {
   }
 
   void _onShowControlsFlagChanged() async {
-    _methodChannel.invokeMethod("onShowControlsFlagChanged", {
+    _methodChannel!.invokeMethod("onShowControlsFlagChanged", {
       "showControls": widget.showControls,
     });
   }
@@ -212,9 +211,9 @@ class _VideoState extends State<Video> {
   void _onPreferredAudioLanguageChanged() async {
     if (_methodChannel != null &&
         widget.preferredAudioLanguage != null &&
-        widget.preferredAudioLanguage.isNotEmpty &&
+        widget.preferredAudioLanguage!.isNotEmpty &&
         !Platform.isIOS) {
-      _methodChannel.invokeMethod(
+      _methodChannel!.invokeMethod(
           "setPreferredAudioLanguage", {"code": widget.preferredAudioLanguage});
     }
   }
@@ -223,26 +222,26 @@ class _VideoState extends State<Video> {
     if (_methodChannel != null &&
         widget.preferredTextLanguage != null &&
         !Platform.isIOS) {
-      _methodChannel.invokeMethod(
+      _methodChannel!.invokeMethod(
           "setPreferredTextLanguage", {"code": widget.preferredTextLanguage});
     }
   }
 
   void _onSeekPositionChanged() async {
     if (_methodChannel != null) {
-      _methodChannel.invokeMethod("seekTo", {"position": widget.position});
+      _methodChannel!.invokeMethod("seekTo", {"position": widget.position});
     }
   }
 
   void _pausePlayback() async {
     if (_methodChannel != null) {
-      _methodChannel.invokeMethod("pause");
+      _methodChannel!.invokeMethod("pause");
     }
   }
 
   void _resumePlayback() async {
     if (_methodChannel != null) {
-      _methodChannel.invokeMethod("resume");
+      _methodChannel!.invokeMethod("resume");
     }
   }
 
@@ -251,7 +250,7 @@ class _VideoState extends State<Video> {
       if (_methodChannel == null) {
         _setupPlayer();
       } else {
-        _methodChannel.invokeMethod("onMediaChanged", {
+        _methodChannel!.invokeMethod("onMediaChanged", {
           "autoPlay": widget.autoPlay,
           "loop": widget.loop,
           "url": widget.url,
@@ -266,7 +265,7 @@ class _VideoState extends State<Video> {
 
   void _disposePlatformView({bool isDisposing = false}) async {
     if (_methodChannel != null && _platformViewId != null) {
-      _methodChannel.invokeMethod("dispose");
+      _methodChannel!.invokeMethod("dispose");
 
       if (!isDisposing) {
         setState(() {
diff --git a/pubspec.yaml b/pubspec.yaml
index 3280754..8a5dc85 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: flutter_playout
 description: This plugin provides audio/video playback from a URL with background audio support, lock screen
   controls & player events for both iOS and Android.
-version: 1.0.43
+version: 2.0.0
 homepage: https://www.mta.tv
 repository: https://github.com/muslimtv/flutter_playout
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.6 <2.0.0"
+  sdk: '>=2.12.0 <3.0.0'
+  flutter: ">=1.12.13+hotfix.6"
 
 dependencies:
   flutter:

From 17a4773efa7599faaa812e2a69169f8d7ef8a95c Mon Sep 17 00:00:00 2001
From: Khuram Khalid <khuramkhalid@mta.tv>
Date: Sat, 12 Jun 2021 00:06:19 +0100
Subject: [PATCH 5/5] 2.0.1

* Set iOS deployment target to 9.0
* Fixed observed value unhandled exception in iOS implementation
---
 CHANGELOG.md                                 |  5 ++++
 example/.flutter-plugins-dependencies        |  2 +-
 example/ios/Runner.xcodeproj/project.pbxproj |  6 ++---
 ios/Classes/VideoPlayer.swift                | 27 +++++++++++++++++---
 pubspec.yaml                                 |  2 +-
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ca65ba..e5ddfc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.1 [June 12, 2021]
+
+* Set iOS deployment target to 9.0
+* Fixed observed value unhandled exception in iOS implementation
+
 ## 2.0.0 [June 11, 2021]
 
 * Migrated to null-safety
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index b431dba..e1429f2 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2021-06-11 20:46:02.911292","version":"2.2.1"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"android":[{"name":"flutter_playout","path":"/Users/Khuram/Projects/flutter_playout/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_playout","dependencies":[]}],"date_created":"2021-06-11 23:49:06.068825","version":"2.2.1"}
\ No newline at end of file
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 405b015..2014a6d 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -349,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -432,7 +432,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -481,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/ios/Classes/VideoPlayer.swift b/ios/Classes/VideoPlayer.swift
index ce04cf8..c23b15f 100644
--- a/ios/Classes/VideoPlayer.swift
+++ b/ios/Classes/VideoPlayer.swift
@@ -249,8 +249,6 @@ class VideoPlayer: NSObject, FlutterPlugin, FlutterStreamHandler, FlutterPlatfor
             self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayerItem.status), options:[.old, .new, .initial], context: nil)
             if #available(iOS 10.0, *) {
                 self.player?.addObserver(self, forKeyPath: #keyPath(AVPlayer.timeControlStatus), options:[.old, .new, .initial], context: nil)
-            } else {
-                // Fallback on earlier versions
             }
 
             /* setup callback for onTime */
@@ -359,7 +357,24 @@ class VideoPlayer: NSObject, FlutterPlugin, FlutterStreamHandler, FlutterPlatfor
             }
         }
         
-        if #available(iOS 10.0, *) {
+        if (keyPath == #keyPath(AVPlayer.status)) {
+            guard let p = object as! AVPlayer? else {
+                return
+            }
+            
+            switch (p.status) {
+            case .readyToPlay:
+                break
+            case .unknown:
+                break
+            case .failed:
+                break
+            @unknown default:
+                break
+            }
+        }
+        
+        else if #available(iOS 10.0, *) {
             if keyPath == #keyPath(AVPlayer.timeControlStatus) {
                 
                 guard let p = object as! AVPlayer? else {
@@ -391,7 +406,11 @@ class VideoPlayer: NSObject, FlutterPlugin, FlutterStreamHandler, FlutterPlatfor
                 return
             }
         } else {
-            // Fallback on earlier versions
+            super.observeValue(forKeyPath: keyPath,
+                               of: object,
+                               change: change,
+                               context: context)
+            return
         }
     }
     
diff --git a/pubspec.yaml b/pubspec.yaml
index 8a5dc85..d42d5ff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_playout
 description: This plugin provides audio/video playback from a URL with background audio support, lock screen
   controls & player events for both iOS and Android.
-version: 2.0.0
+version: 2.0.1
 homepage: https://www.mta.tv
 repository: https://github.com/muslimtv/flutter_playout