Fixed iOS crash issue on Swift 5.5 (jhomlala#720)

erindolson · Sep 22, 2021 · c5c6b82 · c5c6b82
1 parent 3f1637f
commit c5c6b82
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.0.75
+* Fixed iOS build issue connected with Swift 5.5.
+
 ## 0.0.74
 * [BREAKING_CHANGE] `nextVideoTimeStreamController` is now marked as private. Please use `nextVideoTimeStream` to access stream.
 * [BREAKING_CHANGE] Removed BackdropFilter from cupertino theme.

diff --git a/docs/install.md b/docs/install.md
@@ -4,7 +4,7 @@
 
 ```yaml
 dependencies:
-  better_player: ^0.0.74
+  better_player: ^0.0.75
 ```
 
 2. Install it

diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -364,7 +364,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 = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -451,7 +451,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 = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -500,7 +500,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 = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/ios/Classes/CachingPlayerItem.swift b/ios/Classes/CachingPlayerItem.swift
@@ -56,24 +56,30 @@ open class CachingPlayerItem: AVPlayerItem {
                 guard let initialUrl = owner?.url else {
                     fatalError("internal inconsistency")
                 }
-                startDataRequest(with: initialUrl)
+                startDataRequest( url: initialUrl)
             }
             pendingRequests.insert(loadingRequest)
             processPendingRequests()
             return true
         }
 
-        func startDataRequest(with url: URL) {
+        func startDataRequest(url: URL) {
             let configuration = URLSessionConfiguration.default
             configuration.requestCachePolicy = .reloadIgnoringLocalAndRemoteCacheData
             session = URLSession(configuration: configuration, delegate: self, delegateQueue: nil)
             var request = URLRequest(url: url)
             request.httpMethod = "GET"
-            if let unwrappedDict = self.headers {
-                for (_key, _value) in unwrappedDict.enumerated() {                    
-                    request.setValue((_value as! String), forHTTPHeaderField: (_key as! String))
+            let headersString = self.headers as? [String:AnyObject]
+            if let unwrappedDict = headersString {
+                for (headerKey,headerValue) in  unwrappedDict{
+                    guard let headerValueString = headerValue as? String
+                    else {
+                        continue
+                    }
+                    request.setValue(headerValueString, forHTTPHeaderField: headerKey)
+
                 }
-            }        
+            }
             session?.dataTask(with: request).resume()
         }
 
@@ -182,7 +188,7 @@ open class CachingPlayerItem: AVPlayerItem {
     ///Starts current download.
     open func download() {
         if resourceLoaderDelegate.session == nil {
-            resourceLoaderDelegate.startDataRequest(with: url)
+            resourceLoaderDelegate.startDataRequest(url: url)
         }
     }
     ///Stops current download.

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: better_player
 description: Advanced video player based on video_player and Chewie. It's solves many typical use cases and it's easy to run.
-version: 0.0.74
+version: 0.0.75
 # Disabled because of warning from analyzer
 # authors:
 #  - Jakub Homlala <jhomlala@gmail.com>