-
Notifications
You must be signed in to change notification settings - Fork 378
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
support swift package manager #338
Merged
Merged
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
77fd4b2
rearrange resources and headers, add SPM support
mr-fixit 5918159
list PNGs individually, use 'process'
mr-fixit d7a3b82
move 3 more headers
mr-fixit 6e7632e
move 3 headers back
mr-fixit 9fbe30f
resource bundle trick
mr-fixit e6d4e7a
update changelog
mr-fixit 20c1f3a
pbxproj after running 'bundle exec pod install'. UnitTest target work…
mr-fixit e311bbe
add SPM to the README
mr-fixit 8406ee1
Update README.md
mr-fixit 99c8eb2
put PNGs in .xcassets file
mr-fixit b4ccca5
remove some dead file references and commit the latest Podfile.lock
mr-fixit 7335ad8
touch package
mr-fixit 13fbfb2
remove the extension
mr-fixit 6865ac8
build a proper asset catalog, but don't mention it in package.swift
mr-fixit 43913b3
clean up after PNG & xcassets slog
mr-fixit 3630591
fix the path for Media.xcassets in the .podspec
mr-fixit c180675
remove extraneous things
mr-fixit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
NYTPhotoViewer/Media.xcassets/NYTPhotoViewerCloseButtonX.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "NYTPhotoViewerCloseButtonX.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
File renamed without changes
File renamed without changes
File renamed without changes
23 changes: 23 additions & 0 deletions
23
NYTPhotoViewer/Media.xcassets/NYTPhotoViewerCloseButtonXLandscape.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "NYTPhotoViewerCloseButtonXLandscape.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
File renamed without changes
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
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.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
// swift-tools-version:5.3 | ||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "NYTPhotoViewer", | ||
platforms: [ | ||
.iOS(.v9) | ||
], | ||
products: [ | ||
.library( | ||
name: "NYTPhotoViewer", | ||
targets: ["NYTPhotoViewer"]), | ||
], | ||
dependencies: [ | ||
.package(url: "https://github.com/pinterest/PINRemoteImage.git", from: "3.0.1") | ||
], | ||
targets: [ | ||
.target( | ||
name: "NYTPhotoViewer", | ||
dependencies: ["PINRemoteImage"], | ||
path: "NYTPhotoViewer", | ||
exclude: [ | ||
"Info.plist" | ||
mr-fixit marked this conversation as resolved.
Show resolved
Hide resolved
|
||
], | ||
cSettings: [ | ||
.headerSearchPath("./include"), | ||
mr-fixit marked this conversation as resolved.
Show resolved
Hide 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 |
---|---|---|
|
@@ -23,6 +23,18 @@ Clone this locally, then in your local workspace of the `NYTPhotoViewer` repo, r | |
|
||
## Installation | ||
|
||
### Swift Package Manager | ||
|
||
NYTPhotoViewer may be installed via SPM, by pointing at this repo's URL and.. (more TK) | ||
mr-fixit marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "more TK" |
||
|
||
### Cocoapods | ||
|
||
NYTPhotoViewer is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your `Podfile`: | ||
|
||
```ruby | ||
pod 'NYTPhotoViewer' | ||
``` | ||
|
||
### Carthage | ||
|
||
NYTPhotoViewer may be installed via [Carthage](https://github.com/Carthage/Carthage). To install it, simply add the following line to your `Cartfile`: | ||
|
@@ -35,14 +47,6 @@ Then, following the instructions for [integrating Carthage frameworks into your | |
|
||
If you don't want support for animated GIFs, you may instead link against only the `NYTPhotoViewerCore` framework. | ||
|
||
### Cocoapods | ||
|
||
NYTPhotoViewer is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your `Podfile`: | ||
|
||
``` | ||
pod 'NYTPhotoViewer' | ||
``` | ||
|
||
## Requirements | ||
|
||
This library requires a deployment target of iOS 9.0 or greater. | ||
|
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.
Is the name used below still accurate given the change from
NYTPhotoView.bundle
toMedia.xcasssets
in the podspec?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.
yes, because the contents of Media.xcassets are copied into
NYTPhotoViewer.bundle/Assets.car
tested with BP:
tested visually:
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.
test with
actool
:(ha, i wish i could figure out how to get
actool
to list or extract contents!)but we can see the names in the file...