Add macOS and iOS media_kit libraries

2023-04-04 13:50:52 -04:00 · 2023-04-04 13:50:52 -04:00 · d5c54126bf
commit d5c54126bf
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '13.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@ -38,4 +38,11 @@ post_install do |installer|
  installer.pods_project.targets.each do |target|
    flutter_additional_ios_build_settings(target)
  end
+  installer.generated_projects.each do |project|
+    project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      end
+    end
+  end
 end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -47,23 +47,29 @@ PODS:
  - FMDB/standard (2.7.5)
  - image_picker_ios (0.0.1):
    - Flutter
-  - ObjectBox (1.8.1-rc)
+  - media_kit_libs_ios_video (1.0.0):
+    - Flutter
+  - media_kit_native_event_loop (1.0.0):
+    - Flutter
+  - media_kit_video (0.0.1):
+    - Flutter
+  - ObjectBox (1.8.1)
  - objectbox_flutter_libs (0.0.1):
    - Flutter
-    - ObjectBox (= 1.8.1-rc)
+    - ObjectBox (= 1.8.1)
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - SDWebImage (5.13.2):
-    - SDWebImage/Core (= 5.13.2)
-  - SDWebImage/Core (5.13.2)
+  - SDWebImage (5.15.5):
+    - SDWebImage/Core (= 5.15.5)
+  - SDWebImage/Core (5.15.5)
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
  - sqflite (0.0.2):
    - Flutter
    - FMDB (>= 2.7.5)
-  - SwiftyGif (5.4.3)
+  - SwiftyGif (5.4.4)
  - url_launcher_ios (0.0.1):
    - Flutter
  - video_player_avfoundation (0.0.1):
@ -77,6 +83,9 @@ DEPENDENCIES:
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
  - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
+  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
+  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
  - objectbox_flutter_libs (from `.symlinks/plugins/objectbox_flutter_libs/ios`)
  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
@ -108,6 +117,12 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/flutter_web_auth_2/ios"
  image_picker_ios:
    :path: ".symlinks/plugins/image_picker_ios/ios"
+  media_kit_libs_ios_video:
+    :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
+  media_kit_native_event_loop:
+    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
+  media_kit_video:
+    :path: ".symlinks/plugins/media_kit_video/ios"
  objectbox_flutter_libs:
    :path: ".symlinks/plugins/objectbox_flutter_libs/ios"
  path_provider_foundation:
@ -131,17 +146,20 @@ SPEC CHECKSUMS:
  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
  flutter_web_auth_2: a1bc00762c408a8f80b72a538cd7ff5b601c3e71
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
-  ObjectBox: 7615cc462f2976cb45127d301a17cb473edf3f9e
-  objectbox_flutter_libs: 55835e03ff76bf9d5ce0a41a2ef3902d2e8c1f20
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
-  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
+  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  media_kit_libs_ios_video: 045418d93c495fb3eaa7b8263839d991c206fa14
+  media_kit_native_event_loop: 0d273668d0ad6011258e91db0e0301370a721195
+  media_kit_video: 01504b1f7a2b4d11ebcf8637cd8919a4ed2452ed
+  ObjectBox: a7900d5335218cd437cbc080b7ccc38a5211f7b4
+  objectbox_flutter_libs: 61d74196d924fbc773da5f5757d1e9fab7b3cc78
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
+  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
-  video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
+  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126

-PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+PODFILE CHECKSUM: 1df1bb3ed89ef4be6115286519e24a9fad12e640

-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -341,7 +341,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -361,6 +361,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -420,7 +421,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@ -469,7 +470,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -491,6 +492,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -515,6 +517,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/lib/controls/audio_video/av_control.dart
+++ b/lib/controls/audio_video/av_control.dart
@ -13,8 +13,11 @@ import 'video_player_lib_av_control.dart';

 final _shownVideos = <String>{};

