From e09eb21e1f75e2fe20ebec1fbe57791ef5e309b7 Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Thu, 16 Nov 2017 18:33:45 +0300 Subject: [PATCH 1/6] Swift 4 --- Source/HFCardCollectionViewLayout.swift | 85 ++++++++----------------- 1 file changed, 26 insertions(+), 59 deletions(-) diff --git a/Source/HFCardCollectionViewLayout.swift b/Source/HFCardCollectionViewLayout.swift index 44bb4ba..e9eeac0 100644 --- a/Source/HFCardCollectionViewLayout.swift +++ b/Source/HFCardCollectionViewLayout.swift @@ -225,21 +225,18 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz /// Default: false @IBInspectable open var collapseAllCards: Bool = false { didSet { - self.flipRevealedCardBack(completion: { - self.collectionView?.isScrollEnabled = !self.collapseAllCards - var previousRevealedIndex = -1 - let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate - if(self.revealedIndex >= 0) { - previousRevealedIndex = self.revealedIndex - collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex) - self.revealedIndex = -1 + self.collectionView?.isScrollEnabled = !self.collapseAllCards + var previousRevealedIndex = -1 + let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate + if(self.revealedIndex >= 0) { + previousRevealedIndex = self.revealedIndex + collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex) + self.revealedIndex = -1 + } + self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: {(finished) in + if(previousRevealedIndex >= 0) { + collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: previousRevealedIndex) } - self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: {(finished) in - if(previousRevealedIndex >= 0) { - - collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: previousRevealedIndex) - } - }) }) } } @@ -318,14 +315,12 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex) } if index >= 0 { - self.revealedIndex = index if(collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, canRevealCardAtIndex: index) == false) { self.revealedIndex = -1 - self.collectionView?.isScrollEnabled = true - self.deinitializeRevealedCard() return } collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willRevealCardAtIndex: index) + self.revealedIndex = index _ = self.initializeRevealedCard() self.collectionView?.isScrollEnabled = false @@ -335,7 +330,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz }) } else if(self.revealedIndex >= 0) { self.revealedIndex = index - self.collectionView?.isScrollEnabled = false + self.collectionView?.isScrollEnabled = true self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: { (finished) in collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: oldRevealedIndex) completion?() @@ -421,38 +416,16 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz } } - private var TEMPTOP: CGFloat = 0 - open func willInsert(indexPaths: [IndexPath]) { for indexPath in indexPaths { if(indexPath.section == 0) { if(indexPath.item <= self.revealedIndex) { - TEMPTOP += self.cardHeadHeight self.revealedIndex += 1 } } } } - open func willDelete(indexPaths: [IndexPath]) { - let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate - for indexPath in indexPaths { - if(indexPath.section == 0) { - if(indexPath.item == self.revealedIndex) { - self.revealedIndex = -1 - self.collectionView?.isScrollEnabled = true - self.deinitializeRevealedCard() - collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: indexPath.item) - //collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: indexPath.item) - } - if(indexPath.item <= self.revealedIndex) { - TEMPTOP -= self.cardHeadHeight - self.revealedIndex -= 1 - } - } - } - } - //////////////////////////////////////////////////////////////////////////////////////////////////// ////////// Private ////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -497,11 +470,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz private var contentInset: UIEdgeInsets { get { - if #available(iOS 11, *) { - return self.collectionView!.adjustedContentInset - } else { - return self.collectionView!.contentInset - } + return self.collectionView!.contentInset } } @@ -549,11 +518,11 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz self.collectionView?.addGestureRecognizer(self.collectionViewTapGestureRecognizer!) } - func keyboardWillShow(_ notification: Notification) { + @objc func keyboardWillShow(_ notification: Notification) { self.collectionViewIgnoreBottomContentOffsetChanges = true } - func keyboardDidHide(_ notification: Notification) { + @objc func keyboardDidHide(_ notification: Notification) { self.collectionViewIgnoreBottomContentOffsetChanges = false } @@ -609,7 +578,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz /// - Parameter proposedContentOffset: The proposed point (in the collection view’s content view) at which to stop scrolling. This is the value at which scrolling would naturally stop if no adjustments were made. The point reflects the upper-left corner of the visible content. /// - Parameter velocity: The current scrolling velocity along both the horizontal and vertical axes. This value is measured in points per second. override open func targetContentOffset(forProposedContentOffset proposedContentOffset: CGPoint, withScrollingVelocity velocity: CGPoint) -> CGPoint { - let proposedContentOffsetY = proposedContentOffset.y + self.contentInset.top + let proposedContentOffsetY = proposedContentOffset.y + self.collectionView!.contentInset.top if(self.spaceAtTopShouldSnap == true && self.spaceAtTopForBackgroundView > 0) { if(proposedContentOffsetY > 0 && proposedContentOffsetY < self.spaceAtTopForBackgroundView) { let scrollToTopY = self.spaceAtTopForBackgroundView * 0.5 @@ -673,7 +642,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz // MARK: Private Functions for UICollectionViewLayout - internal func collectionViewTapGestureHandler() { + @objc internal func collectionViewTapGestureHandler() { if let tapLocation = self.collectionViewTapGestureRecognizer?.location(in: self.collectionView) { if let indexPath = self.collectionView?.indexPathForItem(at: tapLocation) { self.collectionView?.delegate?.collectionView?(self.collectionView!, didSelectItemAt: indexPath) @@ -698,8 +667,8 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz shouldReloadAllItems = true } - var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView + TEMPTOP) / self.cardHeadHeight) - 10 - var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height + TEMPTOP) / self.cardHeadHeight) + 5 + var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView) / self.cardHeadHeight) - 10 + var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height) / self.cardHeadHeight) + 5 if(startIndex < 0) { startIndex = 0 @@ -721,8 +690,6 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz cardLayoutAttribute.zIndex = itemIndex if self.revealedIndex < 0 && self.collapseAllCards == false { - self.collectionView!.contentOffset.y += TEMPTOP - TEMPTOP = 0 self.generateNonRevealedCardsAttribute(cardLayoutAttribute) } else if self.revealedIndex == itemIndex && self.collapseAllCards == false { self.generateRevealedCardAttribute(cardLayoutAttribute) @@ -744,7 +711,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz if self.collapseAllCards == false { return [] } else { - let startIndex: Int = Int(self.contentOffsetTop + TEMPTOP / self.cardHeadHeight) + let startIndex: Int = Int(self.contentOffsetTop / self.cardHeadHeight) let endIndex = max(0, startIndex + self.bottomNumberOfStackedCards - 2) return Array(startIndex...endIndex) } @@ -778,7 +745,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz private func generateNonRevealedCardsAttribute(_ attribute: HFCardCollectionViewLayoutAttributes) { let cardHeadHeight = self.calculateCardHeadHeight() - let startIndex = Int((self.contentOffsetTop + TEMPTOP - self.spaceAtTopForBackgroundView) / cardHeadHeight) + let startIndex = Int((self.contentOffsetTop - self.spaceAtTopForBackgroundView) / cardHeadHeight) let currentIndex = attribute.indexPath.item if(currentIndex == self.movingCardSelectedIndex) { attribute.alpha = 0.0 @@ -893,7 +860,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz } } - internal func revealedCardPanGestureHandler() { + @objc internal func revealedCardPanGestureHandler() { if self.collectionViewItemCount == 1 || self.revealedCardIsFlipped == true { return } @@ -933,7 +900,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz // MARK: Moving Card - internal func movingCardGestureHandler() { + @objc internal func movingCardGestureHandler() { let moveUpOffset: CGFloat = 20 if let movingCardGestureRecognizer = self.movingCardGestureRecognizer { @@ -1088,7 +1055,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz self.autoscrollDisplayLink = nil } - internal func autoscrollHandler(displayLink: CADisplayLink) { + @objc internal func autoscrollHandler(displayLink: CADisplayLink) { let direction = self.autoscrollDirection if(direction == .unknown) { return @@ -1098,7 +1065,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz let frameSize = self.collectionView!.frame.size let contentSize = self.collectionView!.contentSize let contentOffset = self.collectionView!.contentOffset - let contentInset = self.contentInset + let contentInset = self.collectionView!.contentInset var distance: CGFloat = CGFloat(rint(scrollMultiplier * displayLink.duration)) var translation = CGPoint.zero From cffdc01ce07f2f736616510374c360dea080bd35 Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Thu, 16 Nov 2017 18:41:51 +0300 Subject: [PATCH 2/6] deleted seem not to work --- Source/HFCardCollectionView.swift | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/HFCardCollectionView.swift b/Source/HFCardCollectionView.swift index 41e3e5c..5a655df 100644 --- a/Source/HFCardCollectionView.swift +++ b/Source/HFCardCollectionView.swift @@ -16,12 +16,5 @@ class HFCardCollectionView: UICollectionView { } super.insertItems(at: indexPaths) } - - override func deleteItems(at indexPaths: [IndexPath]) { - if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout { - collectionViewLayout.willDelete(indexPaths: indexPaths) - } - super.deleteItems(at: indexPaths) - } - + } From f64a5c952a52e4190ea2632d81c65a3bef9eb9c4 Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Thu, 16 Nov 2017 18:57:27 +0300 Subject: [PATCH 3/6] HFCardCollectionView added to project --- HFCardCollectionViewLayout.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HFCardCollectionViewLayout.xcodeproj/project.pbxproj b/HFCardCollectionViewLayout.xcodeproj/project.pbxproj index 19f5509..885b435 100644 --- a/HFCardCollectionViewLayout.xcodeproj/project.pbxproj +++ b/HFCardCollectionViewLayout.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */; }; 416D2D731E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */; }; 416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */; }; + D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -22,6 +23,7 @@ 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayout.swift; path = Source/HFCardCollectionViewLayout.swift; sourceTree = SOURCE_ROOT; }; 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayoutDelegate.swift; path = Source/HFCardCollectionViewLayoutDelegate.swift; sourceTree = SOURCE_ROOT; }; 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UICollectionViewExtensions.swift; path = Source/UICollectionViewExtensions.swift; sourceTree = SOURCE_ROOT; }; + D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionView.swift; path = Source/HFCardCollectionView.swift; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,6 +56,7 @@ 416D2D641E5F113600D8A570 /* HFCardCollectionViewLayout */ = { isa = PBXGroup; children = ( + D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */, 416D2D6D1E5F117500D8A570 /* HFCardCollectionViewCell.swift */, 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */, 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */, @@ -145,6 +148,7 @@ buildActionMask = 2147483647; files = ( 416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */, + D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */, 416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */, 416D2D711E5F117500D8A570 /* HFCardCollectionViewCell.swift in Sources */, 416D2D731E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift in Sources */, From 34ca1c5b6fd1d9429e280372a71009f685e29b0b Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Thu, 16 Nov 2017 19:05:12 +0300 Subject: [PATCH 4/6] opening HFCardCollectionView --- Source/HFCardCollectionView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HFCardCollectionView.swift b/Source/HFCardCollectionView.swift index 5a655df..1ac2548 100644 --- a/Source/HFCardCollectionView.swift +++ b/Source/HFCardCollectionView.swift @@ -8,7 +8,7 @@ import UIKit -class HFCardCollectionView: UICollectionView { +open class HFCardCollectionView: UICollectionView { override func insertItems(at indexPaths: [IndexPath]) { if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout { From 2b1a3f2023cda4fab5b931c98f79c7d088c30d6e Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Thu, 16 Nov 2017 19:12:15 +0300 Subject: [PATCH 5/6] opening HFCardCollectionView --- Source/HFCardCollectionView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HFCardCollectionView.swift b/Source/HFCardCollectionView.swift index 1ac2548..bd901c5 100644 --- a/Source/HFCardCollectionView.swift +++ b/Source/HFCardCollectionView.swift @@ -10,7 +10,7 @@ import UIKit open class HFCardCollectionView: UICollectionView { - override func insertItems(at indexPaths: [IndexPath]) { + override open func insertItems(at indexPaths: [IndexPath]) { if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout { collectionViewLayout.willInsert(indexPaths: indexPaths) } From 2cc9b067215c53746654db48a11c7598d430887d Mon Sep 17 00:00:00 2001 From: Eliah Snakin Date: Wed, 3 Oct 2018 16:13:08 +0300 Subject: [PATCH 6/6] swift 4.2 update, merge conflicts resolved --- .../project.pbxproj | 8 +- .../project.pbxproj | 34 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AppDelegate.swift | 3 +- .../ExampleCollectionViewCell.swift | 2 +- .../Podfile.lock | 8 +- .../HFCardCollectionViewLayout.podspec.json | 4 +- .../Pods/Manifest.lock | 8 +- .../Pods/Pods.xcodeproj/project.pbxproj | 454 +++++++++--------- .../HFCardCollectionViewLayout.xcconfig | 7 +- .../HFCardCollectionViewLayout/Info.plist | 2 +- ...dCollectionViewLayoutExample-frameworks.sh | 76 ++- ...rdCollectionViewLayoutExample-resources.sh | 43 +- ...CollectionViewLayoutExample.debug.xcconfig | 9 +- ...llectionViewLayoutExample.release.xcconfig | 9 +- Source/HFCardCollectionView.swift | 5 - Source/HFCardCollectionViewLayout.swift | 33 +- 17 files changed, 387 insertions(+), 326 deletions(-) create mode 100644 HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/HFCardCollectionViewLayout.xcodeproj/project.pbxproj b/HFCardCollectionViewLayout.xcodeproj/project.pbxproj index 885b435..5047e70 100644 --- a/HFCardCollectionViewLayout.xcodeproj/project.pbxproj +++ b/HFCardCollectionViewLayout.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 416D2D711E5F117500D8A570 /* HFCardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6D1E5F117500D8A570 /* HFCardCollectionViewCell.swift */; }; 416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */; }; 416D2D731E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */; }; - 416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */; }; D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */; }; /* End PBXBuildFile section */ @@ -22,7 +21,6 @@ 416D2D6D1E5F117500D8A570 /* HFCardCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewCell.swift; path = Source/HFCardCollectionViewCell.swift; sourceTree = SOURCE_ROOT; }; 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayout.swift; path = Source/HFCardCollectionViewLayout.swift; sourceTree = SOURCE_ROOT; }; 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayoutDelegate.swift; path = Source/HFCardCollectionViewLayoutDelegate.swift; sourceTree = SOURCE_ROOT; }; - 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UICollectionViewExtensions.swift; path = Source/UICollectionViewExtensions.swift; sourceTree = SOURCE_ROOT; }; D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionView.swift; path = Source/HFCardCollectionView.swift; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -60,7 +58,6 @@ 416D2D6D1E5F117500D8A570 /* HFCardCollectionViewCell.swift */, 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */, 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */, - 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */, 416D2D651E5F113600D8A570 /* HFCardCollectionViewLayout.h */, 416D2D661E5F113600D8A570 /* Info.plist */, ); @@ -147,7 +144,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */, D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */, 416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */, 416D2D711E5F117500D8A570 /* HFCardCollectionViewCell.swift in Sources */, @@ -274,7 +270,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -294,7 +290,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.hendrik-frahmann.HFCardCollectionViewLayout"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcodeproj/project.pbxproj b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcodeproj/project.pbxproj index 54df2c1..59a696f 100644 --- a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcodeproj/project.pbxproj +++ b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcodeproj/project.pbxproj @@ -110,7 +110,6 @@ EEBBC6331DC9E19E00BBC1EE /* Frameworks */, EEBBC6341DC9E19E00BBC1EE /* Resources */, 906D250FBF2D46B24EB39BA1 /* [CP] Embed Pods Frameworks */, - 9616E71599BA57C3E0C8514A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -128,7 +127,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Hendrik Frahmann"; TargetAttributes = { EEBBC6351DC9E19E00BBC1EE = { @@ -177,43 +176,34 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HFCardCollectionViewLayout.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9616E71599BA57C3E0C8514A /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; DF784A192065786A9B3017F5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-HFCardCollectionViewLayoutExample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -265,6 +255,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -272,6 +263,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -322,6 +314,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -329,6 +322,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -373,7 +367,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -391,7 +385,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/AppDelegate.swift b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/AppDelegate.swift index 2351b40..1f2b233 100644 --- a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/AppDelegate.swift +++ b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/AppDelegate.swift @@ -13,8 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { // Override point for customization after application launch. return true } diff --git a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/ExampleCollectionViewCell.swift b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/ExampleCollectionViewCell.swift index 34241af..e51897d 100644 --- a/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/ExampleCollectionViewCell.swift +++ b/HFCardCollectionViewLayoutExample/HFCardCollectionViewLayoutExample/ExampleCollectionViewCell.swift @@ -75,7 +75,7 @@ extension ExampleCollectionViewCell : UITableViewDelegate, UITableViewDataSource return true } - func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) { + func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { // nothing } diff --git a/HFCardCollectionViewLayoutExample/Podfile.lock b/HFCardCollectionViewLayoutExample/Podfile.lock index d2b3cbe..0880b7c 100644 --- a/HFCardCollectionViewLayoutExample/Podfile.lock +++ b/HFCardCollectionViewLayoutExample/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - HFCardCollectionViewLayout (0.2.2) + - HFCardCollectionViewLayout (0.4.2) DEPENDENCIES: - HFCardCollectionViewLayout (from `../`) EXTERNAL SOURCES: HFCardCollectionViewLayout: - :path: ../ + :path: "../" SPEC CHECKSUMS: - HFCardCollectionViewLayout: 70073318095967f5fa407147df68dd4696c7aedc + HFCardCollectionViewLayout: 687d5d92c434785a2ee0d8b9331c9bef41b07b66 PODFILE CHECKSUM: 234325b1b12e2e74244c12d2d31fa748e550f0f2 -COCOAPODS: 1.2.0.beta.1 +COCOAPODS: 1.5.3 diff --git a/HFCardCollectionViewLayoutExample/Pods/Local Podspecs/HFCardCollectionViewLayout.podspec.json b/HFCardCollectionViewLayoutExample/Pods/Local Podspecs/HFCardCollectionViewLayout.podspec.json index 512e0a1..1e0df56 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Local Podspecs/HFCardCollectionViewLayout.podspec.json +++ b/HFCardCollectionViewLayoutExample/Pods/Local Podspecs/HFCardCollectionViewLayout.podspec.json @@ -1,6 +1,6 @@ { "name": "HFCardCollectionViewLayout", - "version": "0.2.2", + "version": "0.4.2", "summary": "The HFCardCollectionViewLayout provides a card stack layout not quite similar like the apps Reminder and Wallet.", "license": "MIT", "homepage": "https://github.com/hfrahmann/HFCardCollectionViewLayout", @@ -12,7 +12,7 @@ }, "source": { "git": "https://github.com/hfrahmann/HFCardCollectionViewLayout.git", - "tag": "0.2.2" + "tag": "0.4.2" }, "source_files": "Source/*" } diff --git a/HFCardCollectionViewLayoutExample/Pods/Manifest.lock b/HFCardCollectionViewLayoutExample/Pods/Manifest.lock index d2b3cbe..0880b7c 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Manifest.lock +++ b/HFCardCollectionViewLayoutExample/Pods/Manifest.lock @@ -1,16 +1,16 @@ PODS: - - HFCardCollectionViewLayout (0.2.2) + - HFCardCollectionViewLayout (0.4.2) DEPENDENCIES: - HFCardCollectionViewLayout (from `../`) EXTERNAL SOURCES: HFCardCollectionViewLayout: - :path: ../ + :path: "../" SPEC CHECKSUMS: - HFCardCollectionViewLayout: 70073318095967f5fa407147df68dd4696c7aedc + HFCardCollectionViewLayout: 687d5d92c434785a2ee0d8b9331c9bef41b07b66 PODFILE CHECKSUM: 234325b1b12e2e74244c12d2d31fa748e550f0f2 -COCOAPODS: 1.2.0.beta.1 +COCOAPODS: 1.5.3 diff --git a/HFCardCollectionViewLayoutExample/Pods/Pods.xcodeproj/project.pbxproj b/HFCardCollectionViewLayoutExample/Pods/Pods.xcodeproj/project.pbxproj index 8a8a5c1..1bb01b0 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Pods.xcodeproj/project.pbxproj +++ b/HFCardCollectionViewLayoutExample/Pods/Pods.xcodeproj/project.pbxproj @@ -7,16 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 072CA10A611A32FF1BD5A97A921B24D9 /* HFCardCollectionViewLayout-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC687B01081814BEFEA88991197B0BC /* HFCardCollectionViewLayout-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3CE3C81FFEFE5F52C3CC15FB5684F101 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; - 790F98919A98AB3E2AE7D5B3FD41A905 /* HFCardCollectionViewLayoutDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A16A63496E99558B4CA6B9D180806AB9 /* HFCardCollectionViewLayoutDelegate.swift */; }; - 7A6E27CC77BF07F42DB5DA9DF2990BA6 /* HFCardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D41BF607B2DDA5A8DD7AE50E6E83165C /* HFCardCollectionViewCell.swift */; }; - 7F63908EBEA5EE8B1B984B1B5CEB46E1 /* Pods-HFCardCollectionViewLayoutExample-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 046CED6827F8F476ACC86DD5468CF257 /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8EFA7FE72F4E97A43C553E2BC4C123B4 /* HFCardCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C3E00731B0E31D62A8489277EFEEB67 /* HFCardCollectionViewLayout.swift */; }; - A5E3B8108717879F1E175A7882970651 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; - B1BF26FC1E90FD810077D75E /* HFCardCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1BF26FB1E90FD810077D75E /* HFCardCollectionView.swift */; }; - CAB4E8075BB566BEB9DEFC2BB0AE1A44 /* HFCardCollectionViewLayout-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B42049707F2D0F6158127900CD948320 /* HFCardCollectionViewLayout-dummy.m */; }; - F493F895289894F832FE0C88F27A0B15 /* Pods-HFCardCollectionViewLayoutExample-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AAF622BE70472DDFBC8E2489D38DD90 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */; }; + 072CA10A611A32FF1BD5A97A921B24D9 /* HFCardCollectionViewLayout-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 64060C38C020FB7173FC3625086AC9AB /* HFCardCollectionViewLayout-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 11975CC83200BFDBD75BB09876CEA546 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 3900E3D82E47958E0887A9DE4F7BE00C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 4E72A214A8DFC525A964C858C344D3CE /* HFCardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA834AC252F4E84FA3DF055804D0906D /* HFCardCollectionViewCell.swift */; }; + 50E8E50BDCDAF9829740502FC0D9B5AA /* HFCardCollectionViewLayoutDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F732424B04A2AACCED46A482B0ECF4 /* HFCardCollectionViewLayoutDelegate.swift */; }; + 7F63908EBEA5EE8B1B984B1B5CEB46E1 /* Pods-HFCardCollectionViewLayoutExample-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = EF6EC16C63576069C92CAC08522A859D /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9A5D859DB6F53898CE887372FD68B97D /* HFCardCollectionViewLayout-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 56FA7D6E76FBA9FFDEA39704740A8169 /* HFCardCollectionViewLayout-dummy.m */; }; + B47B657715844C15FAEF72548024EB3E /* HFCardCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE0A544E9ABB2A253424E907B64A65C /* HFCardCollectionView.swift */; }; + BEA1FD40E84440CA1D5183A9B1BAF0CA /* HFCardCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEFFB2AD9B7F084519346712889AEF1 /* HFCardCollectionViewLayout.swift */; }; + F493F895289894F832FE0C88F27A0B15 /* Pods-HFCardCollectionViewLayoutExample-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A98D1DDBFA0A62357F922A91258B6123 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -30,30 +30,33 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 046CED6827F8F476ACC86DD5468CF257 /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-HFCardCollectionViewLayoutExample-umbrella.h"; sourceTree = ""; }; - 07D657C1C371416A2A0C47DEFBCAEC04 /* Pods-HFCardCollectionViewLayoutExample-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-HFCardCollectionViewLayoutExample-frameworks.sh"; sourceTree = ""; }; - 1C3E00731B0E31D62A8489277EFEEB67 /* HFCardCollectionViewLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HFCardCollectionViewLayout.swift; sourceTree = ""; }; - 2665BF22FA509A9D04D472D47F29BBDB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 02E8E171E102300FB06DFA8E2BF83AB6 /* Pods-HFCardCollectionViewLayoutExample.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-HFCardCollectionViewLayoutExample.modulemap"; sourceTree = ""; }; + 0FDDBBE6CC53DA1BCCB7C2568B3A64BA /* HFCardCollectionViewLayout.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = HFCardCollectionViewLayout.xcconfig; sourceTree = ""; }; 2871AA1D8F3B5DB60D1FC7F51114E01C /* HFCardCollectionViewLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HFCardCollectionViewLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2F0C5D5262152E6CAC8FBF879E31EDCE /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3B08DABD74D6D5378A5DDCE853030F53 /* HFCardCollectionViewLayout.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = HFCardCollectionViewLayout.xcconfig; sourceTree = ""; }; - 4AAF622BE70472DDFBC8E2489D38DD90 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-HFCardCollectionViewLayoutExample-dummy.m"; sourceTree = ""; }; - 54312038EC8BFFC3303E3C93C780CEFD /* HFCardCollectionViewLayout-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HFCardCollectionViewLayout-prefix.pch"; sourceTree = ""; }; - 89EB551874C33A437A4B3D8A20764101 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-HFCardCollectionViewLayoutExample.release.xcconfig"; sourceTree = ""; }; - 919E129C9C6AEDB0ADC7AD498746062A /* HFCardCollectionViewLayout.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = HFCardCollectionViewLayout.modulemap; sourceTree = ""; }; + 2D9A386B304A23E8626CF6E8D01FBBB3 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-HFCardCollectionViewLayoutExample.release.xcconfig"; sourceTree = ""; }; + 4B9F9C9A68834A3409C1A6891EE16502 /* HFCardCollectionViewLayout.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = HFCardCollectionViewLayout.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 56FA7D6E76FBA9FFDEA39704740A8169 /* HFCardCollectionViewLayout-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "HFCardCollectionViewLayout-dummy.m"; sourceTree = ""; }; + 63F732424B04A2AACCED46A482B0ECF4 /* HFCardCollectionViewLayoutDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayoutDelegate.swift; path = Source/HFCardCollectionViewLayoutDelegate.swift; sourceTree = ""; }; + 64060C38C020FB7173FC3625086AC9AB /* HFCardCollectionViewLayout-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HFCardCollectionViewLayout-umbrella.h"; sourceTree = ""; }; + 6571591702531E94ABC337C9E8C95CE8 /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown"; sourceTree = ""; }; + 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 6732721D20F354554468B19B1DEF6CFC /* HFCardCollectionViewLayout-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HFCardCollectionViewLayout-prefix.pch"; sourceTree = ""; }; + 830292859D4BA001AA4D15E59BD8877D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 84DF2564780145278826E8F5D9962807 /* HFCardCollectionViewLayout.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = HFCardCollectionViewLayout.modulemap; sourceTree = ""; }; + 8C3BDF70DC49F78FA85D82556E699525 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - A16A63496E99558B4CA6B9D180806AB9 /* HFCardCollectionViewLayoutDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HFCardCollectionViewLayoutDelegate.swift; sourceTree = ""; }; - B1258B00B7C713CD4DB0AD7B276F8F50 /* Pods-HFCardCollectionViewLayoutExample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-HFCardCollectionViewLayoutExample-resources.sh"; sourceTree = ""; }; - B1BF26FB1E90FD810077D75E /* HFCardCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HFCardCollectionView.swift; sourceTree = ""; }; - B42049707F2D0F6158127900CD948320 /* HFCardCollectionViewLayout-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "HFCardCollectionViewLayout-dummy.m"; sourceTree = ""; }; - B5F36D8799F60A8D7E92CEC996CF92EB /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-HFCardCollectionViewLayoutExample.debug.xcconfig"; sourceTree = ""; }; - C67398A2C41620ED4BB8215FBA4D8EFE /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown"; sourceTree = ""; }; - CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - D41BF607B2DDA5A8DD7AE50E6E83165C /* HFCardCollectionViewCell.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HFCardCollectionViewCell.swift; sourceTree = ""; }; - D4DDF1440510E0A645063459BBF342BC /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist"; sourceTree = ""; }; + 991185C9D72943672095EF803B33271D /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + A98D1DDBFA0A62357F922A91258B6123 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-HFCardCollectionViewLayoutExample-dummy.m"; sourceTree = ""; }; + AA834AC252F4E84FA3DF055804D0906D /* HFCardCollectionViewCell.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewCell.swift; path = Source/HFCardCollectionViewCell.swift; sourceTree = ""; }; + B20E1A940135EA65E8867632B7005252 /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-HFCardCollectionViewLayoutExample.debug.xcconfig"; sourceTree = ""; }; + B9FE40037BB4176BCCD1875042495B28 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + BAE0A544E9ABB2A253424E907B64A65C /* HFCardCollectionView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HFCardCollectionView.swift; path = Source/HFCardCollectionView.swift; sourceTree = ""; }; + C944E020627B03D4087D5EAFDD3B19B8 /* Pods-HFCardCollectionViewLayoutExample-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-HFCardCollectionViewLayoutExample-frameworks.sh"; sourceTree = ""; }; + DCFB9E4B4763ED067D5B16A732EBE4D5 /* Pods-HFCardCollectionViewLayoutExample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-HFCardCollectionViewLayoutExample-resources.sh"; sourceTree = ""; }; + DDEFFB2AD9B7F084519346712889AEF1 /* HFCardCollectionViewLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayout.swift; path = Source/HFCardCollectionViewLayout.swift; sourceTree = ""; }; + E7FA12C23CEF42C5C2251914B38B1E96 /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist"; sourceTree = ""; }; + EF6EC16C63576069C92CAC08522A859D /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-HFCardCollectionViewLayoutExample-umbrella.h"; sourceTree = ""; }; F11EAAD3F1CFFDD7D706ACA402A1C371 /* Pods_HFCardCollectionViewLayoutExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HFCardCollectionViewLayoutExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FAC687B01081814BEFEA88991197B0BC /* HFCardCollectionViewLayout-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HFCardCollectionViewLayout-umbrella.h"; sourceTree = ""; }; - FFD465A5DC9B5ACE385F3591BD90A298 /* Pods-HFCardCollectionViewLayoutExample.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-HFCardCollectionViewLayoutExample.modulemap"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -61,7 +64,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3CE3C81FFEFE5F52C3CC15FB5684F101 /* Foundation.framework in Frameworks */, + 11975CC83200BFDBD75BB09876CEA546 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -69,99 +72,94 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A5E3B8108717879F1E175A7882970651 /* Foundation.framework in Frameworks */, + 3900E3D82E47958E0887A9DE4F7BE00C /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 29DCA1BD5EA65F6AABF1763FF25A5265 /* Pods-HFCardCollectionViewLayoutExample */ = { + 3B5AA1E21FD91F88974DCBD9408AD507 /* HFCardCollectionViewLayout */ = { isa = PBXGroup; children = ( - 2665BF22FA509A9D04D472D47F29BBDB /* Info.plist */, - FFD465A5DC9B5ACE385F3591BD90A298 /* Pods-HFCardCollectionViewLayoutExample.modulemap */, - C67398A2C41620ED4BB8215FBA4D8EFE /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown */, - D4DDF1440510E0A645063459BBF342BC /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist */, - 4AAF622BE70472DDFBC8E2489D38DD90 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */, - 07D657C1C371416A2A0C47DEFBCAEC04 /* Pods-HFCardCollectionViewLayoutExample-frameworks.sh */, - B1258B00B7C713CD4DB0AD7B276F8F50 /* Pods-HFCardCollectionViewLayoutExample-resources.sh */, - 046CED6827F8F476ACC86DD5468CF257 /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */, - B5F36D8799F60A8D7E92CEC996CF92EB /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */, - 89EB551874C33A437A4B3D8A20764101 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */, + BAE0A544E9ABB2A253424E907B64A65C /* HFCardCollectionView.swift */, + AA834AC252F4E84FA3DF055804D0906D /* HFCardCollectionViewCell.swift */, + DDEFFB2AD9B7F084519346712889AEF1 /* HFCardCollectionViewLayout.swift */, + 63F732424B04A2AACCED46A482B0ECF4 /* HFCardCollectionViewLayoutDelegate.swift */, + 579ECE1060472115B0EE44E6CE8C04DB /* Pod */, + 70136EFDC5F1101C7A489EBC2E9323CC /* Support Files */, ); - name = "Pods-HFCardCollectionViewLayoutExample"; - path = "Target Support Files/Pods-HFCardCollectionViewLayoutExample"; - sourceTree = ""; - }; - 384F295B9B7C16999BBC2531611857C1 /* Support Files */ = { - isa = PBXGroup; - children = ( - 919E129C9C6AEDB0ADC7AD498746062A /* HFCardCollectionViewLayout.modulemap */, - 3B08DABD74D6D5378A5DDCE853030F53 /* HFCardCollectionViewLayout.xcconfig */, - B42049707F2D0F6158127900CD948320 /* HFCardCollectionViewLayout-dummy.m */, - 54312038EC8BFFC3303E3C93C780CEFD /* HFCardCollectionViewLayout-prefix.pch */, - FAC687B01081814BEFEA88991197B0BC /* HFCardCollectionViewLayout-umbrella.h */, - 2F0C5D5262152E6CAC8FBF879E31EDCE /* Info.plist */, - ); - name = "Support Files"; - path = "HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout"; + name = HFCardCollectionViewLayout; + path = ../..; sourceTree = ""; }; - 3FF3C2B28A3EE6A89FBA891598AF5508 /* HFCardCollectionViewLayout */ = { + 579ECE1060472115B0EE44E6CE8C04DB /* Pod */ = { isa = PBXGroup; children = ( - 90DA7C0E383D971F85355B2CDE812ADE /* Source */, - 384F295B9B7C16999BBC2531611857C1 /* Support Files */, + 4B9F9C9A68834A3409C1A6891EE16502 /* HFCardCollectionViewLayout.podspec */, + 8C3BDF70DC49F78FA85D82556E699525 /* LICENSE */, + 991185C9D72943672095EF803B33271D /* README.md */, ); - name = HFCardCollectionViewLayout; - path = ../..; + name = Pod; sourceTree = ""; }; - 4FFE99151BD282E539E9002587D70D0A /* Development Pods */ = { + 70136EFDC5F1101C7A489EBC2E9323CC /* Support Files */ = { isa = PBXGroup; children = ( - 3FF3C2B28A3EE6A89FBA891598AF5508 /* HFCardCollectionViewLayout */, + 84DF2564780145278826E8F5D9962807 /* HFCardCollectionViewLayout.modulemap */, + 0FDDBBE6CC53DA1BCCB7C2568B3A64BA /* HFCardCollectionViewLayout.xcconfig */, + 56FA7D6E76FBA9FFDEA39704740A8169 /* HFCardCollectionViewLayout-dummy.m */, + 6732721D20F354554468B19B1DEF6CFC /* HFCardCollectionViewLayout-prefix.pch */, + 64060C38C020FB7173FC3625086AC9AB /* HFCardCollectionViewLayout-umbrella.h */, + B9FE40037BB4176BCCD1875042495B28 /* Info.plist */, ); - name = "Development Pods"; + name = "Support Files"; + path = "HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout"; sourceTree = ""; }; - 7531C8F8DE19F1AA3C8A7AC97A91DC29 /* iOS */ = { + 7BB52C9668B87A5CE53A6B898898A17C /* Pods-HFCardCollectionViewLayoutExample */ = { isa = PBXGroup; children = ( - CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */, + 830292859D4BA001AA4D15E59BD8877D /* Info.plist */, + 02E8E171E102300FB06DFA8E2BF83AB6 /* Pods-HFCardCollectionViewLayoutExample.modulemap */, + 6571591702531E94ABC337C9E8C95CE8 /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.markdown */, + E7FA12C23CEF42C5C2251914B38B1E96 /* Pods-HFCardCollectionViewLayoutExample-acknowledgements.plist */, + A98D1DDBFA0A62357F922A91258B6123 /* Pods-HFCardCollectionViewLayoutExample-dummy.m */, + C944E020627B03D4087D5EAFDD3B19B8 /* Pods-HFCardCollectionViewLayoutExample-frameworks.sh */, + DCFB9E4B4763ED067D5B16A732EBE4D5 /* Pods-HFCardCollectionViewLayoutExample-resources.sh */, + EF6EC16C63576069C92CAC08522A859D /* Pods-HFCardCollectionViewLayoutExample-umbrella.h */, + B20E1A940135EA65E8867632B7005252 /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */, + 2D9A386B304A23E8626CF6E8D01FBBB3 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */, ); - name = iOS; + name = "Pods-HFCardCollectionViewLayoutExample"; + path = "Target Support Files/Pods-HFCardCollectionViewLayoutExample"; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 4FFE99151BD282E539E9002587D70D0A /* Development Pods */, + EF512BBA73F196079845A682734BAE0A /* Development Pods */, BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, E11057D728DF1A0CA614502392CB04B8 /* Products */, E1C4EBB06D13D49B160F339B6DDBECA0 /* Targets Support Files */, ); sourceTree = ""; }; - 90DA7C0E383D971F85355B2CDE812ADE /* Source */ = { + BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { isa = PBXGroup; children = ( - D41BF607B2DDA5A8DD7AE50E6E83165C /* HFCardCollectionViewCell.swift */, - 1C3E00731B0E31D62A8489277EFEEB67 /* HFCardCollectionViewLayout.swift */, - A16A63496E99558B4CA6B9D180806AB9 /* HFCardCollectionViewLayoutDelegate.swift */, - B1BF26FB1E90FD810077D75E /* HFCardCollectionView.swift */, + D35AF013A5F0BAD4F32504907A52519E /* iOS */, ); - path = Source; + name = Frameworks; sourceTree = ""; }; - BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { + D35AF013A5F0BAD4F32504907A52519E /* iOS */ = { isa = PBXGroup; children = ( - 7531C8F8DE19F1AA3C8A7AC97A91DC29 /* iOS */, + 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */, ); - name = Frameworks; + name = iOS; sourceTree = ""; }; E11057D728DF1A0CA614502392CB04B8 /* Products */ = { @@ -176,11 +174,19 @@ E1C4EBB06D13D49B160F339B6DDBECA0 /* Targets Support Files */ = { isa = PBXGroup; children = ( - 29DCA1BD5EA65F6AABF1763FF25A5265 /* Pods-HFCardCollectionViewLayoutExample */, + 7BB52C9668B87A5CE53A6B898898A17C /* Pods-HFCardCollectionViewLayoutExample */, ); name = "Targets Support Files"; sourceTree = ""; }; + EF512BBA73F196079845A682734BAE0A /* Development Pods */ = { + isa = PBXGroup; + children = ( + 3B5AA1E21FD91F88974DCBD9408AD507 /* HFCardCollectionViewLayout */, + ); + name = "Development Pods"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -225,7 +231,7 @@ isa = PBXNativeTarget; buildConfigurationList = C000741956A955D75290C78B8C062923 /* Build configuration list for PBXNativeTarget "HFCardCollectionViewLayout" */; buildPhases = ( - 6FA203D0BBD713600FC1B3832161E89A /* Sources */, + 84CB99836A5B8AE4424E1330A7E3294C /* Sources */, D8B57CD8DCCF548A95047D16F3B2EC2D /* Frameworks */, 7E51A2A926EE7949AAE4FD1EA1AC105D /* Headers */, ); @@ -244,13 +250,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0920; - TargetAttributes = { - E1C2F6043B98ABA5417B87102C667275 = { - LastSwiftMigration = 0920; - }; - }; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -279,15 +280,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6FA203D0BBD713600FC1B3832161E89A /* Sources */ = { + 84CB99836A5B8AE4424E1330A7E3294C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7A6E27CC77BF07F42DB5DA9DF2990BA6 /* HFCardCollectionViewCell.swift in Sources */, - CAB4E8075BB566BEB9DEFC2BB0AE1A44 /* HFCardCollectionViewLayout-dummy.m in Sources */, - 8EFA7FE72F4E97A43C553E2BC4C123B4 /* HFCardCollectionViewLayout.swift in Sources */, - 790F98919A98AB3E2AE7D5B3FD41A905 /* HFCardCollectionViewLayoutDelegate.swift in Sources */, - B1BF26FC1E90FD810077D75E /* HFCardCollectionView.swift in Sources */, + B47B657715844C15FAEF72548024EB3E /* HFCardCollectionView.swift in Sources */, + 4E72A214A8DFC525A964C858C344D3CE /* HFCardCollectionViewCell.swift in Sources */, + 9A5D859DB6F53898CE887372FD68B97D /* HFCardCollectionViewLayout-dummy.m in Sources */, + BEA1FD40E84440CA1D5183A9B1BAF0CA /* HFCardCollectionViewLayout.swift in Sources */, + 50E8E50BDCDAF9829740502FC0D9B5AA /* HFCardCollectionViewLayoutDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -303,37 +304,77 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 12914D756594D15C6F2CA12FE5F89F1B /* Debug */ = { + 17DC31871E65EA0CD43A11D12B3FA95F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 0FDDBBE6CC53DA1BCCB7C2568B3A64BA /* HFCardCollectionViewLayout.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/HFCardCollectionViewLayout/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.modulemap"; + PRODUCT_MODULE_NAME = HFCardCollectionViewLayout; + PRODUCT_NAME = HFCardCollectionViewLayout; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 553022A828EE1991F07D2D73F565AEF8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -342,152 +383,178 @@ "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; }; - 59039CA94E93F462878EA27D8A88C6AE /* Release */ = { + 58CE816B060A41D32CEC095441D0E3E0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89EB551874C33A437A4B3D8A20764101 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.modulemap"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_HFCardCollectionViewLayoutExample; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; }; name = Release; }; - 7161B9D607CCBE396C693489B0AEB112 /* Release */ = { + 666984389FF123A874F9195DDADBE5D3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3B08DABD74D6D5378A5DDCE853030F53 /* HFCardCollectionViewLayout.xcconfig */; + baseConfigurationReference = 2D9A386B304A23E8626CF6E8D01FBBB3 /* Pods-HFCardCollectionViewLayoutExample.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/HFCardCollectionViewLayout/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = HFCardCollectionViewLayout; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 92B027B0926C28AD73F595226EFBDF0B /* Debug */ = { + 6CAA3677A6FA5EF54A7508AD7E869067 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3B08DABD74D6D5378A5DDCE853030F53 /* HFCardCollectionViewLayout.xcconfig */; + baseConfigurationReference = 0FDDBBE6CC53DA1BCCB7C2568B3A64BA /* HFCardCollectionViewLayout.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout-prefix.pch"; INFOPLIST_FILE = "Target Support Files/HFCardCollectionViewLayout/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_MODULE_NAME = HFCardCollectionViewLayout; PRODUCT_NAME = HFCardCollectionViewLayout; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - CAED8D664B647776A9C45FD40CED9B7F /* Debug */ = { + 7CE242402386A8DC9FADD8751B2E25C5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B5F36D8799F60A8D7E92CEC996CF92EB /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */; + baseConfigurationReference = B20E1A940135EA65E8867632B7005252 /* Pods-HFCardCollectionViewLayoutExample.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MODULEMAP_FILE = "Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_HFCardCollectionViewLayoutExample; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -495,65 +562,14 @@ }; name = Debug; }; - E72E7977875C2D251FC62736BBDDC389 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 12914D756594D15C6F2CA12FE5F89F1B /* Debug */, - E72E7977875C2D251FC62736BBDDC389 /* Release */, + 553022A828EE1991F07D2D73F565AEF8 /* Debug */, + 58CE816B060A41D32CEC095441D0E3E0 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -561,8 +577,8 @@ 7B1C1515171E534D7DD08A568F6263CE /* Build configuration list for PBXNativeTarget "Pods-HFCardCollectionViewLayoutExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - CAED8D664B647776A9C45FD40CED9B7F /* Debug */, - 59039CA94E93F462878EA27D8A88C6AE /* Release */, + 7CE242402386A8DC9FADD8751B2E25C5 /* Debug */, + 666984389FF123A874F9195DDADBE5D3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -570,8 +586,8 @@ C000741956A955D75290C78B8C062923 /* Build configuration list for PBXNativeTarget "HFCardCollectionViewLayout" */ = { isa = XCConfigurationList; buildConfigurations = ( - 92B027B0926C28AD73F595226EFBDF0B /* Debug */, - 7161B9D607CCBE396C693489B0AEB112 /* Release */, + 17DC31871E65EA0CD43A11D12B3FA95F /* Debug */, + 6CAA3677A6FA5EF54A7508AD7E869067 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.xcconfig b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.xcconfig index 7672855..4558d6a 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.xcconfig +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/HFCardCollectionViewLayout.xcconfig @@ -1,9 +1,8 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/HFCardCollectionViewLayout +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/HFCardCollectionViewLayout GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/Info.plist b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/Info.plist index 3f68a24..a71f7a0 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/Info.plist +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/HFCardCollectionViewLayout/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.2.2 + 0.4.2 CFBundleSignature ???? CFBundleVersion diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh index 5408119..84d4bce 100755 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-frameworks.sh @@ -1,11 +1,28 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -23,9 +40,9 @@ install_framework() source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,12 +71,40 @@ install_framework() fi } +# Copies and strips a vendored dSYM +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" @@ -72,11 +117,19 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + for arch in $binary_archs; do + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -85,14 +138,15 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework" + install_framework "${BUILT_PRODUCTS_DIR}/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework" + install_framework "${BUILT_PRODUCTS_DIR}/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-resources.sh b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-resources.sh index 4602c68..345301f 100755 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-resources.sh +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample-resources.sh @@ -1,5 +1,13 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then + # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy + # resources to, so exit 0 (signalling the script phase was successful). + exit 0 +fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -8,7 +16,11 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt XCASSET_FILES=() -case "${TARGETED_DEVICE_FAMILY}" in +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +case "${TARGETED_DEVICE_FAMILY:-}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" ;; @@ -21,6 +33,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 3) TARGET_DEVICE_ARGS="--target-device tv" ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; @@ -41,29 +56,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -71,7 +86,7 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac @@ -85,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) @@ -95,5 +110,9 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + else + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist" + fi fi diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.debug.xcconfig b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.debug.xcconfig index 473187e..342b629 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.debug.xcconfig +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.debug.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HFCardCollectionViewLayout" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/HFCardCollectionViewLayout" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "HFCardCollectionViewLayout" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.release.xcconfig b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.release.xcconfig index 473187e..342b629 100644 --- a/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.release.xcconfig +++ b/HFCardCollectionViewLayoutExample/Pods/Target Support Files/Pods-HFCardCollectionViewLayoutExample/Pods-HFCardCollectionViewLayoutExample.release.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HFCardCollectionViewLayout" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/HFCardCollectionViewLayout" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/HFCardCollectionViewLayout/HFCardCollectionViewLayout.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "HFCardCollectionViewLayout" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Source/HFCardCollectionView.swift b/Source/HFCardCollectionView.swift index 1116ded..13c5d93 100644 --- a/Source/HFCardCollectionView.swift +++ b/Source/HFCardCollectionView.swift @@ -16,9 +16,6 @@ open class HFCardCollectionView: UICollectionView { } super.insertItems(at: indexPaths) } -<<<<<<< HEAD - -======= override open func deleteItems(at indexPaths: [IndexPath]) { if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout { @@ -57,6 +54,4 @@ open class HFCardCollectionView: UICollectionView { super.setContentOffset(contentOffset, animated: animated) } } - ->>>>>>> hfrahmann/master } diff --git a/Source/HFCardCollectionViewLayout.swift b/Source/HFCardCollectionViewLayout.swift index 953676b..fb0511c 100644 --- a/Source/HFCardCollectionViewLayout.swift +++ b/Source/HFCardCollectionViewLayout.swift @@ -420,18 +420,13 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz for indexPath in indexPaths { if(indexPath.section == 0) { if(indexPath.item <= self.revealedIndex) { -<<<<<<< HEAD -======= collectionViewTemporaryTop += self.cardHeadHeight ->>>>>>> hfrahmann/master self.revealedIndex += 1 } } } } -<<<<<<< HEAD -======= open func willDelete(indexPaths: [IndexPath]) { let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate for indexPath in indexPaths { @@ -451,7 +446,6 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz } } ->>>>>>> hfrahmann/master //////////////////////////////////////////////////////////////////////////////////////////////////// ////////// Private ////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -537,8 +531,8 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz private func initializeCardCollectionViewLayout() { self.collectionViewIsInitialized = true - NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow(_:)), name: NSNotification.Name.UIKeyboardWillShow, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardDidHide(_:)), name: NSNotification.Name.UIKeyboardDidHide, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardDidHide(_:)), name: UIResponder.keyboardDidHideNotification, object: nil) self.collectionViewTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.collectionViewTapGestureHandler)) self.collectionViewTapGestureRecognizer?.delegate = self @@ -694,13 +688,9 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz shouldReloadAllItems = true } -<<<<<<< HEAD - var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView) / self.cardHeadHeight) - 10 - var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height) / self.cardHeadHeight) + 5 -======= + var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView + collectionViewTemporaryTop) / self.cardHeadHeight) - 10 var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height + collectionViewTemporaryTop) / self.cardHeadHeight) + 5 ->>>>>>> hfrahmann/master if(startIndex < 0) { startIndex = 0 @@ -722,11 +712,8 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz cardLayoutAttribute.zIndex = itemIndex if self.revealedIndex < 0 && self.collapseAllCards == false { -<<<<<<< HEAD -======= self.collectionView!.contentOffset.y += collectionViewTemporaryTop collectionViewTemporaryTop = 0 ->>>>>>> hfrahmann/master self.generateNonRevealedCardsAttribute(cardLayoutAttribute) } else if self.revealedIndex == itemIndex && self.collapseAllCards == false { self.generateRevealedCardAttribute(cardLayoutAttribute) @@ -748,11 +735,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz if self.collapseAllCards == false { return [] } else { -<<<<<<< HEAD - let startIndex: Int = Int(self.contentOffsetTop / self.cardHeadHeight) -======= let startIndex: Int = Int((self.contentOffsetTop + collectionViewTemporaryTop) / self.cardHeadHeight) ->>>>>>> hfrahmann/master let endIndex = max(0, startIndex + self.bottomNumberOfStackedCards - 2) return Array(startIndex...endIndex) } @@ -786,11 +769,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz private func generateNonRevealedCardsAttribute(_ attribute: HFCardCollectionViewLayoutAttributes) { let cardHeadHeight = self.calculateCardHeadHeight() -<<<<<<< HEAD - let startIndex = Int((self.contentOffsetTop - self.spaceAtTopForBackgroundView) / cardHeadHeight) -======= let startIndex = Int((self.contentOffsetTop + collectionViewTemporaryTop - self.spaceAtTopForBackgroundView) / cardHeadHeight) ->>>>>>> hfrahmann/master let currentIndex = attribute.indexPath.item if(currentIndex == self.movingCardSelectedIndex) { attribute.alpha = 0.0 @@ -1028,7 +1007,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz self.collectionView?.insertSubview(self.movingCardSnapshotCell!, belowSubview: belowCell) self.movingCardSnapshotCell?.layer.zPosition = belowCell.layer.zPosition } else { - self.collectionView?.sendSubview(toBack: self.movingCardSnapshotCell!) + self.collectionView?.sendSubviewToBack(self.movingCardSnapshotCell!) } } } @@ -1091,7 +1070,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz self.invalidateScrollTimer() self.autoscrollDisplayLink = CADisplayLink(target: self, selector: #selector(self.autoscrollHandler(displayLink:))) self.autoscrollDirection = direction - self.autoscrollDisplayLink?.add(to: .main, forMode: .commonModes) + self.autoscrollDisplayLink?.add(to: .main, forMode: .common) } private func invalidateScrollTimer() { @@ -1172,7 +1151,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz if(gestureRecognizer == self.revealedCardPanGestureRecognizer) { let velocity = self.revealedCardPanGestureRecognizer?.velocity(in: self.revealedCardPanGestureRecognizer?.view) - let result = fabs(velocity!.y) > fabs(velocity!.x) + let result = abs(velocity!.y) > abs(velocity!.x) return result } return true