From 4c1d5354ec433a9523cd721e516d5ac8439872d1 Mon Sep 17 00:00:00 2001 From: Caijinglong Date: Mon, 25 Nov 2024 10:54:31 +0800 Subject: [PATCH 1/3] feat(iOS): migrate to swift package manager Signed-off-by: Caijinglong --- .../flutter_image_compress/example/.gitignore | 2 + .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 3 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/pubspec.lock | 224 ++++++++++++++++++ .../ios/.gitignore | 2 + .../ios/Package.swift | 51 ++++ .../ios/flutter_image_compress_common.podspec | 4 +- .../Sources}/CompressFileHandler.h | 0 .../Sources}/CompressFileHandler.m | 0 .../Sources}/CompressHandler.h | 0 .../Sources}/CompressHandler.m | 0 .../Sources}/CompressListHandler.h | 0 .../Sources}/CompressListHandler.m | 0 .../Sources}/ImageCompressPlugin.h | 0 .../Sources}/ImageCompressPlugin.m | 0 .../SYPictureMetadata/NSDictionary+SY.h | 0 .../SYPictureMetadata/NSDictionary+SY.m | 0 .../Sources}/SYPictureMetadata/SYMetadata.h | 0 .../Sources}/SYPictureMetadata/SYMetadata.m | 0 .../SYPictureMetadata/SYMetadata8BIM.h | 0 .../SYPictureMetadata/SYMetadata8BIM.m | 0 .../SYPictureMetadata/SYMetadataBase.h | 0 .../SYPictureMetadata/SYMetadataBase.m | 0 .../SYPictureMetadata/SYMetadataCIFF.h | 0 .../SYPictureMetadata/SYMetadataCIFF.m | 0 .../SYPictureMetadata/SYMetadataDNG.h | 0 .../SYPictureMetadata/SYMetadataDNG.m | 0 .../SYPictureMetadata/SYMetadataExif.h | 0 .../SYPictureMetadata/SYMetadataExif.m | 0 .../SYPictureMetadata/SYMetadataExifAux.h | 0 .../SYPictureMetadata/SYMetadataExifAux.m | 0 .../SYPictureMetadata/SYMetadataGIF.h | 0 .../SYPictureMetadata/SYMetadataGIF.m | 0 .../SYPictureMetadata/SYMetadataGPS.h | 0 .../SYPictureMetadata/SYMetadataGPS.m | 0 .../SYPictureMetadata/SYMetadataIPTC.h | 0 .../SYPictureMetadata/SYMetadataIPTC.m | 0 .../SYMetadataIPTCContactInfo.h | 0 .../SYMetadataIPTCContactInfo.m | 0 .../SYPictureMetadata/SYMetadataJFIF.h | 0 .../SYPictureMetadata/SYMetadataJFIF.m | 0 .../SYPictureMetadata/SYMetadataMakerCanon.h | 0 .../SYPictureMetadata/SYMetadataMakerCanon.m | 0 .../SYPictureMetadata/SYMetadataMakerFuji.h | 0 .../SYPictureMetadata/SYMetadataMakerFuji.m | 0 .../SYMetadataMakerMinolta.h | 0 .../SYMetadataMakerMinolta.m | 0 .../SYPictureMetadata/SYMetadataMakerNikon.h | 0 .../SYPictureMetadata/SYMetadataMakerNikon.m | 0 .../SYMetadataMakerOlympus.h | 0 .../SYMetadataMakerOlympus.m | 0 .../SYPictureMetadata/SYMetadataMakerPentax.h | 0 .../SYPictureMetadata/SYMetadataMakerPentax.m | 0 .../SYPictureMetadata/SYMetadataPNG.h | 0 .../SYPictureMetadata/SYMetadataPNG.m | 0 .../SYPictureMetadata/SYMetadataRaw.h | 0 .../SYPictureMetadata/SYMetadataRaw.m | 0 .../SYPictureMetadata/SYMetadataTIFF.h | 0 .../SYPictureMetadata/SYMetadataTIFF.m | 0 .../Sources}/UIImage+scale.h | 0 .../Sources}/UIImage+scale.m | 0 .../flutter_image_compress_common}/.gitkeep | 0 63 files changed, 285 insertions(+), 5 deletions(-) create mode 100644 packages/flutter_image_compress/example/pubspec.lock create mode 100644 packages/flutter_image_compress_common/ios/Package.swift rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressFileHandler.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressFileHandler.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressHandler.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressHandler.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressListHandler.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/CompressListHandler.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/ImageCompressPlugin.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/ImageCompressPlugin.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/NSDictionary+SY.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/NSDictionary+SY.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadata.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadata.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadata8BIM.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadata8BIM.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataBase.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataBase.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataCIFF.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataCIFF.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataDNG.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataDNG.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataExif.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataExif.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataExifAux.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataExifAux.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataGIF.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataGIF.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataGPS.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataGPS.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataIPTC.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataIPTC.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataIPTCContactInfo.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataIPTCContactInfo.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataJFIF.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataJFIF.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerCanon.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerCanon.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerFuji.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerFuji.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerMinolta.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerMinolta.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerNikon.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerNikon.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerOlympus.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerOlympus.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerPentax.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataMakerPentax.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataPNG.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataPNG.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataRaw.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataRaw.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataTIFF.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/SYPictureMetadata/SYMetadataTIFF.m (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/UIImage+scale.h (100%) rename packages/flutter_image_compress_common/ios/{Classes => flutter_image_compress_common/Sources}/UIImage+scale.m (100%) rename packages/flutter_image_compress_common/ios/{Assets => flutter_image_compress_common/Sources/include/flutter_image_compress_common}/.gitkeep (100%) diff --git a/packages/flutter_image_compress/example/.gitignore b/packages/flutter_image_compress/example/.gitignore index a5408d9..22ac920 100644 --- a/packages/flutter_image_compress/example/.gitignore +++ b/packages/flutter_image_compress/example/.gitignore @@ -74,3 +74,5 @@ build/ !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages *.lock + +!pubspec.lock diff --git a/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist b/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj index 81df123..7feeb0b 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj @@ -165,7 +165,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -216,6 +216,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 82f4dcb..484abe5 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/packages/flutter_image_compress_common/ios/.gitignore b/packages/flutter_image_compress_common/ios/.gitignore index 47bf118..e5d672e 100644 --- a/packages/flutter_image_compress_common/ios/.gitignore +++ b/packages/flutter_image_compress_common/ios/.gitignore @@ -35,3 +35,5 @@ Icon? /Flutter/Generated.xcconfig /Flutter/flutter_export_environment.sh + +!.gitkeep diff --git a/packages/flutter_image_compress_common/ios/Package.swift b/packages/flutter_image_compress_common/ios/Package.swift new file mode 100644 index 0000000..6911f0d --- /dev/null +++ b/packages/flutter_image_compress_common/ios/Package.swift @@ -0,0 +1,51 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +private let packageName = "flutter_image_compress_common" + +let package = Package( + // TODO: Update your plugin name. + name: packageName, + platforms: [ + // TODO: Update the platforms your plugin supports. + // If your plugin only supports iOS, remove `.macOS(...)`. + // If your plugin only supports macOS, remove `.iOS(...)`. + .iOS("12.0"), + // .macOS("10.14") + ], + products: [ + // TODO: Update your library and target names. + // If the plugin name contains "_", replace with "-" for the library name + .library(name: packageName, targets: [packageName]) + ], + dependencies: [], + targets: [ + .target( + // TODO: Update your target name. + name: packageName, + dependencies: [ + .package(url: "https://github.com/Mantle/Mantle.git", .upToNextMajor(from: "2.0.0")) + .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0") + .package(url: "https://github.com/SDWebImage/SDWebImageWebPCoder.git", from: "0.3.0") + ], + resources: [ + // TODO: If your plugin requires a privacy manifest + // (e.g. if it uses any required reason APIs), update the PrivacyInfo.xcprivacy file + // to describe your plugin's privacy impact, and then uncomment this line. + // For more information, see: + // https://developer.apple.com/documentation/bundleresources/privacy_manifest_files + // .process("PrivacyInfo.xcprivacy"), + + // TODO: If you have other resources that need to be bundled with your plugin, refer to + // the following instructions to add them: + // https://developer.apple.com/documentation/xcode/bundling-resources-with-a-swift-package + ], + cSettings: [ + // TODO: Update your plugin name. + .headerSearchPath("include/\(packageName)") + ] + ) + ] +) \ No newline at end of file diff --git a/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec b/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec index 4b938c0..d740109 100644 --- a/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec @@ -11,8 +11,8 @@ Compress image with native Objective-C with faster speed. s.source = { :path => '.' } s.ios.deployment_target = '9.0' - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'flutter_image_compress_common/Sources/**/*' + s.public_header_files = 'flutter_image_compress_common/Sources/**/*.h' s.dependency 'Flutter' s.dependency 'Mantle' diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressFileHandler.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressFileHandler.h diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressFileHandler.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressFileHandler.m diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressHandler.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressHandler.h diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressHandler.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressHandler.m diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressListHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressListHandler.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressListHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressListHandler.h diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressListHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressListHandler.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressListHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/CompressListHandler.m diff --git a/packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/ImageCompressPlugin.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/ImageCompressPlugin.h diff --git a/packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/ImageCompressPlugin.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/ImageCompressPlugin.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/NSDictionary+SY.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/NSDictionary+SY.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/NSDictionary+SY.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/NSDictionary+SY.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata8BIM.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata8BIM.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata8BIM.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadata8BIM.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataBase.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataBase.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataBase.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataBase.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataCIFF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataCIFF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataCIFF.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataCIFF.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataDNG.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataDNG.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataDNG.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataDNG.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExif.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExif.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExif.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExif.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExifAux.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExifAux.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExifAux.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataExifAux.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGIF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGIF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGIF.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGIF.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGPS.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGPS.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGPS.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataGPS.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTC.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTC.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTC.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTC.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTCContactInfo.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTCContactInfo.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTCContactInfo.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataIPTCContactInfo.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataJFIF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataJFIF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataJFIF.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataJFIF.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerCanon.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerCanon.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerCanon.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerCanon.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerFuji.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerFuji.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerFuji.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerFuji.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerMinolta.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerMinolta.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerMinolta.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerMinolta.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerNikon.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerNikon.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerNikon.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerNikon.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerOlympus.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerOlympus.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerOlympus.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerOlympus.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerPentax.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerPentax.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerPentax.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataMakerPentax.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataPNG.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataPNG.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataPNG.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataPNG.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataRaw.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataRaw.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataRaw.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataRaw.m diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataTIFF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataTIFF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataTIFF.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/SYPictureMetadata/SYMetadataTIFF.m diff --git a/packages/flutter_image_compress_common/ios/Classes/UIImage+scale.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/UIImage+scale.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/UIImage+scale.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/UIImage+scale.h diff --git a/packages/flutter_image_compress_common/ios/Classes/UIImage+scale.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/UIImage+scale.m similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/UIImage+scale.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/UIImage+scale.m diff --git a/packages/flutter_image_compress_common/ios/Assets/.gitkeep b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/include/flutter_image_compress_common/.gitkeep similarity index 100% rename from packages/flutter_image_compress_common/ios/Assets/.gitkeep rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/include/flutter_image_compress_common/.gitkeep From b6a32e646b3234cb5b59088c14cbee3967019df3 Mon Sep 17 00:00:00 2001 From: Caijinglong Date: Wed, 4 Dec 2024 11:43:20 +0800 Subject: [PATCH 2/3] chore: update project configuration and dependencies - Added FVM version cache to .gitignore files. - Updated melos.yaml to include commands for building iOS with and without Swift Package Manager. - Modified GitHub Actions workflow for iOS builds to utilize new build commands. - Updated .gitignore in flutter_image_compress to exclude build artifacts. - Added new Swift package files for Flutter integration in flutter_image_compress example. - Updated pubspec.lock to reflect dependency version changes. Signed-off-by: Caijinglong --- .github/workflows/runnable.yml | 37 ++++++++++--------- .gitignore | 6 ++- melos.yaml | 9 +++++ packages/flutter_image_compress/.gitignore | 1 + .../flutter_image_compress/example/.gitignore | 3 ++ .../Package.swift | 28 ++++++++++++++ .../FlutterGeneratedPluginSwiftPackage.swift | 3 ++ .../ios/Runner.xcodeproj/project.pbxproj | 24 +++++++++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ .../xcshareddata/xcschemes/Runner.xcscheme | 19 ++++++++++ .../example/pubspec.lock | 6 +-- 11 files changed, 121 insertions(+), 23 deletions(-) create mode 100644 packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift create mode 100644 packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift create mode 100644 packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.github/workflows/runnable.yml b/.github/workflows/runnable.yml index c3590d8..bfbba33 100644 --- a/.github/workflows/runnable.yml +++ b/.github/workflows/runnable.yml @@ -14,16 +14,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: '17' + distribution: "zulu" + java-version: "17" - uses: subosito/flutter-action@v2 with: - channel: 'stable' + channel: "stable" - name: Log Dart/Flutter versions run: | dart --version @@ -42,17 +42,20 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest ] + os: [macos-latest] + build_cmd: + - melos run try_build_ios + - melos run try_build_ios_swift_package_manager steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: '17' + distribution: "zulu" + java-version: "17" - uses: subosito/flutter-action@v2 with: architecture: x64 - channel: 'stable' + channel: "stable" - run: dart --version - run: flutter --version - name: Install melos @@ -60,7 +63,7 @@ jobs: - name: Melos bootstrap run: melos bootstrap - name: Build iOS debug with melos - run: melos run try_build_ios + run: ${{ matrix.build_cmd }} test_android: needs: analyze @@ -68,16 +71,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: '17' + distribution: "zulu" + java-version: "17" - uses: subosito/flutter-action@v2 with: - channel: 'stable' + channel: "stable" - run: dart --version - run: flutter --version - run: flutter pub get @@ -93,16 +96,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: '17' + distribution: "zulu" + java-version: "17" - uses: subosito/flutter-action@v2 with: - channel: 'stable' + channel: "stable" - run: dart --version - run: flutter --version - name: Install melos diff --git a/.gitignore b/.gitignore index 89a6c69..f00a677 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,8 @@ example/macos/Flutter/ephemeral/flutter_export_environment.sh pubspec_overrides.yaml -pubspec.lock \ No newline at end of file +pubspec.lock + +# FVM Version Cache +.fvm/ +.fvmrc \ No newline at end of file diff --git a/melos.yaml b/melos.yaml index 6260036..a00d27a 100644 --- a/melos.yaml +++ b/melos.yaml @@ -23,6 +23,15 @@ scripts: try_build_ios: exec: | set -e + flutter config --no-enable-swift-package-manager + flutter pub get + flutter build ios --debug --no-codesign + packageFilters: + fileExists: lib/main.dart + try_build_ios_swift_package_manager: + exec: | + set -e + flutter config --enable-swift-package-manager flutter pub get flutter build ios --debug --no-codesign packageFilters: diff --git a/packages/flutter_image_compress/.gitignore b/packages/flutter_image_compress/.gitignore index 40366a1..82efdef 100644 --- a/packages/flutter_image_compress/.gitignore +++ b/packages/flutter_image_compress/.gitignore @@ -8,6 +8,7 @@ .buildlog/ .history .svn/ +build/ # IntelliJ related *.iml diff --git a/packages/flutter_image_compress/example/.gitignore b/packages/flutter_image_compress/example/.gitignore index 22ac920..b18fc36 100644 --- a/packages/flutter_image_compress/example/.gitignore +++ b/packages/flutter_image_compress/example/.gitignore @@ -76,3 +76,6 @@ build/ *.lock !pubspec.lock + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift new file mode 100644 index 0000000..d4d733a --- /dev/null +++ b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift @@ -0,0 +1,28 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. +// +// Generated file. Do not edit. +// + +import PackageDescription + +let package = Package( + name: "FlutterGeneratedPluginSwiftPackage", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"]) + ], + dependencies: [ + .package(name: "path_provider_foundation", path: "/Users/cai/.pub-cache/hosted/pub.flutter-io.cn/path_provider_foundation-2.4.0/darwin/path_provider_foundation") + ], + targets: [ + .target( + name: "FlutterGeneratedPluginSwiftPackage", + dependencies: [ + .product(name: "path-provider-foundation", package: "path_provider_foundation") + ] + ) + ] +) diff --git a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift new file mode 100644 index 0000000..62e7b11 --- /dev/null +++ b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift @@ -0,0 +1,3 @@ +// +// Generated file. Do not edit. +// diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj index 7feeb0b..0ebf58d 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; @@ -56,6 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, CCE73E2AE7041805F7C0FD33 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -155,6 +157,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -184,6 +189,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -270,7 +278,6 @@ "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework", "${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework", "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", - "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -279,7 +286,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -497,6 +503,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/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 484abe5..8eac1a7 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + diff --git a/packages/flutter_image_compress/example/pubspec.lock b/packages/flutter_image_compress/example/pubspec.lock index a1d1480..9726d25 100644 --- a/packages/flutter_image_compress/example/pubspec.lock +++ b/packages/flutter_image_compress/example/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.flutter-io.cn" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -194,7 +194,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" vector_math: dependency: transitive description: From fcd4127c2c15f337bbae968158786b62f4e16cef Mon Sep 17 00:00:00 2001 From: Caijinglong Date: Thu, 2 Jan 2025 13:30:36 +0800 Subject: [PATCH 3/3] build: change some gitignore files Signed-off-by: Caijinglong --- .../example/ios/.gitignore | 2 ++ .../Package.swift | 28 ------------------- .../FlutterGeneratedPluginSwiftPackage.swift | 3 -- .../example/pubspec.lock | 18 ++++-------- 4 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift delete mode 100644 packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift diff --git a/packages/flutter_image_compress/example/ios/.gitignore b/packages/flutter_image_compress/example/ios/.gitignore index 1ebfcb3..3c75826 100644 --- a/packages/flutter_image_compress/example/ios/.gitignore +++ b/packages/flutter_image_compress/example/ios/.gitignore @@ -44,3 +44,5 @@ Icon? Pods/ Podfile.lock .symlinks/ + +Flutter/ephemeral/ \ No newline at end of file diff --git a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift deleted file mode 100644 index d4d733a..0000000 --- a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift +++ /dev/null @@ -1,28 +0,0 @@ -// swift-tools-version: 5.9 -// The swift-tools-version declares the minimum version of Swift required to build this package. -// -// Generated file. Do not edit. -// - -import PackageDescription - -let package = Package( - name: "FlutterGeneratedPluginSwiftPackage", - platforms: [ - .iOS("12.0") - ], - products: [ - .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"]) - ], - dependencies: [ - .package(name: "path_provider_foundation", path: "/Users/cai/.pub-cache/hosted/pub.flutter-io.cn/path_provider_foundation-2.4.0/darwin/path_provider_foundation") - ], - targets: [ - .target( - name: "FlutterGeneratedPluginSwiftPackage", - dependencies: [ - .product(name: "path-provider-foundation", package: "path_provider_foundation") - ] - ) - ] -) diff --git a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift deleted file mode 100644 index 62e7b11..0000000 --- a/packages/flutter_image_compress/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift +++ /dev/null @@ -1,3 +0,0 @@ -// -// Generated file. Do not edit. -// diff --git a/packages/flutter_image_compress/example/pubspec.lock b/packages/flutter_image_compress/example/pubspec.lock index 9726d25..f025ef0 100644 --- a/packages/flutter_image_compress/example/pubspec.lock +++ b/packages/flutter_image_compress/example/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.flutter-io.cn" source: hosted - version: "1.19.0" + version: "1.18.0" cross_file: dependency: transitive description: @@ -85,14 +85,6 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.7.1" material_color_utilities: dependency: transitive description: @@ -194,7 +186,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.0" + version: "0.0.99" vector_math: dependency: transitive description: @@ -207,10 +199,10 @@ packages: dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "0.5.1" xdg_directories: dependency: transitive description: