Skip to content

[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios #6617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 9 commits into from
May 8, 2024
Merged

[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios #6617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
198fcd6
Convert image_picker_ios into a Swift Package
vashworth Apr 26, 2024
543e470
Update changelog and pubspec version
vashworth Apr 26, 2024
32d94df
fix tests
vashworth Apr 26, 2024
3d79914
fix SwiftPM modulemap
vashworth Apr 26, 2024
ecc78e4
fix formatting and header file locations
vashworth Apr 29, 2024
0847755
Merge remote-tracking branch 'upstream/main' into image_picker_ios_sw…
vashworth May 1, 2024
45f27af
Add license, remove migration change
vashworth May 1, 2024
8063bec
Change version to minor upgrade
vashworth May 6, 2024
ad4347a
remove macOS supported platform version
vashworth May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@vashworth
vashworth committed Apr 26, 2024
commit 32d94dfb35caaf71aa23088641f3d61c1775e025
19 changes: 2 additions & 17 deletions packages/image_picker/image_picker_ios/example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
7865C5FD294157BC0010E17F /* icnsImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FB294157BB0010E17F /* icnsImage.icns */; };
7865C5FF294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
7865C600294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
78CF8D862BC5E7070051231B /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 78CF8D852BC5E7070051231B /* OCMock */; };
86430DF9272D71E9002D9D6C /* gifImage.gif in Resources */ = {isa = PBXBuildFile; fileRef = 9FC8F0E8229FA49E00C8D58F /* gifImage.gif */; };
86E9A893272754860017E6E0 /* PickerSaveImageToPathOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 86E9A892272754860017E6E0 /* PickerSaveImageToPathOperationTests.m */; };
Expand Down Expand Up @@ -147,7 +146,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
F4F7A436CCA4BF276270A3AE /* libPods-Runner.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -338,9 +336,6 @@
dependencies = (
);
name = Runner;
packageProductDependencies = (
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
);
productName = Runner;
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -385,7 +380,6 @@
);
mainGroup = 97C146E51CF9000F007C117D;
packageReferences = (
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */,
);
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
Expand Down Expand Up @@ -472,10 +466,12 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/image_picker_ios/image_picker_ios_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/video_player_avfoundation/video_player_avfoundation_privacy.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/image_picker_ios_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/video_player_avfoundation_privacy.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -892,13 +888,6 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */ = {
isa = XCRemoteSwiftPackageReference;
Expand All @@ -911,10 +900,6 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
isa = XCSwiftPackageProductDependency;
productName = FlutterGeneratedPluginSwiftPackage;
};
78CF8D852BC5E7070051231B /* OCMock */ = {
isa = XCSwiftPackageProductDependency;
package = 78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */;
Expand Down
1 change: 1 addition & 0 deletions packages/image_picker/image_picker_ios/ios/image_picker_ios.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ Downloaded by pub (not CocoaPods).
s.platform = :ios, '12.0'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.resource_bundles = {'image_picker_ios_privacy' => ['image_picker_ios/Sources/image_picker_ios/Resources/PrivacyInfo.xcprivacy']}
s.exclude_files = ['image_picker_ios/Package.swift', 'image_picker_ios/Sources/image_picker_ios/include/module.modulemap']
end
0 ...mage_picker_ios/FLTImagePickerImageUtil.h → ...mage_picker_ios/FLTImagePickerImageUtil.h
View file
Open in desktop
File renamed without changes.
0 ...e_picker_ios/FLTImagePickerMetaDataUtil.h → ...e_picker_ios/FLTImagePickerMetaDataUtil.h
View file
Open in desktop
File renamed without changes.
0 ...picker_ios/FLTImagePickerPhotoAssetUtil.h → ...picker_ios/FLTImagePickerPhotoAssetUtil.h
View file
Open in desktop
File renamed without changes.
0 ...ge_picker_ios/FLTImagePickerPlugin_Test.h → ...ge_picker_ios/FLTImagePickerPlugin_Test.h
View file
Open in desktop
File renamed without changes.
0 ...ios/FLTPHPickerSaveImageToPathOperation.h → ...ios/FLTPHPickerSaveImageToPathOperation.h
View file
Open in desktop
File renamed without changes.
0 ...r_ios/include/image_picker_ios-umbrella.h → ...ge_picker_ios/image_picker_ios-umbrella.h
View file
Open in desktop
File renamed without changes.
0 ...ios/Sources/image_picker_ios/messages.g.h → ...ios/include/image_picker_ios/messages.g.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions script/tool/lib/src/license_check_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const Set<String> _ignoreSuffixList = <String>{
// Full basenames of files to ignore.
const Set<String> _ignoredFullBasenameList = <String>{
'resource.h', // Generated by VS.
'Package.swift', // Swift Package Manifest file.
};

// Copyright and license regexes for third-party code.
Expand Down