From 364957cc784db38a7c9decb5c4ae34a356779697 Mon Sep 17 00:00:00 2001 From: dom Date: Thu, 28 May 2026 11:58:34 +0800 Subject: [PATCH] darwin SPM upgrade deps Signed-off-by: dom --- .gitignore | 3 + ios/Podfile.lock | 209 ------------------ ios/Runner.xcodeproj/project.pbxproj | 42 ++-- .../xcshareddata/xcschemes/Runner.xcscheme | 18 ++ lib/utils/image_utils.dart | 10 +- macos/Flutter/Flutter-Debug.xcconfig | 1 + macos/Flutter/Flutter-Release.xcconfig | 1 + macos/Podfile | 2 +- macos/Podfile.lock | 114 ---------- macos/Runner.xcodeproj/project.pbxproj | 28 ++- .../xcshareddata/xcschemes/Runner.xcscheme | 21 +- .../contents.xcworkspacedata | 3 + pubspec.lock | 82 +++---- pubspec.yaml | 32 ++- 14 files changed, 175 insertions(+), 391 deletions(-) delete mode 100644 ios/Podfile.lock delete mode 100644 macos/Podfile.lock diff --git a/.gitignore b/.gitignore index a731bf282..edb399e53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,13 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ +Package.resolved # IntelliJ related *.iml diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 4e2851b50..000000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,209 +0,0 @@ -PODS: - - app_links (7.0.0): - - Flutter - - audio_service (0.0.1): - - Flutter - - FlutterMacOS - - audio_session (0.0.1): - - Flutter - - battery_plus (1.0.0): - - Flutter - - chat_bottom_container (0.0.1): - - Flutter - - connectivity_plus (0.0.1): - - Flutter - - device_info_plus (0.0.1): - - Flutter - - file_picker (0.0.1): - - Flutter - - FlutterMacOS - - Flutter (1.0.0) - - flutter_inappwebview_ios (0.0.1): - - Flutter - - flutter_inappwebview_ios/Core (= 0.0.1) - - OrderedSet (~> 6.0.3) - - flutter_inappwebview_ios/Core (0.0.1): - - Flutter - - OrderedSet (~> 6.0.3) - - flutter_mailer (0.0.1): - - Flutter - - flutter_native_splash (2.4.3): - - Flutter - - flutter_volume_controller (0.0.1): - - Flutter - - fluttertoast (0.0.2): - - Flutter - - image_cropper (0.0.5): - - Flutter - - TOCropViewController (~> 3.1.2) - - image_picker_ios (0.0.1): - - Flutter - - live_photo_maker (0.0.3): - - Flutter - - media_kit_libs_ios_video (1.0.4): - - Flutter - - media_kit_native_event_loop (1.0.0): - - Flutter - - media_kit_video (0.0.1): - - Flutter - - native_device_orientation (0.0.1): - - Flutter - - OrderedSet (6.0.3) - - package_info_plus (0.4.5): - - Flutter - - permission_handler_apple (9.3.0): - - Flutter - - saver_gallery (0.0.1): - - Flutter - - screen_brightness_ios (2.1.3): - - Flutter - - share_plus (0.0.1): - - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - - sqflite_darwin (0.0.4): - - Flutter - - FlutterMacOS - - TOCropViewController (3.1.2) - - url_launcher_ios (0.0.1): - - Flutter - - wakelock_plus (0.0.1): - - Flutter - -DEPENDENCIES: - - app_links (from `.symlinks/plugins/app_links/ios`) - - audio_service (from `.symlinks/plugins/audio_service/darwin`) - - audio_session (from `.symlinks/plugins/audio_session/ios`) - - battery_plus (from `.symlinks/plugins/battery_plus/ios`) - - chat_bottom_container (from `.symlinks/plugins/chat_bottom_container/ios`) - - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - - file_picker (from `.symlinks/plugins/file_picker/darwin`) - - Flutter (from `Flutter`) - - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`) - - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`) - - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - - image_cropper (from `.symlinks/plugins/image_cropper/ios`) - - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - - live_photo_maker (from `.symlinks/plugins/live_photo_maker/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`) - - native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`) - - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - -SPEC REPOS: - trunk: - - OrderedSet - - TOCropViewController - -EXTERNAL SOURCES: - app_links: - :path: ".symlinks/plugins/app_links/ios" - audio_service: - :path: ".symlinks/plugins/audio_service/darwin" - audio_session: - :path: ".symlinks/plugins/audio_session/ios" - battery_plus: - :path: ".symlinks/plugins/battery_plus/ios" - chat_bottom_container: - :path: ".symlinks/plugins/chat_bottom_container/ios" - connectivity_plus: - :path: ".symlinks/plugins/connectivity_plus/ios" - device_info_plus: - :path: ".symlinks/plugins/device_info_plus/ios" - file_picker: - :path: ".symlinks/plugins/file_picker/darwin" - Flutter: - :path: Flutter - flutter_inappwebview_ios: - :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" - flutter_mailer: - :path: ".symlinks/plugins/flutter_mailer/ios" - flutter_native_splash: - :path: ".symlinks/plugins/flutter_native_splash/ios" - flutter_volume_controller: - :path: ".symlinks/plugins/flutter_volume_controller/ios" - fluttertoast: - :path: ".symlinks/plugins/fluttertoast/ios" - image_cropper: - :path: ".symlinks/plugins/image_cropper/ios" - image_picker_ios: - :path: ".symlinks/plugins/image_picker_ios/ios" - live_photo_maker: - :path: ".symlinks/plugins/live_photo_maker/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" - native_device_orientation: - :path: ".symlinks/plugins/native_device_orientation/ios" - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - permission_handler_apple: - :path: ".symlinks/plugins/permission_handler_apple/ios" - saver_gallery: - :path: ".symlinks/plugins/saver_gallery/ios" - screen_brightness_ios: - :path: ".symlinks/plugins/screen_brightness_ios/ios" - share_plus: - :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - sqflite_darwin: - :path: ".symlinks/plugins/sqflite_darwin/darwin" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - wakelock_plus: - :path: ".symlinks/plugins/wakelock_plus/ios" - -SPEC CHECKSUMS: - app_links: a754cbec3c255bd4bbb4d236ecc06f28cd9a7ce8 - audio_service: aa99a6ba2ae7565996015322b0bb024e1d25c6fd - audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0 - battery_plus: b42253f6d2dde71712f8c36fef456d99121c5977 - chat_bottom_container: f1eb8323db77a87db50f361142c679f11e892d1b - connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe - file_picker: 70164d9778c42c47218d6cd79ce435de0856b11a - Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 - flutter_mailer: 3a8cd4f36c960fb04528d5471097270c19fec1c4 - flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf - flutter_volume_controller: c2be490cb0487e8b88d0d9fc2b7e1c139a4ebccb - fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 - image_cropper: fca51f94982730acae168c4b5d691e0f11aeb259 - image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 - live_photo_maker: 29280ca88323bd5a33aafd00d98624d5cf522176 - media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854 - media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf - media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474 - native_device_orientation: e3580675687d5034770da198f6839ebf2122ef94 - OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d - saver_gallery: af2d0c762dafda254e0ad025ef0dabd6506cd490 - screen_brightness_ios: 212d950bb99c915eee971c884f4a6c87c92cd13d - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb - sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 - TOCropViewController: a916930c465b5d9445a74d95e0c0da931771b4df - url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b - wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556 - -PODFILE CHECKSUM: 5e755568c318fde60f7b59d132a4ba634d53bf27 - -COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index eba4fe1db..0fc58b479 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 2431C9E3151C7449D0D1C0F4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63F2789C7C1DF3CD2B80A936 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -39,6 +40,7 @@ 63F2789C7C1DF3CD2B80A936 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; @@ -54,6 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 2431C9E3151C7449D0D1C0F4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -72,6 +75,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -139,13 +143,15 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 5A372F23F3CF0118D6526BAC /* [CP] Embed Pods Frameworks */, - B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -174,6 +180,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -268,23 +277,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -567,6 +559,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c53e2b314..128d5765a 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + DateFormat('yyyy-MM-dd_HH-mm-ss').format(DateTime.now()); - static const _androidRelativePath = 'Pictures/${Constants.appName}'; + static final _albumPath = Platform.isAndroid + ? 'Pictures/${Constants.appName}' + : Constants.appName; // 图片分享 static Future onShareImg(String url) async { @@ -206,7 +208,7 @@ abstract final class ImageUtils { SaveFileData( filePath: i.filePath, fileName: i.name, - androidRelativePath: _androidRelativePath, + albumPath: _albumPath, ), ); } else { @@ -306,7 +308,7 @@ abstract final class ImageUtils { res = await SaverGallery.saveImage( bytes, fileName: fileName, - androidRelativePath: _androidRelativePath, + albumPath: _albumPath, skipIfExists: false, ); SmartDialog.dismiss(); @@ -350,7 +352,7 @@ abstract final class ImageUtils { res = await SaverGallery.saveFile( filePath: filePath, fileName: fileName, - androidRelativePath: _androidRelativePath, + albumPath: _albumPath, skipIfExists: false, ); if (del) file.tryDel(); diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b60..4b81f9b2d 100644 --- a/macos/Flutter/Flutter-Debug.xcconfig +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig index c2efd0b60..5caa9d157 100644 --- a/macos/Flutter/Flutter-Release.xcconfig +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Podfile b/macos/Podfile index 049abe295..9ec46f8cd 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.14' +platform :osx, '10.15' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/macos/Podfile.lock b/macos/Podfile.lock deleted file mode 100644 index 3c36eea59..000000000 --- a/macos/Podfile.lock +++ /dev/null @@ -1,114 +0,0 @@ -PODS: - - connectivity_plus (0.0.1): - - FlutterMacOS - - ReachabilitySwift - - device_info_plus (0.0.1): - - FlutterMacOS - - dynamic_color (0.0.2): - - FlutterMacOS - - flutter_volume_controller (0.0.1): - - FlutterMacOS - - FlutterMacOS (1.0.0) - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - media_kit_libs_macos_video (1.0.4): - - FlutterMacOS - - media_kit_native_event_loop (1.0.0): - - FlutterMacOS - - media_kit_video (0.0.1): - - FlutterMacOS - - package_info_plus (0.0.1): - - FlutterMacOS - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - - ReachabilitySwift (5.0.0) - - screen_brightness_macos (0.1.0): - - FlutterMacOS - - share_plus (0.0.1): - - FlutterMacOS - - sqflite (0.0.2): - - FlutterMacOS - - FMDB (>= 2.7.5) - - url_launcher_macos (0.0.1): - - FlutterMacOS - - wakelock_plus (0.0.1): - - FlutterMacOS - -DEPENDENCIES: - - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`) - - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`) - - flutter_volume_controller (from `Flutter/ephemeral/.symlinks/plugins/flutter_volume_controller/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`) - - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`) - - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`) - - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) - -SPEC REPOS: - trunk: - - FMDB - - ReachabilitySwift - -EXTERNAL SOURCES: - connectivity_plus: - :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos - device_info_plus: - :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos - dynamic_color: - :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos - flutter_volume_controller: - :path: Flutter/ephemeral/.symlinks/plugins/flutter_volume_controller/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 - package_info_plus: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos - path_provider_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin - screen_brightness_macos: - :path: Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos - share_plus: - :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos - sqflite: - :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos - url_launcher_macos: - :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos - wakelock_plus: - :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos - -SPEC CHECKSUMS: - connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747 - device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f - dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f - flutter_volume_controller: 25d09126b0d695560f11c80b1311d5063fed882f - FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82 - media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5 - media_kit_video: c75b07f14d59706c775778e4dd47dd027de8d1e5 - package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 - screen_brightness_macos: 2d6d3af2165592d9a55ffcd95b7550970e41ebda - share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 - sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea - url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 - wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 - -PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 - -COCOAPODS: 1.12.1 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 89be960f1..d6f431569 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 70B7435992536DF7EF916102 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA6434EEFB6EABF56163956B /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -73,6 +74,7 @@ A5BA27756D8018CEC961D98E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; BA6434EEFB6EABF56163956B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C7AC3B7DF8D09FAFBD7AC6AD /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,6 +82,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 70B7435992536DF7EF916102 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -131,6 +134,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, @@ -175,6 +179,9 @@ /* Begin PBXNativeTarget section */ 33CC10EC2044A3C60003C045 /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -200,10 +207,13 @@ /* Begin PBXProject section */ 33CC10E52044A3C60003C045 /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -484,7 +494,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -531,7 +541,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -628,6 +638,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 85af28b82..7b35d8a0f 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a16e..21a3cc14c 100644 --- a/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/pubspec.lock b/pubspec.lock index ef4ff9f94..23e979405 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -255,10 +255,11 @@ packages: chat_bottom_container: dependency: "direct main" description: - name: chat_bottom_container - sha256: e9c3b9879251658e403d2a93057c5db469c99237fef62ca562ec6d223970ef41 - url: "https://pub.dev" - source: hosted + path: "packages/chat_bottom_container" + ref: dev + resolved-ref: "227fe87aeedcd53573b17d6a6e5c08834fbc4e45" + url: "https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git" + source: git version: "0.5.0" checked_yaml: dependency: transitive @@ -498,7 +499,7 @@ packages: description: path: "." ref: dev - resolved-ref: f6c2ab82ce7539dc26e6c16e1455b435fd2ded09 + resolved-ref: "1b1197493d734c45e178c15fe665c3dcab284cb8" url: "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git" source: git version: "12.0.0-beta.5" @@ -593,7 +594,7 @@ packages: description: path: flutter_inappwebview_android ref: "v6.1.5" - resolved-ref: e0e82ff8492bbc77aecc37e3b4d02c0f3e3de40f + resolved-ref: "553d323316cc1ef5d1b73077fe42be864e3e096d" url: "https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git" source: git version: "1.1.3" @@ -606,20 +607,22 @@ packages: source: hosted version: "1.3.0" flutter_inappwebview_ios: - dependency: transitive + dependency: "direct overridden" description: - name: flutter_inappwebview_ios - sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" - url: "https://pub.dev" - source: hosted + path: flutter_inappwebview_ios + ref: dev + resolved-ref: "94adc42dbcf7c587a53aeb77f470641f877bab84" + url: "https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git" + source: git version: "1.1.2" flutter_inappwebview_macos: - dependency: transitive + dependency: "direct overridden" description: - name: flutter_inappwebview_macos - sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 - url: "https://pub.dev" - source: hosted + path: flutter_inappwebview_macos + ref: dev + resolved-ref: "94adc42dbcf7c587a53aeb77f470641f877bab84" + url: "https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git" + source: git version: "1.1.2" flutter_inappwebview_platform_interface: dependency: transitive @@ -670,10 +673,10 @@ packages: dependency: "direct dev" description: name: flutter_native_splash - sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002" + sha256: "9db4b80b044e9af17cc4b1272137fc7ace0054d879ef8210a76adc34aaf4cdff" url: "https://pub.dev" source: hosted - version: "2.4.7" + version: "2.4.8" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -1019,10 +1022,11 @@ packages: live_photo_maker: dependency: "direct main" description: - name: live_photo_maker - sha256: "9af3965bd9d2ab55b0d4d0a1e4041fdcc9ef6c6c44543c8412667541a054f58b" - url: "https://pub.dev" - source: hosted + path: "." + ref: master + resolved-ref: "162fb3227726da19ebffe37182a39c889278e0c5" + url: "https://github.com/bggRGjQaUbCoE/live_photo_maker.git" + source: git version: "0.0.6" logger: dependency: "direct main" @@ -1181,7 +1185,7 @@ packages: description: path: "." ref: master - resolved-ref: "2c74f4d534dfd9b8f66382f82b3540f32be9abd9" + resolved-ref: "7be186c79adca7d3ff5abc34bc75d171c68c2694" url: "https://github.com/bggRGjQaUbCoE/flutter_native_device_orientation.git" source: git version: "2.0.5" @@ -1310,10 +1314,10 @@ packages: dependency: "direct main" description: name: permission_handler_apple - sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023 + sha256: "447c18bc3c5fdea5c3039f042b2b365fd51e3634f5f6e269ed22c1f00071addc" url: "https://pub.dev" source: hosted - version: "9.4.7" + version: "9.4.8" permission_handler_platform_interface: dependency: "direct main" description: @@ -1438,10 +1442,10 @@ packages: dependency: "direct main" description: name: saver_gallery - sha256: "5afc7073672f6fd073ddd15118f53f59a2bceee433e586420a3548888cd40820" + sha256: dcecd87113ffcb0eb467bb0ef5ed8f6dd894e26ff3dfd5822624281e7d2cb894 url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.1.0" screen_brightness_android: dependency: "direct overridden" description: @@ -1485,12 +1489,13 @@ packages: source: hosted version: "0.2.0" screen_retriever_macos: - dependency: transitive + dependency: "direct overridden" description: - name: screen_retriever_macos - sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149" - url: "https://pub.dev" - source: hosted + path: "packages/screen_retriever_macos" + ref: dev + resolved-ref: "9c64c6c0d81ac5beadfc6ccab6adbcfd1cd9dc5a" + url: "https://github.com/bggRGjQaUbCoE/screen_retriever.git" + source: git version: "0.2.0" screen_retriever_platform_interface: dependency: transitive @@ -1725,10 +1730,11 @@ packages: tray_manager: dependency: "direct main" description: - name: tray_manager - sha256: c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b - url: "https://pub.dev" - source: hosted + path: "packages/tray_manager" + ref: dev + resolved-ref: "76e924d9dc8e5dee67f5f2d04ce0cbc72a53c081" + url: "https://github.com/bggRGjQaUbCoE/tray_manager.git" + source: git version: "0.5.2" typed_data: dependency: transitive @@ -1846,10 +1852,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e + sha256: "7ee12e6dffe0fc8e755179d6d91b3b34f5924223fc104d85572ef9180d73d172" url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.2.5" vector_math: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index afad0b88c..3d8db0972 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -55,7 +55,11 @@ dependencies: url: https://github.com/My-Responsitories/catcher_2.git ref: dev characters: ^1.4.1 - chat_bottom_container: ^0.5.0 + chat_bottom_container: + git: + url: https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git + path: packages/chat_bottom_container + ref: dev collection: ^1.19.1 connectivity_plus: ^7.1.1 cookie_jar: ^4.0.8 @@ -109,7 +113,10 @@ dependencies: image_picker: ^1.1.2 intl: ^0.20.2 json_annotation: ^4.11.0 - live_photo_maker: ^0.0.6 + live_photo_maker: + git: + url: https://github.com/bggRGjQaUbCoE/live_photo_maker.git + ref: master logger: ^2.5.0 material_color_utilities: ^0.13.0 material_design_icons_flutter: @@ -144,7 +151,11 @@ dependencies: url: https://github.com/bggRGjQaUbCoE/super_sliver_list.git ref: mod synchronized: ^3.3.0 - tray_manager: ^0.5.1 + tray_manager: + git: + url: https://github.com/bggRGjQaUbCoE/tray_manager.git + path: packages/tray_manager + ref: dev url_launcher: ^6.3.1 uuid: ^4.5.1 vector_math: ^2.2.0 @@ -163,6 +174,16 @@ dependency_overrides: url: https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git path: flutter_inappwebview_android ref: v6.1.5 + flutter_inappwebview_ios: + git: + url: https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git + path: flutter_inappwebview_ios + ref: dev + flutter_inappwebview_macos: + git: + url: https://github.com/bggRGjQaUbCoE/flutter_inappwebview.git + path: flutter_inappwebview_macos + ref: dev flutter_volume_controller: ^2.0.0 media_kit: git: @@ -210,6 +231,11 @@ dependency_overrides: url: https://github.com/bggRGjQaUbCoE/screen_brightness.git path: screen_brightness_platform_interface ref: dev + screen_retriever_macos: + git: + url: https://github.com/bggRGjQaUbCoE/screen_retriever.git + path: packages/screen_retriever_macos + ref: dev dev_dependencies: flutter_test: