diff --git a/PhotoBrowser/Cartfile b/Cartfile
similarity index 100%
rename from PhotoBrowser/Cartfile
rename to Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
new file mode 100644
index 0000000..38d2bb4
--- /dev/null
+++ b/Cartfile.resolved
@@ -0,0 +1 @@
+github "onevcat/Kingfisher" "2.0.3"
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/.gitignore b/Carthage/Checkouts/Kingfisher/.gitignore
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/.gitignore
rename to Carthage/Checkouts/Kingfisher/.gitignore
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/.swiftlint.yml b/Carthage/Checkouts/Kingfisher/.swiftlint.yml
similarity index 85%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/.swiftlint.yml
rename to Carthage/Checkouts/Kingfisher/.swiftlint.yml
index 21f7572..fe348d2 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/.swiftlint.yml
+++ b/Carthage/Checkouts/Kingfisher/.swiftlint.yml
@@ -7,3 +7,4 @@ disabled_rules:
- opening_brace
- type_body_length
- valid_docs
+ - function_parameter_count
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/.travis.yml b/Carthage/Checkouts/Kingfisher/.travis.yml
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/.travis.yml
rename to Carthage/Checkouts/Kingfisher/.travis.yml
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/CHANGELOG.md b/Carthage/Checkouts/Kingfisher/CHANGELOG.md
similarity index 93%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/CHANGELOG.md
rename to Carthage/Checkouts/Kingfisher/CHANGELOG.md
index ff9a76e..a3a122b 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/CHANGELOG.md
+++ b/Carthage/Checkouts/Kingfisher/CHANGELOG.md
@@ -2,6 +2,15 @@
-----
+## [2.0.3 - Holiday Issues](https://github.com/onevcat/Kingfisher/releases/tag/2.0.3) (2016-02-17)
+
+#### Fix
+* A memory leak caused by retain cycle of downloader session and its delegate. [#235](https://github.com/onevcat/Kingfisher/issues/235)
+* Now the `callbackDispatchQueue` in option should be applied to `ImageDownloader` as well. [#238](https://github.com/onevcat/Kingfisher/pull/238) and [#240](https://github.com/onevcat/Kingfisher/pull/240)
+* Fix warnings when the latest version of SwiftLint is used. [#189](https://github.com/onevcat/Kingfisher/issues/189#issuecomment-185205010)
+
+---
+
## [2.0.2 - Single Frame GIF](https://github.com/onevcat/Kingfisher/releases/tag/2.0.2) (2016-02-14)
#### Fix
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/AppDelegate.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/AppDelegate.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/AppDelegate.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/AppDelegate.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/LaunchScreen.xib b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/LaunchScreen.xib
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/LaunchScreen.xib
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/LaunchScreen.xib
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/Main.storyboard b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/Main.storyboard
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/Main.storyboard
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Base.lproj/Main.storyboard
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/CollectionViewCell.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/CollectionViewCell.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/CollectionViewCell.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/CollectionViewCell.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Images.xcassets/AppIcon.appiconset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Images.xcassets/AppIcon.appiconset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist
similarity index 96%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist
index 6d09cd7..a83fac4 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
LSRequiresIPhoneOS
UILaunchStoryboardName
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/ViewController.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/ViewController.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/ViewController.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-Demo/ViewController.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/AppDelegate.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/AppDelegate.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/AppDelegate.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/AppDelegate.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Base.lproj/Main.storyboard b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Base.lproj/Main.storyboard
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Base.lproj/Main.storyboard
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Base.lproj/Main.storyboard
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Cell.xib b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Cell.xib
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Cell.xib
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Cell.xib
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist
similarity index 95%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist
index b303730..5419544 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
NSHumanReadableCopyright
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/ViewController.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/ViewController.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/ViewController.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-OSX-Demo/ViewController.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/AppDelegate.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/AppDelegate.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/AppDelegate.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/AppDelegate.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/LaunchImage.launchimage/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/LaunchImage.launchimage/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/LaunchImage.launchimage/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Assets.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Base.lproj/Main.storyboard b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Base.lproj/Main.storyboard
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Base.lproj/Main.storyboard
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Base.lproj/Main.storyboard
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist
similarity index 94%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist
index 553c0a1..c51b19a 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-tvOS-Demo/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
LSRequiresIPhoneOS
UIMainStoryboardFile
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Assets.xcassets/README__ignoredByTemplate__ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Assets.xcassets/README__ignoredByTemplate__
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Assets.xcassets/README__ignoredByTemplate__
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Assets.xcassets/README__ignoredByTemplate__
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/ExtensionDelegate.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/ExtensionDelegate.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/ExtensionDelegate.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/ExtensionDelegate.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist
similarity index 96%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist
index a23dc35..22494ba 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
NSExtension
NSExtensionAttributes
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/InterfaceController.swift b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/InterfaceController.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/InterfaceController.swift
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo Extension/InterfaceController.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Base.lproj/Interface.storyboard b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Base.lproj/Interface.storyboard
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Base.lproj/Interface.storyboard
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Base.lproj/Interface.storyboard
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist
similarity index 95%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist
rename to Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist
index 9105b6c..6e6cfbe 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Demo/Kingfisher-watchOS-Demo/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.podspec b/Carthage/Checkouts/Kingfisher/Kingfisher.podspec
similarity index 98%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.podspec
rename to Carthage/Checkouts/Kingfisher/Kingfisher.podspec
index a0e8d88..98d7838 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.podspec
+++ b/Carthage/Checkouts/Kingfisher/Kingfisher.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Kingfisher"
- s.version = "2.0.2"
+ s.version = "2.0.3"
s.summary = "A lightweight and pure Swift implemented library for downloading and cacheing image from the web."
s.description = <<-DESC
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj
similarity index 99%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj
index 4d4b12b..11a67cf 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj
+++ b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.pbxproj
@@ -1485,11 +1485,11 @@
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
@@ -1511,11 +1511,11 @@
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
@@ -1677,11 +1677,11 @@
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Sources/Info.plist;
@@ -1704,11 +1704,11 @@
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Sources/Info.plist;
@@ -1729,11 +1729,11 @@
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Sources/Info.plist;
@@ -1754,11 +1754,11 @@
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Sources/Info.plist;
@@ -1961,10 +1961,10 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1985,10 +1985,10 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 513;
+ CURRENT_PROJECT_VERSION = 536;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 513;
+ DYLIB_CURRENT_VERSION = 536;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/74237B0B-7981-4A24-B6C4-95F4A5E7727F.plist b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/74237B0B-7981-4A24-B6C4-95F4A5E7727F.plist
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/74237B0B-7981-4A24-B6C4-95F4A5E7727F.plist
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/74237B0B-7981-4A24-B6C4-95F4A5E7727F.plist
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/Info.plist b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/Info.plist
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/Info.plist
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcbaselines/D1ED2D3E1AD2D09F00CFC3EB.xcbaseline/Info.plist
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-OSX.xcscheme b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-OSX.xcscheme
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-OSX.xcscheme
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-OSX.xcscheme
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-tvOS.xcscheme b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-tvOS.xcscheme
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-tvOS.xcscheme
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-tvOS.xcscheme
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-watchOS.xcscheme b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-watchOS.xcscheme
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-watchOS.xcscheme
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-watchOS.xcscheme
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme b/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcworkspace/contents.xcworkspacedata b/Carthage/Checkouts/Kingfisher/Kingfisher.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Kingfisher.xcworkspace/contents.xcworkspacedata
rename to Carthage/Checkouts/Kingfisher/Kingfisher.xcworkspace/contents.xcworkspacedata
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/LICENSE b/Carthage/Checkouts/Kingfisher/LICENSE
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/LICENSE
rename to Carthage/Checkouts/Kingfisher/LICENSE
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Package.swift b/Carthage/Checkouts/Kingfisher/Package.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Package.swift
rename to Carthage/Checkouts/Kingfisher/Package.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Podfile b/Carthage/Checkouts/Kingfisher/Podfile
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Podfile
rename to Carthage/Checkouts/Kingfisher/Podfile
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Podfile.lock b/Carthage/Checkouts/Kingfisher/Podfile.lock
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Podfile.lock
rename to Carthage/Checkouts/Kingfisher/Podfile.lock
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSDataMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSDataMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSDataMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSDataMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPBody.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPBody.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPBody.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPBody.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPClientHook.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPClientHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPClientHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPClientHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDSLRepresentation.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPResponse.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPResponse.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPResponse.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPResponse.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLHook.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSNocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSRegexMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSRegexMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSRegexMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSRegexMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStringMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStringMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStringMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStringMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequestDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequestDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequestDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubRequestDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponse.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponse.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponse.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponse.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponseDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponseDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponseDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/LSStubResponseDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSData+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSRegularExpression+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSRegularExpression+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSRegularExpression+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSRegularExpression+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSString+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/asihttprequeststub.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/asihttprequeststub.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/asihttprequeststub.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Private/Nocilla/asihttprequeststub.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSHTTPBody.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSHTTPBody.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSHTTPBody.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSHTTPBody.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSMatcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSMatcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSMatcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSMatcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSNocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSNocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSNocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSNocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubRequestDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubRequestDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubRequestDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubRequestDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubResponseDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubResponseDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubResponseDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/LSStubResponseDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSData+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSRegularExpression+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSRegularExpression+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSRegularExpression+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSRegularExpression+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/NSString+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Headers/Public/Nocilla/Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Local Podspecs/Nocilla.podspec.json b/Carthage/Checkouts/Kingfisher/Pods/Local Podspecs/Nocilla.podspec.json
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Local Podspecs/Nocilla.podspec.json
rename to Carthage/Checkouts/Kingfisher/Pods/Local Podspecs/Nocilla.podspec.json
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Manifest.lock b/Carthage/Checkouts/Kingfisher/Pods/Manifest.lock
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Manifest.lock
rename to Carthage/Checkouts/Kingfisher/Pods/Manifest.lock
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/LICENSE b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/LICENSE
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/LICENSE
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/LICENSE
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/DSL/LSStubResponseDSL.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Diff/LSHTTPRequestDiff.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/ASIHTTPRequestStub.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestAdapter.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/ASIHTTPRequest/LSASIHTTPRequestHook.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/LSHTTPClientHook.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSHTTPStubURLProtocol.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/LSNSURLHook.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+DSL.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLRequest/NSURLRequest+LSHTTPRequest.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Hooks/NSURLSession/LSNSURLSessionHook.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/LSNocilla.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSDataMatcher.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSMatcher.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSRegexMatcher.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/LSStringMatcher.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSData+Matcheable.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSRegularExpression+Matcheable.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Matchers/NSString+Matcheable.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPBody.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPBody.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPBody.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPBody.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPResponse.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPResponse.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPResponse.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Model/LSHTTPResponse.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Nocilla.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Nocilla.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Nocilla.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Nocilla.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubRequest.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.h b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.h
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.m b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.m
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/Nocilla/Stubs/LSStubResponse.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/README.md b/Carthage/Checkouts/Kingfisher/Pods/Nocilla/README.md
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Nocilla/README.md
rename to Carthage/Checkouts/Kingfisher/Pods/Nocilla/README.md
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Pods.xcodeproj/project.pbxproj b/Carthage/Checkouts/Kingfisher/Pods/Pods.xcodeproj/project.pbxproj
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Pods.xcodeproj/project.pbxproj
rename to Carthage/Checkouts/Kingfisher/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-prefix.pch b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-prefix.pch
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-prefix.pch
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla-prefix.pch
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-Nocilla/Pods-KingfisherTests-Nocilla.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-prefix.pch b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-prefix.pch
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-prefix.pch
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla-prefix.pch
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX-Nocilla/Pods-KingfisherTests-OSX-Nocilla.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.markdown b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.markdown
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.markdown
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.markdown
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.plist b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.plist
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.plist
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-acknowledgements.plist
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-frameworks.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-frameworks.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-frameworks.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-frameworks.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-resources.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-resources.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-resources.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX-resources.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.debug.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.debug.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.debug.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.debug.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.release.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.release.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.release.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-OSX/Pods-KingfisherTests-OSX.release.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-prefix.pch b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-prefix.pch
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-prefix.pch
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla-prefix.pch
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS-Nocilla/Pods-KingfisherTests-tvOS-Nocilla.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.markdown b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.markdown
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.markdown
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.markdown
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.plist b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.plist
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.plist
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-acknowledgements.plist
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-frameworks.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-frameworks.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-frameworks.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-frameworks.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-resources.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-resources.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-resources.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS-resources.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.debug.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.debug.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.debug.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.debug.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.release.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.release.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.release.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests-tvOS/Pods-KingfisherTests-tvOS.release.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.markdown b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.markdown
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.markdown
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.markdown
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.plist b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.plist
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.plist
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-acknowledgements.plist
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-dummy.m b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-dummy.m
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-dummy.m
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-dummy.m
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-frameworks.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-frameworks.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-frameworks.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-frameworks.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-resources.sh b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-resources.sh
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-resources.sh
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests-resources.sh
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.debug.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.debug.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.debug.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.debug.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.release.xcconfig b/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.release.xcconfig
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.release.xcconfig
rename to Carthage/Checkouts/Kingfisher/Pods/Target Support Files/Pods-KingfisherTests/Pods-KingfisherTests.release.xcconfig
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/README.md b/Carthage/Checkouts/Kingfisher/README.md
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/README.md
rename to Carthage/Checkouts/Kingfisher/README.md
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Image.swift b/Carthage/Checkouts/Kingfisher/Sources/Image.swift
similarity index 99%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Image.swift
rename to Carthage/Checkouts/Kingfisher/Sources/Image.swift
index ae2cf52..a800846 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Image.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/Image.swift
@@ -113,7 +113,7 @@ extension Image {
}
/**
- Normalize the image. This method will try to redraw an image with orientation and sclae considered.
+ Normalize the image. This method will try to redraw an image with orientation and scale considered.
- returns: The normalized image with orientation set to up and correct scale.
*/
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift b/Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift
similarity index 88%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift
rename to Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift
index 860a569..bd009c1 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/ImageCache.swift
@@ -276,45 +276,47 @@ extension ImageCache {
}
var block: RetrieveImageDiskTask?
+ let options = options ?? KingfisherEmptyOptionsInfo
+
if let image = self.retrieveImageInMemoryCacheForKey(key) {
-
//Found image in memory cache.
- if let options = options where options.backgroundDecode {
+ if options.backgroundDecode {
dispatch_async(self.processQueue, { () -> Void in
let result = image.kf_decodedImage(scale: options.scaleFactor)
- dispatch_async(options.callbackDispatchQueue, { () -> Void in
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
completionHandler(result, .Memory)
})
})
} else {
- completionHandler(image, .Memory)
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
+ completionHandler(image, .Memory)
+ })
}
} else {
var sSelf: ImageCache! = self
block = dispatch_block_create(DISPATCH_BLOCK_INHERIT_QOS_CLASS) {
// Begin to load image from disk
- let options = options ?? KingfisherEmptyOptionsInfo
if let image = sSelf.retrieveImageInDiskCacheForKey(key, scale: options.scaleFactor) {
if options.backgroundDecode {
dispatch_async(sSelf.processQueue, { () -> Void in
let result = image.kf_decodedImage(scale: options.scaleFactor)
sSelf.storeImage(result!, forKey: key, toDisk: false, completionHandler: nil)
- dispatch_async(options.callbackDispatchQueue, { () -> Void in
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
completionHandler(result, .Memory)
sSelf = nil
})
})
} else {
sSelf.storeImage(image, forKey: key, toDisk: false, completionHandler: nil)
- dispatch_async(options.callbackDispatchQueue, { () -> Void in
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
completionHandler(image, .Disk)
sSelf = nil
})
}
} else {
// No image found from either memory or disk
- dispatch_async(options.callbackDispatchQueue, { () -> Void in
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
completionHandler(nil, nil)
sSelf = nil
})
@@ -402,47 +404,12 @@ extension ImageCache {
- parameter completionHandler: Called after the operation completes.
*/
public func cleanExpiredDiskCacheWithCompletionHander(completionHandler: (()->())?) {
+
// Do things in cocurrent io queue
dispatch_async(ioQueue, { () -> Void in
- let diskCacheURL = NSURL(fileURLWithPath: self.diskCachePath)
- let resourceKeys = [NSURLIsDirectoryKey, NSURLContentModificationDateKey, NSURLTotalFileAllocatedSizeKey]
- let expiredDate = NSDate(timeIntervalSinceNow: -self.maxCachePeriodInSecond)
- var cachedFiles = [NSURL: [NSObject: AnyObject]]()
- var URLsToDelete = [NSURL]()
- var diskCacheSize: UInt = 0
+ var (URLsToDelete, diskCacheSize, cachedFiles) = self.travelCachedFiles(onlyForCacheSize: false)
- if let fileEnumerator = self.fileManager.enumeratorAtURL(diskCacheURL, includingPropertiesForKeys: resourceKeys, options: NSDirectoryEnumerationOptions.SkipsHiddenFiles, errorHandler: nil),
- urls = fileEnumerator.allObjects as? [NSURL] {
- for fileURL in urls {
-
- do {
- let resourceValues = try fileURL.resourceValuesForKeys(resourceKeys)
- // If it is a Directory. Continue to next file URL.
- if let isDirectory = resourceValues[NSURLIsDirectoryKey] as? NSNumber {
- if isDirectory.boolValue {
- continue
- }
- }
-
- // If this file is expired, add it to URLsToDelete
- if let modificationDate = resourceValues[NSURLContentModificationDateKey] as? NSDate {
- if modificationDate.laterDate(expiredDate) == expiredDate {
- URLsToDelete.append(fileURL)
- continue
- }
- }
-
- if let fileSize = resourceValues[NSURLTotalFileAllocatedSizeKey] as? NSNumber {
- diskCacheSize += fileSize.unsignedLongValue
- cachedFiles[fileURL] = resourceValues
- }
- } catch _ {
- }
-
- }
- }
-
for fileURL in URLsToDelete {
do {
try self.fileManager.removeItemAtURL(fileURL)
@@ -500,6 +467,53 @@ extension ImageCache {
})
}
+ private func travelCachedFiles(onlyForCacheSize onlyForCacheSize: Bool) -> (URLsToDelete: [NSURL], diskCacheSize: UInt, cachedFiles: [NSURL: [NSObject: AnyObject]]) {
+
+ let diskCacheURL = NSURL(fileURLWithPath: diskCachePath)
+ let resourceKeys = [NSURLIsDirectoryKey, NSURLContentModificationDateKey, NSURLTotalFileAllocatedSizeKey]
+ let expiredDate = NSDate(timeIntervalSinceNow: -self.maxCachePeriodInSecond)
+
+ var cachedFiles = [NSURL: [NSObject: AnyObject]]()
+ var URLsToDelete = [NSURL]()
+ var diskCacheSize: UInt = 0
+
+ if let fileEnumerator = self.fileManager.enumeratorAtURL(diskCacheURL, includingPropertiesForKeys: resourceKeys, options: NSDirectoryEnumerationOptions.SkipsHiddenFiles, errorHandler: nil),
+ urls = fileEnumerator.allObjects as? [NSURL] {
+ for fileURL in urls {
+
+ do {
+ let resourceValues = try fileURL.resourceValuesForKeys(resourceKeys)
+ // If it is a Directory. Continue to next file URL.
+ if let isDirectory = resourceValues[NSURLIsDirectoryKey] as? NSNumber {
+ if isDirectory.boolValue {
+ continue
+ }
+ }
+
+ if !onlyForCacheSize {
+ // If this file is expired, add it to URLsToDelete
+ if let modificationDate = resourceValues[NSURLContentModificationDateKey] as? NSDate {
+ if modificationDate.laterDate(expiredDate) == expiredDate {
+ URLsToDelete.append(fileURL)
+ continue
+ }
+ }
+ }
+
+ if let fileSize = resourceValues[NSURLTotalFileAllocatedSizeKey] as? NSNumber {
+ diskCacheSize += fileSize.unsignedLongValue
+ if !onlyForCacheSize {
+ cachedFiles[fileURL] = resourceValues
+ }
+ }
+ } catch _ {
+ }
+ }
+ }
+
+ return (URLsToDelete, diskCacheSize, cachedFiles)
+ }
+
#if !os(OSX) && !os(watchOS)
/**
Clean expired disk cache when app in background. This is an async operation.
@@ -584,32 +598,7 @@ extension ImageCache {
*/
public func calculateDiskCacheSizeWithCompletionHandler(completionHandler: ((size: UInt) -> ())) {
dispatch_async(ioQueue, { () -> Void in
- let diskCacheURL = NSURL(fileURLWithPath: self.diskCachePath)
-
- let resourceKeys = [NSURLIsDirectoryKey, NSURLTotalFileAllocatedSizeKey]
- var diskCacheSize: UInt = 0
-
- if let fileEnumerator = self.fileManager.enumeratorAtURL(diskCacheURL, includingPropertiesForKeys: resourceKeys, options: NSDirectoryEnumerationOptions.SkipsHiddenFiles, errorHandler: nil),
- urls = fileEnumerator.allObjects as? [NSURL] {
- for fileURL in urls {
- do {
- let resourceValues = try fileURL.resourceValuesForKeys(resourceKeys)
- // If it is a Directory. Continue to next file URL.
- if let isDirectory = resourceValues[NSURLIsDirectoryKey]?.boolValue {
- if isDirectory {
- continue
- }
- }
-
- if let fileSize = resourceValues[NSURLTotalFileAllocatedSizeKey] as? NSNumber {
- diskCacheSize += fileSize.unsignedLongValue
- }
- } catch _ {
- }
-
- }
- }
-
+ let (_, diskCacheSize, _) = self.travelCachedFiles(onlyForCacheSize: true)
dispatch_async(dispatch_get_main_queue(), { () -> Void in
completionHandler(size: diskCacheSize)
})
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift b/Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift
similarity index 82%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift
rename to Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift
index ff63e7a..d4443e1 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/ImageDownloader.swift
@@ -127,10 +127,11 @@ public class ImageDownloader: NSObject {
/// Use this to set supply a configuration for the downloader. By default, NSURLSessionConfiguration.ephemeralSessionConfiguration() will be used. You could change the configuration before a downloaing task starts. A configuration without persistent storage for caches is requsted for downloader working correctly.
public var sessionConfiguration = NSURLSessionConfiguration.ephemeralSessionConfiguration() {
didSet {
- session = NSURLSession(configuration: sessionConfiguration, delegate: self, delegateQueue: NSOperationQueue.mainQueue())
+ session = NSURLSession(configuration: sessionConfiguration, delegate: sessionHandler, delegateQueue: NSOperationQueue.mainQueue())
}
}
+ private var sessionHandler: ImageDownloaderSessionHandler?
private var session: NSURLSession?
/// Delegate of this `ImageDownloader` object. See `ImageDownloaderDelegate` protocol for more.
@@ -167,7 +168,8 @@ public class ImageDownloader: NSObject {
super.init()
- session = NSURLSession(configuration: sessionConfiguration, delegate: self, delegateQueue: NSOperationQueue.mainQueue())
+ sessionHandler = ImageDownloaderSessionHandler()
+ session = NSURLSession(configuration: sessionConfiguration, delegate: sessionHandler, delegateQueue: NSOperationQueue.mainQueue())
}
func fetchLoadForKey(key: NSURL) -> ImageFetchLoad? {
@@ -253,6 +255,9 @@ extension ImageDownloader {
dataTask.priority = options?.downloadPriority ?? NSURLSessionTaskPriorityDefault
dataTask.resume()
+
+ // Hold self while the task is executing.
+ self.sessionHandler?.downloadHolder = self
}
fetchLoad.downloadTaskCount += 1
@@ -299,12 +304,24 @@ extension ImageDownloader {
}
}
-// MARK: - NSURLSessionTaskDelegate
-extension ImageDownloader: NSURLSessionDataDelegate {
+// MARK: - NSURLSessionDataDelegate
+
+// See https://github.com/onevcat/Kingfisher/issues/235
+
+/// Delegate class for `NSURLSessionTaskDelegate`.
+/// The session object will hold its delegate until it gets invalidated.
+/// If we use `ImageDownloader` as the session delegate, it will not be released.
+/// So we need an additional handler to break the retain cycle.
+class ImageDownloaderSessionHandler: NSObject, NSURLSessionDataDelegate {
+
+ // The holder will keep downloader not released while a data task is being executed.
+ // It will be set when the task started, and reset when the task finished.
+ var downloadHolder: ImageDownloader?
+
/**
This method is exposed since the compiler requests. Do not call it.
*/
- public func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveResponse response: NSURLResponse, completionHandler: (NSURLSessionResponseDisposition) -> Void) {
+ internal func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveResponse response: NSURLResponse, completionHandler: (NSURLSessionResponseDisposition) -> Void) {
completionHandler(NSURLSessionResponseDisposition.Allow)
}
@@ -312,13 +329,19 @@ extension ImageDownloader: NSURLSessionDataDelegate {
/**
This method is exposed since the compiler requests. Do not call it.
*/
- public func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveData data: NSData) {
+ internal func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveData data: NSData) {
- if let URL = dataTask.originalRequest?.URL, fetchLoad = fetchLoadForKey(URL) {
+ guard let downloader = downloadHolder else {
+ return
+ }
+
+ if let URL = dataTask.originalRequest?.URL, fetchLoad = downloader.fetchLoadForKey(URL) {
fetchLoad.responseData.appendData(data)
for callbackPair in fetchLoad.callbacks {
- callbackPair.progressBlock?(receivedSize: Int64(fetchLoad.responseData.length), totalSize: dataTask.response!.expectedContentLength)
+ dispatch_async(dispatch_get_main_queue(), { () -> Void in
+ callbackPair.progressBlock?(receivedSize: Int64(fetchLoad.responseData.length), totalSize: dataTask.response!.expectedContentLength)
+ })
}
}
}
@@ -326,7 +349,7 @@ extension ImageDownloader: NSURLSessionDataDelegate {
/**
This method is exposed since the compiler requests. Do not call it.
*/
- public func URLSession(session: NSURLSession, task: NSURLSessionTask, didCompleteWithError error: NSError?) {
+ internal func URLSession(session: NSURLSession, task: NSURLSessionTask, didCompleteWithError error: NSError?) {
if let URL = task.originalRequest?.URL {
if let error = error { // Error happened
@@ -340,10 +363,14 @@ extension ImageDownloader: NSURLSessionDataDelegate {
/**
This method is exposed since the compiler requests. Do not call it.
*/
- public func URLSession(session: NSURLSession, didReceiveChallenge challenge: NSURLAuthenticationChallenge, completionHandler: (NSURLSessionAuthChallengeDisposition, NSURLCredential?) -> Void) {
+ internal func URLSession(session: NSURLSession, didReceiveChallenge challenge: NSURLAuthenticationChallenge, completionHandler: (NSURLSessionAuthChallengeDisposition, NSURLCredential?) -> Void) {
+ guard let downloader = downloadHolder else {
+ return
+ }
+
if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
- if let trustedHosts = trustedHosts where trustedHosts.contains(challenge.protectionSpace.host) {
+ if let trustedHosts = downloader.trustedHosts where trustedHosts.contains(challenge.protectionSpace.host) {
let credential = NSURLCredential(forTrust: challenge.protectionSpace.serverTrust!)
completionHandler(.UseCredential, credential)
return
@@ -354,26 +381,43 @@ extension ImageDownloader: NSURLSessionDataDelegate {
}
private func callbackWithImage(image: Image?, error: NSError?, imageURL: NSURL, originalData: NSData?) {
- if let callbackPairs = fetchLoadForKey(imageURL)?.callbacks {
+
+ guard let downloader = downloadHolder else {
+ return
+ }
+
+ if let callbackPairs = downloader.fetchLoadForKey(imageURL)?.callbacks {
+ let options = downloader.fetchLoadForKey(imageURL)?.options ?? KingfisherEmptyOptionsInfo
- self.cleanForURL(imageURL)
+ downloader.cleanForURL(imageURL)
for callbackPair in callbackPairs {
- callbackPair.completionHander?(image: image, error: error, imageURL: imageURL, originalData: originalData)
+ dispatch_async_safely_to_queue(options.callbackDispatchQueue, { () -> Void in
+ callbackPair.completionHander?(image: image, error: error, imageURL: imageURL, originalData: originalData)
+ })
+ }
+
+ if downloader.fetchLoads.isEmpty {
+ downloadHolder = nil
}
}
}
private func processImageForTask(task: NSURLSessionTask, URL: NSURL) {
+
+ guard let downloader = downloadHolder else {
+ return
+ }
+
// We are on main queue when receiving this.
- dispatch_async(processQueue, { () -> Void in
+ dispatch_async(downloader.processQueue, { () -> Void in
- if let fetchLoad = self.fetchLoadForKey(URL) {
+ if let fetchLoad = downloader.fetchLoadForKey(URL) {
let options = fetchLoad.options ?? KingfisherEmptyOptionsInfo
if let image = Image.kf_imageWithData(fetchLoad.responseData, scale: options.scaleFactor) {
- self.delegate?.imageDownloader?(self, didDownloadImage: image, forURL: URL, withResponse: task.response!)
+ downloader.delegate?.imageDownloader?(downloader, didDownloadImage: image, forURL: URL, withResponse: task.response!)
if options.backgroundDecode {
self.callbackWithImage(image.kf_decodedImage(scale: options.scaleFactor), error: nil, imageURL: URL, originalData: fetchLoad.responseData)
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageTransition.swift b/Carthage/Checkouts/Kingfisher/Sources/ImageTransition.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageTransition.swift
rename to Carthage/Checkouts/Kingfisher/Sources/ImageTransition.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift b/Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift
similarity index 89%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift
rename to Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift
index e153fda..3bb48c2 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/ImageView+Kingfisher.swift
@@ -140,6 +140,9 @@ extension ImageView {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithResource(resource: Resource,
placeholderImage: Image?,
@@ -158,6 +161,9 @@ extension ImageView {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithURL(URL: NSURL,
placeholderImage: Image?,
@@ -177,6 +183,9 @@ extension ImageView {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithResource(resource: Resource,
placeholderImage: Image?,
@@ -199,16 +208,12 @@ extension ImageView {
let task = KingfisherManager.sharedManager.retrieveImageWithResource(resource, optionsInfo: optionsInfo,
progressBlock: { receivedSize, totalSize in
if let progressBlock = progressBlock {
- dispatch_async(dispatch_get_main_queue(), { () -> Void in
- progressBlock(receivedSize: receivedSize, totalSize: totalSize)
-
- })
+ progressBlock(receivedSize: receivedSize, totalSize: totalSize)
}
},
completionHandler: {[weak self] image, error, cacheType, imageURL in
- dispatch_async_safely_main_queue {
-
+ dispatch_async_safely_to_main_queue {
guard let sSelf = self where imageURL == sSelf.kf_webURL else {
completionHandler?(image: image, error: error, cacheType: cacheType, imageURL: imageURL)
return
@@ -221,27 +226,26 @@ extension ImageView {
completionHandler?(image: nil, error: error, cacheType: cacheType, imageURL: imageURL)
return
}
-
-
+
if let transitionItem = optionsInfo?.kf_firstMatchIgnoringAssociatedValue(.Transition(.None)),
case .Transition(let transition) = transitionItem where cacheType == .None {
-#if !os(OSX)
- UIView.transitionWithView(sSelf, duration: 0.0, options: [],
- animations: {
- indicator?.kf_stopAnimating()
- },
- completion: { finished in
- UIView.transitionWithView(sSelf, duration: transition.duration,
- options: transition.animationOptions,
- animations: {
- transition.animations?(sSelf, image)
- },
- completion: { finished in
- transition.completion?(finished)
- completionHandler?(image: image, error: error, cacheType: cacheType, imageURL: imageURL)
+ #if !os(OSX)
+ UIView.transitionWithView(sSelf, duration: 0.0, options: [],
+ animations: {
+ indicator?.kf_stopAnimating()
+ },
+ completion: { finished in
+ UIView.transitionWithView(sSelf, duration: transition.duration,
+ options: transition.animationOptions,
+ animations: {
+ transition.animations?(sSelf, image)
+ },
+ completion: { finished in
+ transition.completion?(finished)
+ completionHandler?(image: image, error: error, cacheType: cacheType, imageURL: imageURL)
})
})
-#endif
+ #endif
} else {
indicator?.kf_stopAnimating()
sSelf.image = image
@@ -265,6 +269,9 @@ extension ImageView {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithURL(URL: NSURL,
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Info.plist b/Carthage/Checkouts/Kingfisher/Sources/Info.plist
similarity index 94%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Info.plist
rename to Carthage/Checkouts/Kingfisher/Sources/Info.plist
index da18e29..2120548 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Sources/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
NSPrincipalClass
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Kingfisher.h b/Carthage/Checkouts/Kingfisher/Sources/Kingfisher.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Kingfisher.h
rename to Carthage/Checkouts/Kingfisher/Sources/Kingfisher.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/KingfisherManager.swift b/Carthage/Checkouts/Kingfisher/Sources/KingfisherManager.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/KingfisherManager.swift
rename to Carthage/Checkouts/Kingfisher/Sources/KingfisherManager.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/KingfisherOptionsInfo.swift b/Carthage/Checkouts/Kingfisher/Sources/KingfisherOptionsInfo.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/KingfisherOptionsInfo.swift
rename to Carthage/Checkouts/Kingfisher/Sources/KingfisherOptionsInfo.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Resource.swift b/Carthage/Checkouts/Kingfisher/Sources/Resource.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/Resource.swift
rename to Carthage/Checkouts/Kingfisher/Sources/Resource.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/String+MD5.swift b/Carthage/Checkouts/Kingfisher/Sources/String+MD5.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/String+MD5.swift
rename to Carthage/Checkouts/Kingfisher/Sources/String+MD5.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift b/Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift
similarity index 71%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift
rename to Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift
index d1f0ec5..1645ece 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/ThreadHelper.swift
@@ -26,11 +26,18 @@
import Foundation
-func dispatch_async_safely_main_queue(block: ()->()) {
- if NSThread.isMainThread() {
+func dispatch_async_safely_to_main_queue(block: ()->()) {
+ dispatch_async_safely_to_queue(dispatch_get_main_queue(), block)
+}
+
+// This methd will dispatch the `block` to a specified `queue`.
+// If the `queue` is the main queue, and current thread is main thread, the block
+// will be invoked immediately instead of being dispatched.
+func dispatch_async_safely_to_queue(queue: dispatch_queue_t, _ block: ()->()) {
+ if queue === dispatch_get_main_queue() && NSThread.isMainThread() {
block()
} else {
- dispatch_async(dispatch_get_main_queue()) {
+ dispatch_async(queue) {
block()
}
}
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift b/Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift
similarity index 94%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift
rename to Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift
index 839d461..71a4750 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift
+++ b/Carthage/Checkouts/Kingfisher/Sources/UIButton+Kingfisher.swift
@@ -145,6 +145,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithResource(resource: Resource,
forState state: UIControlState,
@@ -165,6 +168,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithURL(URL: NSURL,
forState state: UIControlState,
@@ -187,6 +193,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithResource(resource: Resource,
forState state: UIControlState,
@@ -200,14 +209,11 @@ extension UIButton {
let task = KingfisherManager.sharedManager.retrieveImageWithResource(resource, optionsInfo: optionsInfo,
progressBlock: { receivedSize, totalSize in
if let progressBlock = progressBlock {
- dispatch_async(dispatch_get_main_queue(), { () -> Void in
- progressBlock(receivedSize: receivedSize, totalSize: totalSize)
- })
+ progressBlock(receivedSize: receivedSize, totalSize: totalSize)
}
},
completionHandler: {[weak self] image, error, cacheType, imageURL in
-
- dispatch_async_safely_main_queue {
+ dispatch_async_safely_to_main_queue {
if let sSelf = self {
sSelf.kf_setImageTask(nil)
@@ -235,6 +241,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setImageWithURL(URL: NSURL,
forState state: UIControlState,
@@ -410,6 +419,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setBackgroundImageWithResource(resource: Resource,
forState state: UIControlState,
@@ -430,6 +442,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setBackgroundImageWithURL(URL: NSURL,
forState state: UIControlState,
@@ -452,6 +467,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setBackgroundImageWithResource(resource: Resource,
forState state: UIControlState,
@@ -465,14 +483,11 @@ extension UIButton {
let task = KingfisherManager.sharedManager.retrieveImageWithResource(resource, optionsInfo: optionsInfo,
progressBlock: { receivedSize, totalSize in
if let progressBlock = progressBlock {
- dispatch_async(dispatch_get_main_queue(), { () -> Void in
- progressBlock(receivedSize: receivedSize, totalSize: totalSize)
- })
+ progressBlock(receivedSize: receivedSize, totalSize: totalSize)
}
},
completionHandler: { [weak self] image, error, cacheType, imageURL in
- dispatch_async_safely_main_queue {
-
+ dispatch_async_safely_to_main_queue {
if let sSelf = self {
sSelf.kf_setBackgroundImageTask(nil)
@@ -501,6 +516,9 @@ extension UIButton {
- parameter completionHandler: Called when the image retrieved and set.
- returns: A task represents the retrieving process.
+
+ - note: Both the `progressBlock` and `completionHandler` will be invoked in main thread.
+ The `CallbackDispatchQueue` specified in `optionsInfo` will not be used in callbacks of this method.
*/
public func kf_setBackgroundImageWithURL(URL: NSURL,
forState state: UIControlState,
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist
similarity index 93%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist
index 7095afd..ec55afa 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist
similarity index 93%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist
index 7095afd..ec55afa 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-OSX/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageCacheTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageCacheTests.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageCacheTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageCacheTests.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageDownloaderTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageDownloaderTests.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageDownloaderTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageDownloaderTests.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageExtensionTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageExtensionTests.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageExtensionTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageExtensionTests.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift
similarity index 94%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift
index 262c6af..239ca0d 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift
+++ b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/ImageViewExtensionTests.swift
@@ -70,6 +70,7 @@ class ImageViewExtensionTests: XCTestCase {
imageView.kf_setImageWithURL(URL, placeholderImage: nil, optionsInfo: nil, progressBlock: { (receivedSize, totalSize) -> () in
progressBlockIsCalled = true
+ XCTAssertTrue(NSThread.isMainThread())
}) { (image, error, cacheType, imageURL) -> () in
expectation.fulfill()
@@ -80,6 +81,25 @@ class ImageViewExtensionTests: XCTestCase {
XCTAssert(self.imageView.kf_webURL == imageURL, "Web URL should equal to the downloaded url.")
XCTAssert(cacheType == .None, "The cache type should be none here. This image was just downloaded.")
+ XCTAssertTrue(NSThread.isMainThread())
+ }
+
+ waitForExpectationsWithTimeout(5, handler: nil)
+ }
+
+ func testImageDownloadCompletionHandlerRunningOnMainQueue() {
+ let expectation = expectationWithDescription("wait for downloading image")
+
+ let URLString = testKeys[0]
+ stubRequest("GET", URLString).andReturn(200).withBody(testImageData)
+ let URL = NSURL(string: URLString)!
+
+ let customQueue = dispatch_queue_create("com.kingfisher.testQueue", DISPATCH_QUEUE_SERIAL)
+ imageView.kf_setImageWithURL(URL, placeholderImage: nil, optionsInfo: [.CallbackDispatchQueue(customQueue)], progressBlock: { (receivedSize, totalSize) -> () in
+ XCTAssertTrue(NSThread.isMainThread())
+ }) { (image, error, cacheType, imageURL) -> () in
+ XCTAssertTrue(NSThread.isMainThread(), "The image extension callback should be always in main queue.")
+ expectation.fulfill()
}
waitForExpectationsWithTimeout(5, handler: nil)
@@ -151,6 +171,8 @@ class ImageViewExtensionTests: XCTestCase {
var progressBlockIsCalled = false
var completionBlockIsCalled = false
+ cleanDefaultCache()
+
let task = imageView.kf_setImageWithURL(URL, placeholderImage: nil, optionsInfo: nil, progressBlock: { (receivedSize, totalSize) -> () in
progressBlockIsCalled = true
}) { (image, error, cacheType, imageURL) -> () in
@@ -167,7 +189,7 @@ class ImageViewExtensionTests: XCTestCase {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(Double(NSEC_PER_SEC) * 0.2)), dispatch_get_main_queue()) { () -> Void in
expectation.fulfill()
XCTAssert(progressBlockIsCalled == false, "ProgressBlock should not be called since it is canceled.")
- XCTAssert(completionBlockIsCalled == true, "CompletionBlock should not be called since it is canceled.")
+ XCTAssert(completionBlockIsCalled == true, "CompletionBlock should be called with error.")
}
waitForExpectationsWithTimeout(5, handler: nil)
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist
similarity index 93%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist
index 7095afd..ec55afa 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests-tvOS/Info.plist
+++ b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.0.2
+ 2.0.3
CFBundleSignature
????
CFBundleVersion
- 513
+ 536
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift
similarity index 58%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift
index 8cd943a..dd604c9 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift
+++ b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherManagerTests.swift
@@ -129,4 +129,78 @@ class KingfisherManagerTests: XCTestCase {
waitForExpectationsWithTimeout(5, handler: nil)
}
+
+ func testSuccessCompletionHandlerRunningOnMainQueueDefaultly() {
+ let progressExpectation = expectationWithDescription("progressBlock running on main queue")
+ let completionExpectation = expectationWithDescription("completionHandler running on main queue")
+ let URLString = testKeys[0]
+ stubRequest("GET", URLString).andReturn(200).withBody(testImageData)
+
+ let URL = NSURL(string: URLString)!
+
+ manager.retrieveImageWithURL(URL, optionsInfo: nil, progressBlock: { _, _ in
+ XCTAssertTrue(NSThread.isMainThread())
+ progressExpectation.fulfill()
+ }, completionHandler: { _, error, _, _ in
+ XCTAssertNil(error)
+ XCTAssertTrue(NSThread.isMainThread())
+ completionExpectation.fulfill()
+ })
+ waitForExpectationsWithTimeout(5, handler: nil)
+ }
+
+ func testErrorCompletionHandlerRunningOnMainQueueDefaultly() {
+ let expectation = expectationWithDescription("running on main queue")
+ let URLString = testKeys[0]
+ stubRequest("GET", URLString).andReturn(404)
+
+ let URL = NSURL(string: URLString)!
+
+ manager.retrieveImageWithURL(URL, optionsInfo: nil, progressBlock: { _, _ in
+ //won't be called
+ }, completionHandler: { _, error, _, _ in
+ XCTAssertNotNil(error)
+ XCTAssertTrue(NSThread.isMainThread())
+ expectation.fulfill()
+ })
+ waitForExpectationsWithTimeout(5, handler: nil)
+ }
+
+ func testSucessCompletionHandlerRunningOnCustomQueue() {
+ let progressExpectation = expectationWithDescription("progressBlock running on custom queue")
+ let completionExpectation = expectationWithDescription("completionHandler running on custom queue")
+ let URLString = testKeys[0]
+ stubRequest("GET", URLString).andReturn(200).withBody(testImageData)
+
+ let URL = NSURL(string: URLString)!
+
+ let customQueue = dispatch_queue_create("com.kingfisher.testQueue", DISPATCH_QUEUE_SERIAL)
+ manager.retrieveImageWithURL(URL, optionsInfo: [.CallbackDispatchQueue(customQueue)], progressBlock: { _, _ in
+ XCTAssertTrue(NSThread.isMainThread())
+ progressExpectation.fulfill()
+ }, completionHandler: { _, error, _, _ in
+ XCTAssertNil(error)
+ XCTAssertEqual(String(UTF8String: dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL))!, "com.kingfisher.testQueue")
+ completionExpectation.fulfill()
+ })
+ waitForExpectationsWithTimeout(5, handler: nil)
+ }
+
+ func testErrorCompletionHandlerRunningOnCustomQueue() {
+ let expectation = expectationWithDescription("running on custom queue")
+ let URLString = testKeys[0]
+ stubRequest("GET", URLString).andReturn(404)
+
+ let URL = NSURL(string: URLString)!
+
+ let customQueue = dispatch_queue_create("com.kingfisher.testQueue", DISPATCH_QUEUE_SERIAL)
+ manager.retrieveImageWithURL(URL, optionsInfo: [.CallbackDispatchQueue(customQueue)], progressBlock: { _, _ in
+ //won't be called
+ }, completionHandler: { _, error, _, _ in
+ XCTAssertNotNil(error)
+ XCTAssertEqual(String(UTF8String: dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL))!, "com.kingfisher.testQueue")
+ expectation.fulfill()
+ })
+ waitForExpectationsWithTimeout(5, handler: nil)
+ }
}
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherOptionsInfoTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherOptionsInfoTests.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherOptionsInfoTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherOptionsInfoTests.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTestHelper.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTestHelper.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTestHelper.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTestHelper.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTests-Bridging-Header.h b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTests-Bridging-Header.h
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTests-Bridging-Header.h
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/KingfisherTests-Bridging-Header.h
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/UIButtonExtensionTests.swift b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/UIButtonExtensionTests.swift
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/UIButtonExtensionTests.swift
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/UIButtonExtensionTests.swift
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/dancing-banana.gif b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/dancing-banana.gif
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/dancing-banana.gif
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/dancing-banana.gif
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/single-frame.gif b/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/single-frame.gif
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/single-frame.gif
rename to Carthage/Checkouts/Kingfisher/Tests/KingfisherTests/single-frame.gif
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/Fastfile b/Carthage/Checkouts/Kingfisher/fastlane/Fastfile
similarity index 91%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/Fastfile
rename to Carthage/Checkouts/Kingfisher/fastlane/Fastfile
index 7aef829..8533279 100644
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/Fastfile
+++ b/Carthage/Checkouts/Kingfisher/fastlane/Fastfile
@@ -15,6 +15,12 @@ platform :ios do
scan(scheme: "Kingfisher-tvOS", clean: true)
end
+ desc "Swift Lint"
+ lane :upgrade_swift_lint do
+ Actions.sh("brew update")
+ Actions.sh("brew install swiftlint")
+ end
+
desc "Build for Carthage"
lane :carthage_lint do
Actions.sh("cd .. && carthage build --no-skip-current && cd fastlane")
@@ -36,6 +42,8 @@ platform :ios do
target_version = options[:version]
raise "The version is missed. Use `fastlane release version:{version_number}`.`" if target_version.nil?
+ upgrade_swift_lint
+
ensure_git_branch
ensure_git_status_clean
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/extract_current_change_log.rb b/Carthage/Checkouts/Kingfisher/fastlane/actions/extract_current_change_log.rb
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/extract_current_change_log.rb
rename to Carthage/Checkouts/Kingfisher/fastlane/actions/extract_current_change_log.rb
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/git_commit_all.rb b/Carthage/Checkouts/Kingfisher/fastlane/actions/git_commit_all.rb
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/git_commit_all.rb
rename to Carthage/Checkouts/Kingfisher/fastlane/actions/git_commit_all.rb
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/sync_build_number_to_git.rb b/Carthage/Checkouts/Kingfisher/fastlane/actions/sync_build_number_to_git.rb
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/sync_build_number_to_git.rb
rename to Carthage/Checkouts/Kingfisher/fastlane/actions/sync_build_number_to_git.rb
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/update_change_log.rb b/Carthage/Checkouts/Kingfisher/fastlane/actions/update_change_log.rb
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/fastlane/actions/update_change_log.rb
rename to Carthage/Checkouts/Kingfisher/fastlane/actions/update_change_log.rb
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-1.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-1.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-1.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-1.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-10.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-10.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-10.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-10.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-2.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-2.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-2.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-2.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-3.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-3.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-3.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-3.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-4.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-4.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-4.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-4.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-5.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-5.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-5.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-5.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-6.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-6.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-6.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-6.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-7.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-7.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-7.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-7.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-8.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-8.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-8.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-8.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-9.jpg b/Carthage/Checkouts/Kingfisher/images/kingfisher-9.jpg
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/kingfisher-9.jpg
rename to Carthage/Checkouts/Kingfisher/images/kingfisher-9.jpg
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/images/logo.png b/Carthage/Checkouts/Kingfisher/images/logo.png
similarity index 100%
rename from PhotoBrowser/Carthage/Checkouts/Kingfisher/images/logo.png
rename to Carthage/Checkouts/Kingfisher/images/logo.png
diff --git a/PhotoBrowser/Images.xcassets/Contents.json b/Images.xcassets/Contents.json
similarity index 100%
rename from PhotoBrowser/Images.xcassets/Contents.json
rename to Images.xcassets/Contents.json
diff --git a/PhotoBrowser/Images.xcassets/icon-logo-white.imageset/Contents.json b/Images.xcassets/icon-logo-white.imageset/Contents.json
similarity index 100%
rename from PhotoBrowser/Images.xcassets/icon-logo-white.imageset/Contents.json
rename to Images.xcassets/icon-logo-white.imageset/Contents.json
diff --git a/PhotoBrowser/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf b/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf
similarity index 100%
rename from PhotoBrowser/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf
rename to Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf
diff --git a/PhotoBrowser/PhotoBrowser.xcodeproj/project.pbxproj b/PhotoBrowser.xcodeproj/project.pbxproj
similarity index 98%
rename from PhotoBrowser/PhotoBrowser.xcodeproj/project.pbxproj
rename to PhotoBrowser.xcodeproj/project.pbxproj
index 5b52b08..6687477 100644
--- a/PhotoBrowser/PhotoBrowser.xcodeproj/project.pbxproj
+++ b/PhotoBrowser.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 4A0B3FDF1C76DB300049338C /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */; };
4A52D1E41C72CB2E001C257B /* PhotoBrowser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A52D1E31C72CB2E001C257B /* PhotoBrowser.h */; settings = {ATTRIBUTES = (Public, ); }; };
4A52D1EB1C72CB2E001C257B /* PhotoBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */; };
4A52D1F01C72CB2E001C257B /* PhotoBrowserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D1EF1C72CB2E001C257B /* PhotoBrowserTests.swift */; };
@@ -15,7 +16,6 @@
4A52D2361C72F524001C257B /* WaitingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2351C72F524001C257B /* WaitingView.swift */; };
4A52D2381C72F568001C257B /* PhotoPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2371C72F568001C257B /* PhotoPreviewController.swift */; };
4A52D23A1C7310DD001C257B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2391C7310DD001C257B /* Images.xcassets */; };
- 4A52D2611C74727E001C257B /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A52D2601C74727E001C257B /* Kingfisher.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -29,6 +29,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; };
4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhotoBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4A52D1E31C72CB2E001C257B /* PhotoBrowser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotoBrowser.h; sourceTree = ""; };
4A52D1E51C72CB2E001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
@@ -40,7 +41,6 @@
4A52D2351C72F524001C257B /* WaitingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitingView.swift; sourceTree = ""; };
4A52D2371C72F568001C257B /* PhotoPreviewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoPreviewController.swift; sourceTree = ""; };
4A52D2391C7310DD001C257B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../Images.xcassets; sourceTree = ""; };
- 4A52D2601C74727E001C257B /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -48,7 +48,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 4A52D2611C74727E001C257B /* Kingfisher.framework in Frameworks */,
+ 4A0B3FDF1C76DB300049338C /* Kingfisher.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -66,7 +66,7 @@
4A52D1D61C72CB2E001C257B = {
isa = PBXGroup;
children = (
- 4A52D2601C74727E001C257B /* Kingfisher.framework */,
+ 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */,
4A52D1E21C72CB2E001C257B /* PhotoBrowser */,
4A52D1EE1C72CB2E001C257B /* PhotoBrowserTests */,
4A52D1E11C72CB2E001C257B /* Products */,
diff --git a/PhotoBrowser/PhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/PhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from PhotoBrowser/PhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to PhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/PhotoBrowser/PhotoBrowser.xcodeproj/xcshareddata/xcschemes/PhotoBrowser.xcscheme b/PhotoBrowser.xcodeproj/xcshareddata/xcschemes/PhotoBrowser.xcscheme
similarity index 100%
rename from PhotoBrowser/PhotoBrowser.xcodeproj/xcshareddata/xcschemes/PhotoBrowser.xcscheme
rename to PhotoBrowser.xcodeproj/xcshareddata/xcschemes/PhotoBrowser.xcscheme
diff --git a/PhotoBrowser.xcworkspace/contents.xcworkspacedata b/PhotoBrowser.xcworkspace/contents.xcworkspacedata
index 0be1981..ddb31d9 100644
--- a/PhotoBrowser.xcworkspace/contents.xcworkspacedata
+++ b/PhotoBrowser.xcworkspace/contents.xcworkspacedata
@@ -2,9 +2,9 @@
+ location = "group:PhotoBrowser.xcodeproj">
+ location = "group:PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj">
diff --git a/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate b/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate
index c8443fb..8c4092c 100644
Binary files a/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate and b/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/PhotoBrowser/Cartfile.resolved b/PhotoBrowser/Cartfile.resolved
deleted file mode 100644
index a9cb074..0000000
--- a/PhotoBrowser/Cartfile.resolved
+++ /dev/null
@@ -1 +0,0 @@
-github "onevcat/Kingfisher" "2.0.2"
diff --git a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Carthage/Build b/PhotoBrowser/Carthage/Checkouts/Kingfisher/Carthage/Build
deleted file mode 120000
index 76f9ba2..0000000
--- a/PhotoBrowser/Carthage/Checkouts/Kingfisher/Carthage/Build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../Carthage/Build
\ No newline at end of file
diff --git a/PhotoBrowser/PhotoBrowser/Info.plist b/PhotoBrowser/Info.plist
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/Info.plist
rename to PhotoBrowser/Info.plist
diff --git a/PhotoBrowser/PhotoBrowser/Photo.swift b/PhotoBrowser/Photo.swift
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/Photo.swift
rename to PhotoBrowser/Photo.swift
diff --git a/PhotoBrowser/PhotoBrowser/PhotoBrowser.h b/PhotoBrowser/PhotoBrowser.h
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/PhotoBrowser.h
rename to PhotoBrowser/PhotoBrowser.h
diff --git a/PhotoBrowser/PhotoBrowser/PhotoBrowser.swift b/PhotoBrowser/PhotoBrowser.swift
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/PhotoBrowser.swift
rename to PhotoBrowser/PhotoBrowser.swift
diff --git a/PhotoBrowser/PhotoBrowser.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate b/PhotoBrowser/PhotoBrowser.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index c346fd7..0000000
Binary files a/PhotoBrowser/PhotoBrowser.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/PhotoBrowser/PhotoBrowser.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist b/PhotoBrowser/PhotoBrowser.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 6dc91ad..0000000
--- a/PhotoBrowser/PhotoBrowser.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- SchemeUserState
-
- PhotoBrowser.xcscheme_^#shared#^_
-
- orderHint
- 0
-
-
- SuppressBuildableAutocreation
-
- 4A52D1DF1C72CB2E001C257B
-
- primary
-
-
- 4A52D1E91C72CB2E001C257B
-
- primary
-
-
-
-
-
diff --git a/PhotoBrowser/PhotoBrowser/PhotoPreviewController.swift b/PhotoBrowser/PhotoPreviewController.swift
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/PhotoPreviewController.swift
rename to PhotoBrowser/PhotoPreviewController.swift
diff --git a/PhotoBrowser/PhotoBrowser/WaitingView.swift b/PhotoBrowser/WaitingView.swift
similarity index 100%
rename from PhotoBrowser/PhotoBrowser/WaitingView.swift
rename to PhotoBrowser/WaitingView.swift
diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj b/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj
index a15600d..2d1eb81 100644
--- a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj
+++ b/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj
@@ -13,8 +13,6 @@
4A52D2131C72D13B001C257B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2121C72D13B001C257B /* Assets.xcassets */; };
4A52D2161C72D13B001C257B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2141C72D13B001C257B /* LaunchScreen.storyboard */; };
4A52D2211C72D13B001C257B /* PhotoBrowserDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2201C72D13B001C257B /* PhotoBrowserDemoTests.swift */; };
- 4A52D22C1C72D3BA001C257B /* PhotoBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A52D22B1C72D3BA001C257B /* PhotoBrowser.framework */; };
- 4A52D22D1C72D3BA001C257B /* PhotoBrowser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A52D22B1C72D3BA001C257B /* PhotoBrowser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -34,7 +32,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- 4A52D22D1C72D3BA001C257B /* PhotoBrowser.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -52,7 +49,6 @@
4A52D21C1C72D13B001C257B /* PhotoBrowserDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PhotoBrowserDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4A52D2201C72D13B001C257B /* PhotoBrowserDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoBrowserDemoTests.swift; sourceTree = ""; };
4A52D2221C72D13B001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
- 4A52D22B1C72D3BA001C257B /* PhotoBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = PhotoBrowser.framework; path = "/Users/wangwei/Library/Developer/Xcode/DerivedData/PhotoBrowser-fvhcjeswrqujghbndnhfixwxfzii/Build/Products/Debug-iphoneos/PhotoBrowser.framework"; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -60,7 +56,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 4A52D22C1C72D3BA001C257B /* PhotoBrowser.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -77,7 +72,6 @@
4A52D1FF1C72D13B001C257B = {
isa = PBXGroup;
children = (
- 4A52D22B1C72D3BA001C257B /* PhotoBrowser.framework */,
4A52D20A1C72D13B001C257B /* PhotoBrowserDemo */,
4A52D21F1C72D13B001C257B /* PhotoBrowserDemoTests */,
4A52D2091C72D13B001C257B /* Products */,
diff --git a/PhotoBrowser/PhotoBrowserTests/Info.plist b/PhotoBrowserTests/Info.plist
similarity index 100%
rename from PhotoBrowser/PhotoBrowserTests/Info.plist
rename to PhotoBrowserTests/Info.plist
diff --git a/PhotoBrowser/PhotoBrowserTests/PhotoBrowserTests.swift b/PhotoBrowserTests/PhotoBrowserTests.swift
similarity index 100%
rename from PhotoBrowser/PhotoBrowserTests/PhotoBrowserTests.swift
rename to PhotoBrowserTests/PhotoBrowserTests.swift