Skip to content

Commit

Permalink
[NTV-605] Alamofire/AlamofireImage Carthage -> SPM (#1717)
Browse files Browse the repository at this point in the history 
* WIP: Build failing with AlamofireImage Undefined Symbols

* Add new 'AlamofireImage' SPM package to 'Library' target so that the 'Kickstarter-Framework-iOS' target can reference it

* Removes Alamofire because we only need AlamofireImage

* removed top level dependency because its not needed in Kickstarter-Framework-iOS target

Co-authored-by: Mubarak Sadoon <msadoon@gmail.com>
  • Loading branch information
@scottkicks @msadoon
scottkicks and msadoon committed Sep 6, 2022
1 parent 14d51d0 commit 7c9bd4c
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 19 deletions.
1 change: 0 additions & 1 deletion Cartfile
View file
Expand Up @@ -4,7 +4,6 @@ github "kickstarter/Kickstarter-ReactiveExtensions" "e3f7786b5bcc7b99c14b9fd3133

### 3rd Party

github "Alamofire/AlamofireImage" == 4.1.0
github "optimizely/swift-sdk" == 3.6.1
github "facebook/facebook-objc-sdk" == 6.5.2
github "microsoft/appcenter-sdk-apple" == 4.0.0
Expand Down
2 changes: 0 additions & 2 deletions Cartfile.resolved
View file
Expand Up @@ -5,8 +5,6 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebasePerformanceBinary
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseProtobufBinary.json" "7.4.0"
binary "https://raw.githubusercontent.com/Appboy/appboy-ios-sdk/master/appboy_ios_sdk_full.json" "4.3.2"
binary "https://raw.githubusercontent.com/PerimeterX/px-iOS-Framework/master/PerimeterX.json" "1.13.9"
github "Alamofire/Alamofire" "5.4.3"
github "Alamofire/AlamofireImage" "4.1.0"
github "ReactiveCocoa/ReactiveSwift" "6.5.0"
github "appboy/appboy-segment-ios" "4.0.0"
github "facebook/facebook-objc-sdk" "v6.5.2"
Expand Down
2 changes: 0 additions & 2 deletions Carthage-xcfilelist/app-input-files.xcfilelist
View file
@@ -1,7 +1,5 @@
# Carthage input files

$(SRCROOT)/Carthage/Build/iOS/Alamofire.framework
$(SRCROOT)/Carthage/Build/iOS/AlamofireImage.framework
$(SRCROOT)/Carthage/Build/iOS/Appboy_iOS_SDK.framework
$(SRCROOT)/Carthage/Build/iOS/FBSDKCoreKit.framework
$(SRCROOT)/Carthage/Build/iOS/FBSDKLoginKit.framework
Expand Down
2 changes: 0 additions & 2 deletions Carthage-xcfilelist/app-output-files.xcfilelist
View file
@@ -1,7 +1,5 @@
# Carthage output files

$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Alamofire.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/AlamofireImage.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Appboy_iOS_SDK.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/FBSDKCoreKit.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/FBSDKLoginKit.framework
Expand Down
2 changes: 0 additions & 2 deletions Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist
View file
@@ -1,7 +1,5 @@
# Carthage input files

$(SRCROOT)/Carthage/Build/iOS/Alamofire.framework
$(SRCROOT)/Carthage/Build/iOS/AlamofireImage.framework
$(SRCROOT)/Carthage/Build/iOS/FBSDKCoreKit.framework
$(SRCROOT)/Carthage/Build/iOS/FBSDKLoginKit.framework
$(SRCROOT)/Carthage/Build/iOS/Optimizely.framework
Expand Down
2 changes: 0 additions & 2 deletions Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist
View file
@@ -1,7 +1,5 @@
# Carthage output files

$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Alamofire.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/AlamofireImage.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/FBSDKCoreKit.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/FBSDKLoginKit.framework
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Optimizely.framework
Expand Down
25 changes: 17 additions & 8 deletions Kickstarter.xcodeproj/project.pbxproj
View file
Expand Up @@ -458,6 +458,7 @@
608E7A5628ABE6CD00289E92 /* SetYourPasswordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608E7A5428ABE27400289E92 /* SetYourPasswordViewModel.swift */; };
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 */; };
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 @@ -1175,8 +1176,6 @@
D00698E4225CF59B00EB58BD /* ReactiveSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D0D58D7F2257FADF00532AC1 /* ReactiveSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D00698E9225CF61F00EB58BD /* ReactiveExtensions.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D0D58D7B2257FADE00532AC1 /* ReactiveExtensions.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D00A371922580E9D00F46F47 /* FBSnapshotTestCase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D58D7C2257FADE00532AC1 /* FBSnapshotTestCase.framework */; };
D00A3720225815FA00F46F47 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00A371F225815FA00F46F47 /* AlamofireImage.framework */; };
D00A373F2258270600F46F47 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00A373E2258270600F46F47 /* Alamofire.framework */; };
D00A375022582A1300F46F47 /* ReactiveExtensions.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D0D58D7B2257FADE00532AC1 /* ReactiveExtensions.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D00A375122582A1B00F46F47 /* ReactiveSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D0D58D7F2257FADF00532AC1 /* ReactiveSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D00A3766225BCE8400F46F47 /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D58D7F2257FADF00532AC1 /* ReactiveSwift.framework */; };
Expand Down Expand Up @@ -2856,8 +2855,6 @@
D002CAE0218CF8F1009783F2 /* WatchProjectMutation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchProjectMutation.swift; sourceTree = "<group>"; };
D002CAE2218CF91D009783F2 /* WatchProjectInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchProjectInput.swift; sourceTree = "<group>"; };
D002CAE4218CF951009783F2 /* WatchProjectResponseEnvelope.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchProjectResponseEnvelope.swift; sourceTree = "<group>"; };
D00A371F225815FA00F46F47 /* AlamofireImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AlamofireImage.framework; path = Carthage/Build/iOS/AlamofireImage.framework; sourceTree = "<group>"; };
D00A373E2258270600F46F47 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
D01587501EEB2DE4006E7684 /* KsApi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KsApi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01587531EEB2DE4006E7684 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D01587581EEB2DE4006E7684 /* KsApiTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KsApiTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -3283,6 +3280,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
60DA50FE28C38DDB002E2DF1 /* AlamofireImage in Frameworks */,
8A0C3D1125AE6F4900310034 /* Segment.framework in Frameworks */,
D0B7124822AEEDF900317BAF /* FBSDKCoreKit.framework in Frameworks */,
D08C68A922AF105A001ED5E8 /* FBSDKLoginKit.framework in Frameworks */,
Expand Down Expand Up @@ -3314,8 +3312,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D00A373F2258270600F46F47 /* Alamofire.framework in Frameworks */,
D00A3720225815FA00F46F47 /* AlamofireImage.framework in Frameworks */,
D0B7124922AEEDF900317BAF /* FBSDKCoreKit.framework in Frameworks */,
D08C68AA22AF105B001ED5E8 /* FBSDKLoginKit.framework in Frameworks */,
A76127C01C93100C00EDCCB9 /* Library.framework in Frameworks */,
Expand Down Expand Up @@ -4532,8 +4528,6 @@
0653738C27AC5B2D00C7D160 /* Kingfisher.framework */,
06EF13DC27A1B2770044841C /* SwiftSoup.framework */,
8AA5B061235E253B0022F5F0 /* AppCenterDistributeResources.bundle */,
D00A373E2258270600F46F47 /* Alamofire.framework */,
D00A371F225815FA00F46F47 /* AlamofireImage.framework */,
8A04FE23262781240056F413 /* Appboy_iOS_SDK.framework */,
8AA5B064235E25820022F5F0 /* AppCenter.framework */,
8AA5B065235E25820022F5F0 /* AppCenterDistribute.framework */,
Expand Down Expand Up @@ -5387,6 +5381,7 @@
packageProductDependencies = (
06634FC62807A4EB00950F60 /* Prelude_UIKit */,
1981AC8F289075D900BB4897 /* Stripe */,
60DA50FD28C38DDB002E2DF1 /* AlamofireImage */,
);
productName = "Library-iOS";
productReference = A755113C1C8642B3005355CF /* Library.framework */;
Expand Down Expand Up @@ -5604,6 +5599,7 @@
06634FBC2807A4C300950F60 /* XCRemoteSwiftPackageReference "apollo-ios" */,
06634FC32807A4EB00950F60 /* XCRemoteSwiftPackageReference "Kickstarter-Prelude" */,
194520C12888542100CA9B88 /* XCRemoteSwiftPackageReference "stripe-ios" */,
60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */,
);
productRefGroup = A7E06C7A1C5A6EB300EBDCC2 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -8563,6 +8559,14 @@
minimumVersion = 22.7.1;
};
};
60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Alamofire/AlamofireImage";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.2.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -8606,6 +8610,11 @@
package = 194520C12888542100CA9B88 /* XCRemoteSwiftPackageReference "stripe-ios" */;
productName = Stripe;
};
60DA50FD28C38DDB002E2DF1 /* AlamofireImage */ = {
isa = XCSwiftPackageProductDependency;
package = 60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
productName = AlamofireImage;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = A7E06C711C5A6EB300EBDCC2 /* Project object */;
Expand Down
18 changes: 18 additions & 0 deletions Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
@@ -1,5 +1,23 @@
{
"pins" : [
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire",
"state" : {
"revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b",
"version" : "5.6.2"
}
},
{
"identity" : "alamofireimage",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/AlamofireImage",
"state" : {
"revision" : "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10",
"version" : "4.2.0"
}
},
{
"identity" : "apollo-ios",
"kind" : "remoteSourceControl",
Expand Down

0 comments on commit 7c9bd4c

Please sign in to comment.