-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios #6617
Merged
auto-submit
merged 9 commits into
flutter:main
from
vashworth:image_picker_ios_swift_package
May 8, 2024
+110
−10
Merged
Changes from 8 commits
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 543e470
Update changelog and pubspec version
vashworth 32d94df
fix tests
vashworth 3d79914
fix SwiftPM modulemap
vashworth ecc78e4
fix formatting and header file locations
vashworth 0847755
Merge remote-tracking branch 'upstream/main' into image_picker_ios_sw…
vashworth 45f27af
Add license, remove migration change
vashworth 8063bec
Change version to minor upgrade
vashworth ad4347a
remove macOS supported platform version
vashworth File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...os/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"pins" : [ | ||
{ | ||
"identity" : "ocmock", | ||
"kind" : "remoteSourceControl", | ||
"location" : "https://github.com/erikdoe/ocmock", | ||
"state" : { | ||
"revision" : "ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a" | ||
} | ||
} | ||
], | ||
"version" : 2 | ||
} |
13 changes: 13 additions & 0 deletions
13
...ker/image_picker_ios/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"pins" : [ | ||
{ | ||
"identity" : "ocmock", | ||
"kind" : "remoteSourceControl", | ||
"location" : "https://github.com/erikdoe/ocmock", | ||
"state" : { | ||
"revision" : "ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a" | ||
} | ||
} | ||
], | ||
"version" : 2 | ||
} |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// swift-tools-version: 5.9 | ||
|
||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "image_picker_ios", | ||
platforms: [ | ||
.iOS("12.0"), | ||
.macOS("10.14"), | ||
], | ||
products: [ | ||
.library(name: "image-picker-ios", targets: ["image_picker_ios"]) | ||
], | ||
dependencies: [], | ||
targets: [ | ||
.target( | ||
name: "image_picker_ios", | ||
dependencies: [], | ||
exclude: ["include/ImagePickerPlugin.modulemap"], | ||
resources: [ | ||
.process("Resources") | ||
], | ||
cSettings: [ | ||
.headerSearchPath("include/image_picker_ios") | ||
] | ||
) | ||
] | ||
) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions
14
...r/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
module image_picker_ios { | ||
umbrella header "image_picker_ios-umbrella.h" | ||
|
||
export * | ||
module * { export * } | ||
|
||
explicit module Test { | ||
header "../FLTImagePickerPlugin_Test.h" | ||
header "../FLTImagePickerImageUtil.h" | ||
header "../FLTImagePickerMetaDataUtil.h" | ||
header "../FLTImagePickerPhotoAssetUtil.h" | ||
header "../FLTPHPickerSaveImageToPathOperation.h" | ||
} | ||
} |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No
macOS
for this one.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll remove it so there's less confusion, but just FYI this doesn't really do much. From my testing (I can't find any documentation on it), if a specific platform is left out of this list, SwiftPM will just assume the minimum version. It doesn't exclude it by platform or anything cool like that unfortunately - that could change, though