Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NTV-606] KingFisher Carthage -> SPM #1722

Merged
merged 2 commits into from
Sep 7, 2022
Merged

[NTV-606] KingFisher Carthage -> SPM #1722

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a51bb7
Migrates KingFisher Carthage package to SPM
scottkicks Sep 6, 2022
a200cbb
Remove KingFisher package from Kickstarter-iOS target
scottkicks Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 0 additions & 1 deletion Carthage-xcfilelist/app-input-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Carthage-xcfilelist/app-output-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Carthage-xcfilelist/library-input-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Carthage-xcfilelist/library-output-files.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 25 additions & 4 deletions Kickstarter.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -459,6 +458,8 @@
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 */; };
60DA510B28C7DC0E002E2DF1 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 60DA510A28C7DC0E002E2DF1 /* Kingfisher */; };
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 */; };
Expand Down Expand Up @@ -1824,7 +1825,6 @@
064B007727A463D2007B21FE /* ImageViewElementCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewElementCellViewModel.swift; sourceTree = "<group>"; };
064B007927A469C8007B21FE /* HTMLViewElementStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTMLViewElementStyles.swift; sourceTree = "<group>"; };
064E10BE27CF038300A9A75F /* AudioVideoViewElementCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioVideoViewElementCellViewModelTests.swift; sourceTree = "<group>"; };
0653738C27AC5B2D00C7D160 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = "<group>"; };
0655C7272732FDA30087281F /* FetchRootCategories.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = FetchRootCategories.graphql; sourceTree = "<group>"; };
0655C7292732FDE00087281F /* FetchCategory.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = FetchCategory.graphql; sourceTree = "<group>"; };
0655C72B273321B20087281F /* Category+CategoryFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Category+CategoryFragment.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3287,8 +3287,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 */,
Expand Down Expand Up @@ -3341,6 +3341,7 @@
A73924001D27230B004524C3 /* Kickstarter_Framework.framework in Frameworks */,
8A86D7EE24FDC84400037A7B /* GoogleAppMeasurement.framework in Frameworks */,
774D98DA23A9795100FC81C2 /* Optimizely.framework in Frameworks */,
60DA510B28C7DC0E002E2DF1 /* Kingfisher in Frameworks */,
4748C19125B7A2F80098E89E /* FirebaseCore.framework in Frameworks */,
D0B45B6B1EF858C00020A8DA /* KsApi.framework in Frameworks */,
477731BA25C4E7CF00AF3273 /* FirebaseRemoteConfig.framework in Frameworks */,
Expand Down Expand Up @@ -4525,7 +4526,6 @@
isa = PBXGroup;
children = (
06EA2D36280F1F1900F4DE2E /* XCTest.framework */,
0653738C27AC5B2D00C7D160 /* Kingfisher.framework */,
06EF13DC27A1B2770044841C /* SwiftSoup.framework */,
8AA5B061235E253B0022F5F0 /* AppCenterDistributeResources.bundle */,
8A04FE23262781240056F413 /* Appboy_iOS_SDK.framework */,
Expand Down Expand Up @@ -5382,6 +5382,7 @@
06634FC62807A4EB00950F60 /* Prelude_UIKit */,
1981AC8F289075D900BB4897 /* Stripe */,
60DA50FD28C38DDB002E2DF1 /* AlamofireImage */,
60DA510E28C7E04B002E2DF1 /* Kingfisher */,
);
productName = "Library-iOS";
productReference = A755113C1C8642B3005355CF /* Library.framework */;
Expand Down Expand Up @@ -5451,6 +5452,7 @@
name = "Kickstarter-iOS";
packageProductDependencies = (
06EA2D4B280F76B700F4DE2E /* Prelude */,
60DA510A28C7DC0E002E2DF1 /* Kingfisher */,
);
productName = Kickstarter;
productReference = A7D1F9451C850B7C000D41D5 /* KickDebug.app */;
Expand Down Expand Up @@ -5600,6 +5602,7 @@
06634FC32807A4EB00950F60 /* XCRemoteSwiftPackageReference "Kickstarter-Prelude" */,
194520C12888542100CA9B88 /* XCRemoteSwiftPackageReference "stripe-ios" */,
60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */,
60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */,
);
productRefGroup = A7E06C7A1C5A6EB300EBDCC2 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -8567,6 +8570,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 */
Expand Down Expand Up @@ -8615,6 +8626,16 @@
package = 60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
productName = AlamofireImage;
};
60DA510A28C7DC0E002E2DF1 /* Kingfisher */ = {
isa = XCSwiftPackageProductDependency;
package = 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */;
productName = Kingfisher;
};
60DA510E28C7E04B002E2DF1 /* Kingfisher */ = {
isa = XCSwiftPackageProductDependency;
package = 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */;
productName = Kingfisher;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = A7E06C711C5A6EB300EBDCC2 /* Project object */;
Expand Down
9 changes: 9 additions & 0 deletions Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down