diff --git a/Cartfile b/Cartfile index 8b9075d349..19dc29506f 100644 --- a/Cartfile +++ b/Cartfile @@ -12,7 +12,6 @@ github "uber/ios-snapshot-test-case" == 6.2.0 github "segmentio/analytics-ios" == 4.1.2 github "appboy/appboy-segment-ios" == 4.0.0 github "scinfu/SwiftSoup" == 2.3.8 -github "onevcat/Kingfisher" == 7.0.0 ### Binaries diff --git a/Cartfile.resolved b/Cartfile.resolved index bb2e0b56a2..aab99e5b7a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -14,4 +14,3 @@ github "optimizely/swift-sdk" "v3.6.1" github "scinfu/SwiftSoup" "2.3.8" github "segmentio/analytics-ios" "4.1.2" github "uber/ios-snapshot-test-case" "6.2.0" -github "onevcat/Kingfisher" "7.0.0" diff --git a/Carthage-xcfilelist/app-input-files.xcfilelist b/Carthage-xcfilelist/app-input-files.xcfilelist index c163d84ea8..281ca79494 100644 --- a/Carthage-xcfilelist/app-input-files.xcfilelist +++ b/Carthage-xcfilelist/app-input-files.xcfilelist @@ -10,4 +10,3 @@ $(SRCROOT)/Carthage/Build/iOS/SDWebImage.framework $(SRCROOT)/Carthage/Build/iOS/Segment.framework $(SRCROOT)/Carthage/Build/iOS/Segment_Appboy.framework $(SRCROOT)/Carthage/Build/iOS/SwiftSoup.framework -$(SRCROOT)/Carthage/Build/iOS/Kingfisher.framework diff --git a/Carthage-xcfilelist/app-output-files.xcfilelist b/Carthage-xcfilelist/app-output-files.xcfilelist index 7e8287d27c..3a8ae9a962 100644 --- a/Carthage-xcfilelist/app-output-files.xcfilelist +++ b/Carthage-xcfilelist/app-output-files.xcfilelist @@ -9,4 +9,3 @@ $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SDWebImage.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Segment.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Segment_Appboy.framework -$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Kingfisher.framework diff --git a/Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist b/Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist index bf5e1e8f93..9e6101178f 100644 --- a/Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist +++ b/Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist @@ -5,4 +5,3 @@ $(SRCROOT)/Carthage/Build/iOS/FBSDKLoginKit.framework $(SRCROOT)/Carthage/Build/iOS/Optimizely.framework $(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework $(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework -$(SRCROOT)/Carthage/Build/iOS/Kingfisher.framework diff --git a/Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist b/Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist index c44bacd214..03b3b89855 100644 --- a/Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist +++ b/Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist @@ -5,4 +5,3 @@ $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/FBSDKLoginKit.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Optimizely.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework -$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Kingfisher.framework diff --git a/Carthage-xcfilelist/library-input-files.xcfilelist b/Carthage-xcfilelist/library-input-files.xcfilelist index 1d1d92730f..13d9159f97 100644 --- a/Carthage-xcfilelist/library-input-files.xcfilelist +++ b/Carthage-xcfilelist/library-input-files.xcfilelist @@ -8,4 +8,3 @@ $(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework $(SRCROOT)/Carthage/Build/iOS/SDWebImage.framework $(SRCROOT)/Carthage/Build/iOS/Segment.framework $(SRCROOT)/Carthage/Build/iOS/Segment_Appboy.framework -$(SRCROOT)/Carthage/Build/iOS/Kingfisher.framework diff --git a/Carthage-xcfilelist/library-output-files.xcfilelist b/Carthage-xcfilelist/library-output-files.xcfilelist index 0274cdbe94..8921fcd57f 100644 --- a/Carthage-xcfilelist/library-output-files.xcfilelist +++ b/Carthage-xcfilelist/library-output-files.xcfilelist @@ -8,4 +8,3 @@ $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SDWebImage.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Segment.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Segment_Appboy.framework -$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Kingfisher.framework diff --git a/Kickstarter.xcodeproj/project.pbxproj b/Kickstarter.xcodeproj/project.pbxproj index fcf9cd0bf6..7f523bfcb4 100644 --- a/Kickstarter.xcodeproj/project.pbxproj +++ b/Kickstarter.xcodeproj/project.pbxproj @@ -121,7 +121,6 @@ 064B007827A463D2007B21FE /* ImageViewElementCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064B007727A463D2007B21FE /* ImageViewElementCellViewModel.swift */; }; 064B007A27A469C8007B21FE /* HTMLViewElementStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064B007927A469C8007B21FE /* HTMLViewElementStyles.swift */; }; 064E10BF27CF038300A9A75F /* AudioVideoViewElementCellViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064E10BE27CF038300A9A75F /* AudioVideoViewElementCellViewModelTests.swift */; }; - 0653738D27AC5B2D00C7D160 /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0653738C27AC5B2D00C7D160 /* Kingfisher.framework */; }; 0655C7282732FDA30087281F /* FetchRootCategories.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 0655C7272732FDA30087281F /* FetchRootCategories.graphql */; }; 0655C72A2732FDE00087281F /* FetchCategory.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 0655C7292732FDE00087281F /* FetchCategory.graphql */; }; 0655C72C273321B20087281F /* Category+CategoryFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0655C72B273321B20087281F /* Category+CategoryFragment.swift */; }; @@ -459,6 +458,7 @@ 60DA50EB28B689A4002E2DF1 /* SetYourPasswordViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DA50E928B68990002E2DF1 /* SetYourPasswordViewModelTests.swift */; }; 60DA50F128B6953A002E2DF1 /* SetYourPasswordViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DA50EF28B69534002E2DF1 /* SetYourPasswordViewControllerTests.swift */; }; 60DA50FE28C38DDB002E2DF1 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = 60DA50FD28C38DDB002E2DF1 /* AlamofireImage */; }; + 60DA510F28C7E04B002E2DF1 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 60DA510E28C7E04B002E2DF1 /* Kingfisher */; }; 770187C022FDCFCA0019129D /* PledgeViewControllerMessageDisplaying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 770187BE22FDCF960019129D /* PledgeViewControllerMessageDisplaying.swift */; }; 7703B42223217D4F00169EF3 /* EnvironmentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7703B42123217D4F00169EF3 /* EnvironmentType.swift */; }; 7703B4242321844900169EF3 /* PKPaymentRequest+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7703B4232321844900169EF3 /* PKPaymentRequest+Helpers.swift */; }; @@ -1824,7 +1824,6 @@ 064B007727A463D2007B21FE /* ImageViewElementCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewElementCellViewModel.swift; sourceTree = ""; }; 064B007927A469C8007B21FE /* HTMLViewElementStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTMLViewElementStyles.swift; sourceTree = ""; }; 064E10BE27CF038300A9A75F /* AudioVideoViewElementCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioVideoViewElementCellViewModelTests.swift; sourceTree = ""; }; - 0653738C27AC5B2D00C7D160 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; }; 0655C7272732FDA30087281F /* FetchRootCategories.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = FetchRootCategories.graphql; sourceTree = ""; }; 0655C7292732FDE00087281F /* FetchCategory.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = FetchCategory.graphql; sourceTree = ""; }; 0655C72B273321B20087281F /* Category+CategoryFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Category+CategoryFragment.swift"; sourceTree = ""; }; @@ -3287,8 +3286,8 @@ 06634FC72807A4EB00950F60 /* Prelude_UIKit in Frameworks */, D0D10BB81EEB394D005EBAD0 /* KsApi.framework in Frameworks */, 1981AC90289075D900BB4897 /* Stripe in Frameworks */, - 0653738D27AC5B2D00C7D160 /* Kingfisher.framework in Frameworks */, 8A04FE31262781570056F413 /* Appboy_iOS_SDK.framework in Frameworks */, + 60DA510F28C7E04B002E2DF1 /* Kingfisher in Frameworks */, D0BE6F282286397400D05A10 /* ReactiveExtensions.framework in Frameworks */, 8A04FE2F262781570056F413 /* SDWebImage.framework in Frameworks */, D00A3766225BCE8400F46F47 /* ReactiveSwift.framework in Frameworks */, @@ -4525,7 +4524,6 @@ isa = PBXGroup; children = ( 06EA2D36280F1F1900F4DE2E /* XCTest.framework */, - 0653738C27AC5B2D00C7D160 /* Kingfisher.framework */, 06EF13DC27A1B2770044841C /* SwiftSoup.framework */, 8AA5B061235E253B0022F5F0 /* AppCenterDistributeResources.bundle */, 8A04FE23262781240056F413 /* Appboy_iOS_SDK.framework */, @@ -5382,6 +5380,7 @@ 06634FC62807A4EB00950F60 /* Prelude_UIKit */, 1981AC8F289075D900BB4897 /* Stripe */, 60DA50FD28C38DDB002E2DF1 /* AlamofireImage */, + 60DA510E28C7E04B002E2DF1 /* Kingfisher */, ); productName = "Library-iOS"; productReference = A755113C1C8642B3005355CF /* Library.framework */; @@ -5600,6 +5599,7 @@ 06634FC32807A4EB00950F60 /* XCRemoteSwiftPackageReference "Kickstarter-Prelude" */, 194520C12888542100CA9B88 /* XCRemoteSwiftPackageReference "stripe-ios" */, 60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */, + 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */, ); productRefGroup = A7E06C7A1C5A6EB300EBDCC2 /* Products */; projectDirPath = ""; @@ -8567,6 +8567,14 @@ minimumVersion = 4.2.0; }; }; + 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/onevcat/Kingfisher"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 7.0.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -8615,6 +8623,11 @@ package = 60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */; productName = AlamofireImage; }; + 60DA510E28C7E04B002E2DF1 /* Kingfisher */ = { + isa = XCSwiftPackageProductDependency; + package = 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */; + productName = Kingfisher; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = A7E06C711C5A6EB300EBDCC2 /* Project object */; diff --git a/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 443a341069..c74d752bd1 100644 --- a/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -45,6 +45,15 @@ "revision" : "b0cec69c19a13088864b52ad1745397f587daec7" } }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher", + "state" : { + "revision" : "be1a1acb283a702b99b630f586877ba02234b4cb", + "version" : "7.3.2" + } + }, { "identity" : "pathkit", "kind" : "remoteSourceControl",