[video_player] Convert top-level classes to Swift

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.9.5
+
+* Converts portions of the native code to Swift for improved maintainability.
+
 ## 2.9.4
 
 * Ensures that the display link does not continue requesting frames after a player is disposed.

packages/video_player/video_player_avfoundation/darwin/RunnerTests/TestClasses.swift

@@ -4,7 +4,9 @@
 
 import AVFoundation
 import Testing
-import video_player_avfoundation
+import video_player_avfoundation_objc
+
+@testable import video_player_avfoundation
 
 #if os(iOS)
   import Flutter
@@ -249,7 +251,7 @@ final class StubFVPDisplayLink: NSObject, FVPDisplayLink {
   }
 }
 
-final class StubFVPDisplayLinkFactory: NSObject, FVPDisplayLinkFactory {
+final class StubFVPDisplayLinkFactory: DisplayLinkFactory {
   let displayLink = StubFVPDisplayLink()
   var fireDisplayLink: (() -> Void)?
 

packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation.podspec

@@ -14,14 +14,18 @@ Downloaded by pub (not CocoaPods).
   s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
   s.source           = { :http => 'https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation' }
   s.documentation_url = 'https://pub.dev/packages/video_player'
-  s.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation/**/*.{h,m}'
+  s.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation{,_objc}/**/*.{h,m,swift}'
   s.ios.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation_ios/*'
   s.osx.source_files = 'video_player_avfoundation/Sources/video_player_avfoundation_macos/*'
-  s.public_header_files = 'video_player_avfoundation/Sources/video_player_avfoundation/include/**/*.h'
+  s.public_header_files = 'video_player_avfoundation/Sources/video_player_avfoundation_objc/include/**/*.h'
   s.ios.dependency 'Flutter'
   s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '13.0'
   s.osx.deployment_target = '10.15'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  s.xcconfig = {
+    'LIBRARY_SEARCH_PATHS' => '$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift',
+    'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift',
+  }
   s.resource_bundles = {'video_player_avfoundation_privacy' => ['video_player_avfoundation/Sources/video_player_avfoundation/Resources/PrivacyInfo.xcprivacy']}
 end

packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Package.swift

@@ -20,11 +20,17 @@ let package = Package(
     .target(
       name: "video_player_avfoundation",
       dependencies: [
-        .target(name: "video_player_avfoundation_ios", condition: .when(platforms: [.iOS])),
-        .target(name: "video_player_avfoundation_macos", condition: .when(platforms: [.macOS])),
+        "video_player_avfoundation_objc"
       ],
       resources: [
         .process("Resources")
+      ]
+    ),
+    .target(
+      name: "video_player_avfoundation_objc",
+      dependencies: [
+        .target(name: "video_player_avfoundation_ios", condition: .when(platforms: [.iOS])),
+        .target(name: "video_player_avfoundation_macos", condition: .when(platforms: [.macOS])),
       ],
       cSettings: [
         .headerSearchPath("include/video_player_avfoundation")
@@ -33,13 +39,15 @@ let package = Package(
     .target(
       name: "video_player_avfoundation_ios",
       cSettings: [
-        .headerSearchPath("../video_player_avfoundation/include/video_player_avfoundation")
+        .headerSearchPath(
+          "../video_player_avfoundation_objc/include/video_player_avfoundation_objc")
       ]
     ),
     .target(
       name: "video_player_avfoundation_macos",
       cSettings: [
-        .headerSearchPath("../video_player_avfoundation/include/video_player_avfoundation")
+        .headerSearchPath(
+          "../video_player_avfoundation_objc/include/video_player_avfoundation_objc")
       ]
     ),
   ]