-final _useVideoPlayer = kIsWeb || Platform.isAndroid || Platform.isIOS;
-final _useMediaKit = Platform.isWindows || Platform.isMacOS || Platform.isLinux;
+final _useVideoPlayer = kIsWeb || Platform.isAndroid;
+final _useMediaKit = Platform.isIOS ||
+    Platform.isWindows ||
+    Platform.isMacOS ||
+    Platform.isLinux;

 class AVControl extends StatefulWidget {
  final String videoUrl;
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -9,6 +9,7 @@ import desktop_window
 import device_info_plus
 import flutter_secure_storage_macos
 import flutter_web_auth_2
+import media_kit_libs_macos_video
 import media_kit_video
 import objectbox_flutter_libs
 import path_provider_foundation
@ -21,6 +22,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
  FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
+  MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
  MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
  ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
--- a/macos/Podfile
+++ b/macos/Podfile
@ -1,4 +1,4 @@
-platform :osx, '10.15'
+platform :osx, '11.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -11,10 +11,16 @@ PODS:
  - FMDB (2.7.5):
    - FMDB/standard (= 2.7.5)
  - FMDB/standard (2.7.5)
-  - ObjectBox (1.8.1-rc)
+  - media_kit_libs_macos_video (1.0.0):
+    - FlutterMacOS
+  - media_kit_native_event_loop (1.0.0):
+    - FlutterMacOS
+  - media_kit_video (0.0.1):
+    - FlutterMacOS
+  - ObjectBox (1.8.1)
  - objectbox_flutter_libs (0.0.1):
    - FlutterMacOS
-    - ObjectBox (= 1.8.1-rc)
+    - ObjectBox (= 1.8.1)
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
@ -33,6 +39,9 @@ DEPENDENCIES:
  - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
  - flutter_web_auth_2 (from `Flutter/ephemeral/.symlinks/plugins/flutter_web_auth_2/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
+  - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`)
+  - media_kit_native_event_loop (from `Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos`)
+  - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`)
  - objectbox_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/objectbox_flutter_libs/macos`)
  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/macos`)
@ -55,6 +64,12 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/flutter_web_auth_2/macos
  FlutterMacOS:
    :path: Flutter/ephemeral
+  media_kit_libs_macos_video:
+    :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos
+  media_kit_native_event_loop:
+    :path: Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos
+  media_kit_video:
+    :path: Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos
  objectbox_flutter_libs:
    :path: Flutter/ephemeral/.symlinks/plugins/objectbox_flutter_libs/macos
  path_provider_foundation:
@ -69,17 +84,20 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  desktop_window: fb7c4f12c1129f947ac482296b6f14059d57a3c3
  device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
-  flutter_secure_storage_macos: 75c8cadfdba05ca007c0fa4ea0c16e5cf85e521b
+  flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
  flutter_web_auth_2: 6695649132b6c71ea17700703761c0d18fdb8cf6
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  ObjectBox: 7615cc462f2976cb45127d301a17cb473edf3f9e
-  objectbox_flutter_libs: 6c6e858d1df4a7cd5cb664c2108e6fa0b412be38
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
+  media_kit_libs_macos_video: d8f5b02cc1ab6f26dc3880e8367fd8ccaea73751
+  media_kit_native_event_loop: db47f732bacd877aaaf78c38c4fa8cdd7127db3f
+  media_kit_video: 4e7996581172a6b1dfae7deda317c4036d0c458c
+  ObjectBox: a7900d5335218cd437cbc080b7ccc38a5211f7b4
+  objectbox_flutter_libs: f89ab4878f0f764a49077cfaa59030be69ae1d7e
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
+  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
  sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
-  url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2
+  url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451

-PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0
+PODFILE CHECKSUM: 8d40c19d3cbdb380d870685c3a564c989f1efa52

-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@ -407,7 +407,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@ -436,7 +436,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};
@ -497,7 +497,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@ -545,7 +545,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@ -574,7 +574,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@ -602,7 +602,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};
--- a/pubspec.lock
+++ b/pubspec.lock
@ -669,10 +669,18 @@ packages:
    dependency: "direct main"
    description:
      name: media_kit
-      sha256: baaaaa025bffba908e9b4a1c824181a8b3ce44bbf77c82be1728427dbaa848d4
+      sha256: "6b1e851865c2da3d84e93e8132ee0add32f604bf7fc211d019db9101a44c8608"
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.2"
+    version: "0.0.3+3"
+  media_kit_libs_ios_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_ios_video
+      sha256: "495d6e2db9b325aebda16dad3c5ae6593a9dfa37ebe08360b4765a43fa09a3b0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
  media_kit_libs_linux:
    dependency: "direct main"
    description:
@ -681,6 +689,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
+  media_kit_libs_macos_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_macos_video
+      sha256: ff06adff5f544b11aa1d3ad596f9add477264c6026a60aebeed69eda1c7d9d63
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
  media_kit_libs_windows_video:
    dependency: "direct main"
    description:
@ -701,10 +717,10 @@ packages:
    dependency: "direct main"
    description:
      name: media_kit_video
-      sha256: f9987d92182f42852fa77e5ca98d11a91482b9f45f7a559ca3453f258026041b
+      sha256: "1a870a3d731a9ce34e12ec5baed05b3081164f0c85b71baf05900ca47ee5639c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.2"
+    version: "0.0.4"
  meta:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -30,10 +30,13 @@ dependencies:
  image_picker: ^0.8.6
  logging: ^1.1.0
  markdown: ^7.0.1
-  media_kit: ^0.0.2
-  media_kit_native_event_loop: ^1.0.2
-  media_kit_video: ^0.0.2
+  media_kit: ^0.0.3
+  media_kit_libs_ios_video: ^1.0.2
  media_kit_libs_linux: ^1.0.1
+  media_kit_libs_macos_video: ^1.0.2
+  media_kit_libs_windows_video: ^1.0.1
+  media_kit_native_event_loop: ^1.0.2
+  media_kit_video: ^0.0.4
  metadata_fetch: ^0.4.1
  multi_trigger_autocomplete: ^0.1.1
  network_to_file_image: ^4.0.1
@ -53,7 +56,6 @@ dependencies:
  carousel_slider: ^4.2.1
  device_info_plus: ^8.0.0
  string_validator: ^0.3.0
-  media_kit_libs_windows_video: ^1.0.1

 dev_dependencies:
  flutter_test: