From edd69a73d92fce6820552dbf2f855be3ef5d9611 Mon Sep 17 00:00:00 2001 From: Scott Clampet <110618242+scottkicks@users.noreply.github.com> Date: Thu, 8 Sep 2022 12:40:42 -0400 Subject: [PATCH] Migrates SwiftSoup to SPM (#1723) --- Cartfile | 1 - Cartfile.resolved | 1 - .../app-input-files.xcfilelist | 1 - .../ksapi-input-files.xcfilelist | 1 - .../ksapi-output-files.xcfilelist | 1 - Kickstarter.xcodeproj/project.pbxproj | 21 +++++++++++++++---- .../xcshareddata/swiftpm/Package.resolved | 9 ++++++++ 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Cartfile b/Cartfile index 19dc29506f..3eaa28cb44 100644 --- a/Cartfile +++ b/Cartfile @@ -11,7 +11,6 @@ github "ReactiveCocoa/ReactiveSwift" == 6.5.0 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 ### Binaries diff --git a/Cartfile.resolved b/Cartfile.resolved index aab99e5b7a..d54edd1c05 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -11,6 +11,5 @@ github "facebook/facebook-objc-sdk" "v6.5.2" github "kickstarter/Kickstarter-ReactiveExtensions" "e3f7786b5bcc7b99c14b9fd313302bb59d9c3fe9" github "microsoft/appcenter-sdk-apple" "4.0.0" 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" diff --git a/Carthage-xcfilelist/app-input-files.xcfilelist b/Carthage-xcfilelist/app-input-files.xcfilelist index 281ca79494..d27f9a66b9 100644 --- a/Carthage-xcfilelist/app-input-files.xcfilelist +++ b/Carthage-xcfilelist/app-input-files.xcfilelist @@ -9,4 +9,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/SwiftSoup.framework diff --git a/Carthage-xcfilelist/ksapi-input-files.xcfilelist b/Carthage-xcfilelist/ksapi-input-files.xcfilelist index 31aacbef48..36d96e9afb 100644 --- a/Carthage-xcfilelist/ksapi-input-files.xcfilelist +++ b/Carthage-xcfilelist/ksapi-input-files.xcfilelist @@ -2,4 +2,3 @@ $(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework $(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework -$(SRCROOT)/Carthage/Build/iOS/SwiftSoup.framework diff --git a/Carthage-xcfilelist/ksapi-output-files.xcfilelist b/Carthage-xcfilelist/ksapi-output-files.xcfilelist index cd16ec1bc4..1812238f15 100644 --- a/Carthage-xcfilelist/ksapi-output-files.xcfilelist +++ b/Carthage-xcfilelist/ksapi-output-files.xcfilelist @@ -2,4 +2,3 @@ $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework $(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework -$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SwiftSoup.framework diff --git a/Kickstarter.xcodeproj/project.pbxproj b/Kickstarter.xcodeproj/project.pbxproj index 7f523bfcb4..3ad02dbcb2 100644 --- a/Kickstarter.xcodeproj/project.pbxproj +++ b/Kickstarter.xcodeproj/project.pbxproj @@ -210,7 +210,6 @@ 06EB4E3127B5D32000D8BFCC /* PinchToZoom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EB4E2F27B5D26800D8BFCC /* PinchToZoom.swift */; }; 06EB4E3227B5D39D00D8BFCC /* OverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EB4E2D27B5D06A00D8BFCC /* OverlayView.swift */; }; 06ED88D727BFF02200893A24 /* AudioVideoViewElementCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475D16FA2773B0DE009E4354 /* AudioVideoViewElementCell.swift */; }; - 06EF13DD27A1B2770044841C /* SwiftSoup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06EF13DC27A1B2770044841C /* SwiftSoup.framework */; }; 06F2CA312762707B00056F35 /* Comment+CommentWithRepliesFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F2CA302762707B00056F35 /* Comment+CommentWithRepliesFragment.swift */; }; 06F7BE1826B31A020094BF37 /* UserCreditCards+UserFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A0432126A609C30011728E /* UserCreditCards+UserFragment.swift */; }; 06F7BE1A26B334DB0094BF37 /* CreatePaymentSourceEnvelope+CreatePaymentSourceMutation.DataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F7BE1926B334DB0094BF37 /* CreatePaymentSourceEnvelope+CreatePaymentSourceMutation.DataTests.swift */; }; @@ -459,6 +458,7 @@ 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 */; }; + 60DA511428C96A65002E2DF1 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = 60DA511328C96A65002E2DF1 /* SwiftSoup */; }; 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 */; }; @@ -1899,7 +1899,6 @@ 06EA2D36280F1F1900F4DE2E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 06EB4E2D27B5D06A00D8BFCC /* OverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayView.swift; sourceTree = ""; }; 06EB4E2F27B5D26800D8BFCC /* PinchToZoom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinchToZoom.swift; sourceTree = ""; }; - 06EF13DC27A1B2770044841C /* SwiftSoup.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftSoup.framework; path = Carthage/Build/iOS/SwiftSoup.framework; sourceTree = ""; }; 06F2CA302762707B00056F35 /* Comment+CommentWithRepliesFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Comment+CommentWithRepliesFragment.swift"; sourceTree = ""; }; 06F7BE1926B334DB0094BF37 /* CreatePaymentSourceEnvelope+CreatePaymentSourceMutation.DataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CreatePaymentSourceEnvelope+CreatePaymentSourceMutation.DataTests.swift"; sourceTree = ""; }; 06F7BE1B26B33A690094BF37 /* GraphAPI.CreatePaymentSourceInput+CreatePaymentSourceInputTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GraphAPI.CreatePaymentSourceInput+CreatePaymentSourceInputTests.swift"; sourceTree = ""; }; @@ -3376,10 +3375,10 @@ D0BE6F1F228634C700D05A10 /* ReactiveExtensions.framework in Frameworks */, 06634FBE2807A4C300950F60 /* Apollo in Frameworks */, 06634FC52807A4EB00950F60 /* Prelude in Frameworks */, - 06EF13DD27A1B2770044841C /* SwiftSoup.framework in Frameworks */, D0BE6F20228634C700D05A10 /* ReactiveSwift.framework in Frameworks */, 06634FC02807A4C300950F60 /* ApolloAPI in Frameworks */, 06634FC22807A4C300950F60 /* ApolloUtils in Frameworks */, + 60DA511428C96A65002E2DF1 /* SwiftSoup in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4524,7 +4523,6 @@ isa = PBXGroup; children = ( 06EA2D36280F1F1900F4DE2E /* XCTest.framework */, - 06EF13DC27A1B2770044841C /* SwiftSoup.framework */, 8AA5B061235E253B0022F5F0 /* AppCenterDistributeResources.bundle */, 8A04FE23262781240056F413 /* Appboy_iOS_SDK.framework */, 8AA5B064235E25820022F5F0 /* AppCenter.framework */, @@ -5498,6 +5496,7 @@ 06634FBF2807A4C300950F60 /* ApolloAPI */, 06634FC12807A4C300950F60 /* ApolloUtils */, 06634FC42807A4EB00950F60 /* Prelude */, + 60DA511328C96A65002E2DF1 /* SwiftSoup */, ); productName = KsApi; productReference = D01587501EEB2DE4006E7684 /* KsApi.framework */; @@ -5600,6 +5599,7 @@ 194520C12888542100CA9B88 /* XCRemoteSwiftPackageReference "stripe-ios" */, 60DA50F628BFA331002E2DF1 /* XCRemoteSwiftPackageReference "AlamofireImage" */, 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */, + 60DA511028C96865002E2DF1 /* XCRemoteSwiftPackageReference "SwiftSoup" */, ); productRefGroup = A7E06C7A1C5A6EB300EBDCC2 /* Products */; projectDirPath = ""; @@ -8575,6 +8575,14 @@ minimumVersion = 7.0.0; }; }; + 60DA511028C96865002E2DF1 /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/scinfu/SwiftSoup"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -8628,6 +8636,11 @@ package = 60DA510928C7DC0E002E2DF1 /* XCRemoteSwiftPackageReference "Kingfisher" */; productName = Kingfisher; }; + 60DA511328C96A65002E2DF1 /* SwiftSoup */ = { + isa = XCSwiftPackageProductDependency; + package = 60DA511028C96865002E2DF1 /* XCRemoteSwiftPackageReference "SwiftSoup" */; + productName = SwiftSoup; + }; /* 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 c74d752bd1..287149fdaf 100644 --- a/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -107,6 +107,15 @@ "revision" : "c22fc896813bae342bac64d17ddfe4da017f14cb", "version" : "22.7.1" } + }, + { + "identity" : "swiftsoup", + "kind" : "remoteSourceControl", + "location" : "https://github.com/scinfu/SwiftSoup", + "state" : { + "revision" : "6778575285177365cbad3e5b8a72f2a20583cfec", + "version" : "2.4.3" + } } ], "version" : 2