From fe92863894e0dce9d11331c59c0a09a6f8101df8 Mon Sep 17 00:00:00 2001 From: Ata Etgi Date: Sun, 31 Dec 2023 03:55:46 +0300 Subject: [PATCH 1/5] fix kingfisher dependency --- .../xcode/package.xcworkspace/contents.xcworkspacedata | 7 +++++++ Package.resolved | 4 ++-- Package.swift | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.resolved b/Package.resolved index 28277c26..bbce4c12 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/onevcat/Kingfisher.git", "state": { "branch": null, - "revision": "349ed06467a6f8a4939bcb83db301542bc84eac9", - "version": "5.13.4" + "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", + "version": "6.3.1" } }, { diff --git a/Package.swift b/Package.swift index 3e4f65c9..11e7b85e 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,7 @@ let package = Package( targets: ["ImageSlideshowKingfisher"]) ], dependencies: [ - .package(url: "https://github.com/onevcat/Kingfisher.git", from: "5.8.0"), + .package(url: "https://github.com/onevcat/Kingfisher.git", from: "6.0.0"), .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.0.0"), .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0") ], From 836e90649a5accd5f68a64a55682133ae241f552 Mon Sep 17 00:00:00 2001 From: Ata Etgi Date: Sun, 31 Dec 2023 05:18:45 +0300 Subject: [PATCH 2/5] update alamofire version --- ImageSlideshow/Classes/InputSources/AlamofireSource.swift | 4 ++-- Package.resolved | 8 ++++---- Package.swift | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ImageSlideshow/Classes/InputSources/AlamofireSource.swift b/ImageSlideshow/Classes/InputSources/AlamofireSource.swift index fcee148a..74d5f83d 100644 --- a/ImageSlideshow/Classes/InputSources/AlamofireSource.swift +++ b/ImageSlideshow/Classes/InputSources/AlamofireSource.swift @@ -45,7 +45,7 @@ public class AlamofireSource: NSObject, InputSource { } public func load(to imageView: UIImageView, with callback: @escaping (UIImage?) -> Void) { - imageView.af.setImage(withURL: self.url, placeholderImage: placeholder, filter: nil, progress: nil) { [weak self] (response) in + imageView.af_setImage(withURL: self.url, placeholderImage: placeholder, filter: nil, progress: nil) { [weak self] (response) in switch response.result { case .success(let image): callback(image) @@ -56,6 +56,6 @@ public class AlamofireSource: NSObject, InputSource { } public func cancelLoad(on imageView: UIImageView) { - imageView.af.cancelImageRequest() + imageView.af_cancelImageRequest() } } diff --git a/Package.resolved b/Package.resolved index bbce4c12..04ec33a5 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "fca036f7aeca07124067cb6e0c12b0ad6359e3d4", - "version": "5.1.0" + "revision": "747c8db8d57b68d5e35275f10c92d55f982adbd4", + "version": "4.9.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", "state": { "branch": null, - "revision": "3e8edbeb75227f8542aa87f90240cf0424d6362f", - "version": "4.1.0" + "revision": "c31e617c582102d4b51c714211071f2260e24fdd", + "version": "3.6.0" } }, { diff --git a/Package.swift b/Package.swift index 11e7b85e..db8a4b3f 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/onevcat/Kingfisher.git", from: "6.0.0"), - .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.0.0"), + .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "3.0.0"), .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0") ], targets: [ From a532a6a23974c875a72c1eb976c5df5172fa2269 Mon Sep 17 00:00:00 2001 From: Ata Etgi Date: Mon, 2 Sep 2024 17:32:17 +0300 Subject: [PATCH 3/5] update kingfisher --- .swiftpm/configuration/Package.resolved | 43 +++++++++++++++++++++++++ Package.swift | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 .swiftpm/configuration/Package.resolved diff --git a/.swiftpm/configuration/Package.resolved b/.swiftpm/configuration/Package.resolved new file mode 100644 index 00000000..5319d6c1 --- /dev/null +++ b/.swiftpm/configuration/Package.resolved @@ -0,0 +1,43 @@ +{ + "object": { + "pins": [ + { + "package": "Alamofire", + "repositoryURL": "https://github.com/Alamofire/Alamofire.git", + "state": { + "branch": null, + "revision": "747c8db8d57b68d5e35275f10c92d55f982adbd4", + "version": "4.9.1" + } + }, + { + "package": "AlamofireImage", + "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", + "state": { + "branch": null, + "revision": "c31e617c582102d4b51c714211071f2260e24fdd", + "version": "3.6.0" + } + }, + { + "package": "Kingfisher", + "repositoryURL": "https://github.com/onevcat/Kingfisher.git", + "state": { + "branch": null, + "revision": "2ef543ee21d63734e1c004ad6c870255e8716c50", + "version": "7.12.0" + } + }, + { + "package": "SDWebImage", + "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git", + "state": { + "branch": null, + "revision": "8a1be70a625683bc04d6903e2935bf23f3c6d609", + "version": "5.19.7" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index db8a4b3f..3a0393af 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,7 @@ let package = Package( targets: ["ImageSlideshowKingfisher"]) ], dependencies: [ - .package(url: "https://github.com/onevcat/Kingfisher.git", from: "6.0.0"), + .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0"), .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "3.0.0"), .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0") ], From 5e03fac836df8f2787fcd5754abc660372e6d488 Mon Sep 17 00:00:00 2001 From: Ata Etgi Date: Mon, 2 Sep 2024 17:40:09 +0300 Subject: [PATCH 4/5] update package --- Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.resolved b/Package.resolved index 04ec33a5..54575340 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/onevcat/Kingfisher.git", "state": { "branch": null, - "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", - "version": "6.3.1" + "revision": "2ef543ee21d63734e1c004ad6c870255e8716c50", + "version": "7.12.0" } }, { From 3e4a0774fd4546e06e182b141636a20f2db0b4b6 Mon Sep 17 00:00:00 2001 From: Ata Etgi Date: Mon, 2 Sep 2024 17:50:41 +0300 Subject: [PATCH 5/5] update packages --- .swiftpm/configuration/Package.resolved | 8 ++++---- Package.resolved | 8 ++++---- Package.swift | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.swiftpm/configuration/Package.resolved b/.swiftpm/configuration/Package.resolved index 5319d6c1..03fa8ec4 100644 --- a/.swiftpm/configuration/Package.resolved +++ b/.swiftpm/configuration/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "747c8db8d57b68d5e35275f10c92d55f982adbd4", - "version": "4.9.1" + "revision": "f455c2975872ccd2d9c81594c658af65716e9b9a", + "version": "5.9.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", "state": { "branch": null, - "revision": "c31e617c582102d4b51c714211071f2260e24fdd", - "version": "3.6.0" + "revision": "1eaf3b6c6882bed10f6e7b119665599dd2329aa1", + "version": "4.3.0" } }, { diff --git a/Package.resolved b/Package.resolved index 54575340..bb0d98e0 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "747c8db8d57b68d5e35275f10c92d55f982adbd4", - "version": "4.9.1" + "revision": "f455c2975872ccd2d9c81594c658af65716e9b9a", + "version": "5.9.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", "state": { "branch": null, - "revision": "c31e617c582102d4b51c714211071f2260e24fdd", - "version": "3.6.0" + "revision": "1eaf3b6c6882bed10f6e7b119665599dd2329aa1", + "version": "4.3.0" } }, { diff --git a/Package.swift b/Package.swift index 3a0393af..194c31a1 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0"), - .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "3.0.0"), + .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.0.0"), .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0") ], targets: [