diff --git a/CollapsibleTableSectionViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CollapsibleTableSectionViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/CollapsibleTableSectionViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.swift b/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.swift index a4b4ed6..3fdf851 100644 --- a/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.swift +++ b/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.swift @@ -17,6 +17,7 @@ import UIKit @objc optional func collapsibleTableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int @objc optional func collapsibleTableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat @objc optional func collapsibleTableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat + @objc optional func collapsibleTableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? @objc optional func collapsibleTableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? @objc optional func collapsibleTableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) @objc optional func shouldCollapseByDefault(_ tableView: UITableView) -> Bool @@ -129,7 +130,10 @@ extension CollapsibleTableSectionViewController: UITableViewDataSource, UITableV header.section = section header.delegate = self - return header + guard let customHeader = delegate?.collapsibleTableView?(tableView, viewForHeaderInSection: section) as? CollapsibleTableViewHeader else { return header } + customHeader.section = section + customHeader.delegate = self + return customHeader } public func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { diff --git a/CollapsibleTableSectionViewController/CollapsibleTableViewHeader.swift b/CollapsibleTableSectionViewController/CollapsibleTableViewHeader.swift index d102592..663b5b6 100644 --- a/CollapsibleTableSectionViewController/CollapsibleTableViewHeader.swift +++ b/CollapsibleTableSectionViewController/CollapsibleTableViewHeader.swift @@ -17,12 +17,10 @@ open class CollapsibleTableViewHeader: UITableViewHeaderFooterView { var delegate: CollapsibleTableViewHeaderDelegate? var section: Int = 0 - let titleLabel = UILabel() - let arrowLabel = UILabel() + open var titleLabel = UILabel() + open var arrowLabel = UILabel() - override public init(reuseIdentifier: String?) { - super.init(reuseIdentifier: reuseIdentifier) - + private func initCommon() { // Content View contentView.backgroundColor = UIColor(hex: 0x2E3944) @@ -36,7 +34,7 @@ open class CollapsibleTableViewHeader: UITableViewHeaderFooterView { arrowLabel.topAnchor.constraint(equalTo: marginGuide.topAnchor).isActive = true arrowLabel.trailingAnchor.constraint(equalTo: marginGuide.trailingAnchor).isActive = true arrowLabel.bottomAnchor.constraint(equalTo: marginGuide.bottomAnchor).isActive = true - + // Title label contentView.addSubview(titleLabel) titleLabel.textColor = UIColor.white @@ -52,8 +50,14 @@ open class CollapsibleTableViewHeader: UITableViewHeaderFooterView { addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(CollapsibleTableViewHeader.tapHeader(_:)))) } + override public init(reuseIdentifier: String?) { + super.init(reuseIdentifier: reuseIdentifier) + initCommon() + } + required public init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") + super.init(coder: aDecoder) + initCommon() } // diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj index 844e53c..7fd7f30 100644 --- a/Examples/Examples.xcodeproj/project.pbxproj +++ b/Examples/Examples.xcodeproj/project.pbxproj @@ -123,7 +123,6 @@ 0AC886D81F226627007E4E2F /* Frameworks */, 0AC886D91F226627007E4E2F /* Resources */, 2B98B17FB368C4831B7977E1 /* [CP] Embed Pods Frameworks */, - C16092C4A63026D0FCAD40F1 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -188,9 +187,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CollapsibleTableSectionViewController.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -203,28 +205,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Examples-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; - }; - C16092C4A63026D0FCAD40F1 /* [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-Examples/Pods-Examples-resources.sh\"\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 */ diff --git a/Examples/Examples.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/Examples.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Examples/Examples.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Examples/Examples/CustomCell.swift b/Examples/Examples/CustomCell.swift index ef7c011..45ee25d 100644 --- a/Examples/Examples/CustomCell.swift +++ b/Examples/Examples/CustomCell.swift @@ -13,10 +13,7 @@ class CustomCell: UITableViewCell { let nameLabel = UILabel() let detailLabel = UILabel() - // MARK: Initalizers - override init(style: UITableViewCellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - + func initCommon() { let marginGuide = contentView.layoutMarginsGuide // configure nameLabel @@ -41,8 +38,15 @@ class CustomCell: UITableViewCell { detailLabel.textColor = UIColor.lightGray } + // MARK: Initalizers + override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + initCommon() + } + required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") + super.init(coder: aDecoder) + initCommon() } } diff --git a/Examples/Examples/CustomCellExampleViewController.swift b/Examples/Examples/CustomCellExampleViewController.swift index 1fc7524..7b69f31 100644 --- a/Examples/Examples/CustomCellExampleViewController.swift +++ b/Examples/Examples/CustomCellExampleViewController.swift @@ -47,4 +47,14 @@ extension CustomCellExampleViewController: CollapsibleTableSectionDelegate { return sections[section].name } + func collapsibleTableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "header") as? CollapsibleTableViewHeader ?? + CollapsibleTableViewHeader(reuseIdentifier: "header") + headerView.titleLabel.text = self.collapsibleTableView(tableView, titleForHeaderInSection: section) + headerView.titleLabel.textColor = .lightGray + headerView.contentView.backgroundColor = .darkGray + + return headerView + } + } diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock index be7cbcf..3cbdbc3 100644 --- a/Examples/Podfile.lock +++ b/Examples/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - CollapsibleTableSectionViewController (0.0.7) + - CollapsibleTableSectionViewController (1.0.1) DEPENDENCIES: - CollapsibleTableSectionViewController (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - CollapsibleTableSectionViewController: b56d6bd81f75dc1fd17ca3fb64b40b465f95586d + CollapsibleTableSectionViewController: 608df3a782355facc44e4ab140157d3afe191fb2 PODFILE CHECKSUM: b149b5d80e25f3d625e94e3d09cdfbe5a437add7 -COCOAPODS: 1.2.1 +COCOAPODS: 1.5.3 diff --git a/Examples/Pods/Local Podspecs/CollapsibleTableSectionViewController.podspec.json b/Examples/Pods/Local Podspecs/CollapsibleTableSectionViewController.podspec.json index 542a9df..39645c7 100644 --- a/Examples/Pods/Local Podspecs/CollapsibleTableSectionViewController.podspec.json +++ b/Examples/Pods/Local Podspecs/CollapsibleTableSectionViewController.podspec.json @@ -1,6 +1,6 @@ { "name": "CollapsibleTableSectionViewController", - "version": "0.0.7", + "version": "1.0.1", "summary": "Swift 3.0 library to support collapsible sections in a table view.", "description": "This CocoaPod provides the ability to easily setup a UITableView with\ncollapsible sections. This project is written purely in Swift 3.0.", "homepage": "https://github.com/jeantimex/CollapsibleTableSectionViewController", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/jeantimex/CollapsibleTableSectionViewController.git", - "tag": "0.0.7" + "tag": "1.0.1" }, "source_files": "CollapsibleTableSectionViewController/*.{swift}", "exclude_files": "CollapsibleTableSectionViewController/Exclude", diff --git a/Examples/Pods/Manifest.lock b/Examples/Pods/Manifest.lock index be7cbcf..3cbdbc3 100644 --- a/Examples/Pods/Manifest.lock +++ b/Examples/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - CollapsibleTableSectionViewController (0.0.7) + - CollapsibleTableSectionViewController (1.0.1) DEPENDENCIES: - CollapsibleTableSectionViewController (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - CollapsibleTableSectionViewController: b56d6bd81f75dc1fd17ca3fb64b40b465f95586d + CollapsibleTableSectionViewController: 608df3a782355facc44e4ab140157d3afe191fb2 PODFILE CHECKSUM: b149b5d80e25f3d625e94e3d09cdfbe5a437add7 -COCOAPODS: 1.2.1 +COCOAPODS: 1.5.3 diff --git a/Examples/Pods/Pods.xcodeproj/project.pbxproj b/Examples/Pods/Pods.xcodeproj/project.pbxproj index a650c11..a2cfcf0 100644 --- a/Examples/Pods/Pods.xcodeproj/project.pbxproj +++ b/Examples/Pods/Pods.xcodeproj/project.pbxproj @@ -7,159 +7,171 @@ objects = { /* Begin PBXBuildFile section */ - 2A0CF1B8B3FEC30AFC260E9C3A58C5E6 /* Pods-Examples-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CC67987DCD20B0E11FEC64AD36A08104 /* Pods-Examples-dummy.m */; }; - 2D806E212B56004C3150EA8C52215BB3 /* CollapsibleTableSectionViewController-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D9CA44F239A02B1465B499499E983902 /* CollapsibleTableSectionViewController-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 602B980C71B2A6F1E89E455C1F3321E3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */; }; - 9E03D9F54A8E79D56E36F119405B6658 /* CollapsibleTableSectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40901DD0329B0CD99DA5643235F7FC6D /* CollapsibleTableSectionViewController.swift */; }; - 9E0A0E7BCCE32BC40C44496BC60C0DE8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */; }; - B0C10DAB4AB5381E07911DE2296C2503 /* CollapsibleTableSectionViewController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DE26838C539E2AD6AC2B44FB718E805B /* CollapsibleTableSectionViewController-dummy.m */; }; - E1A5AE58934AA54E3BEBF79570E4AF22 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */; }; - EA86E580D4690310E09D0360A99B38A0 /* Pods-Examples-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF476AA8B123161C7E43AA19423F34A0 /* Pods-Examples-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EDBD94203929E71E34AA07E2ED8D507C /* CollapsibleTableViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED81EBDB5C5865A9E06E1CC68B333E40 /* CollapsibleTableViewHeader.swift */; }; + 1286544254D0CAE9C7BA5E9F1771522C /* Pods-Examples-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 708CE1D611334D20D20054A47B165A45 /* Pods-Examples-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 59736F516C17B52ECBB78493F86D7292 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 908E902E026C5C22904CF9014A5604AD /* Foundation.framework */; }; + 5AC974D6D5F0B72FCC82BB3FF4595E75 /* CollapsibleTableViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCAA6E671C703951F9F9CD9F8DFBE2C /* CollapsibleTableViewHeader.swift */; }; + 5BFFB88A2D3D2AD05CEA92D4596889AB /* CollapsibleTableSectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32D342C4D77B9A698F19E480C7302F2C /* CollapsibleTableSectionViewController.swift */; }; + 69B52F37C8B9049929A45543B5C3D399 /* CollapsibleTableSectionViewController-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 111DC45B5FD20BF05C148331AE06E860 /* CollapsibleTableSectionViewController-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7C7F05217E6A89973686FEB4DF5DCB32 /* CollapsibleTableSectionViewController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 775DA30F8DFCC5C8BE00EF8258601B30 /* CollapsibleTableSectionViewController-dummy.m */; }; + 9FD89EFAA07371D4A39A7384D6847FBF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 908E902E026C5C22904CF9014A5604AD /* Foundation.framework */; }; + B278194E3C79DEBDC4E78219A109DB2B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC2C02191C153C1554B35DEE8B2D09D4 /* UIKit.framework */; }; + FDDDA2950835C2D0B7B340E999499BDD /* Pods-Examples-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 088CE4DEBD5AFD36D1D4293911018293 /* Pods-Examples-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 45B2F42772F2A52884AD44D10B58C10F /* PBXContainerItemProxy */ = { + B9881B016FCAFCA67AAA0BD4E4667120 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 59580D95E1D0F2CC301DC5FEC580ADF5; + remoteGlobalIDString = F2D5C1B3DC0C9435311859AC86278559; remoteInfo = CollapsibleTableSectionViewController; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 07C2661B06471E1EF6BB20457DEA2205 /* CollapsibleTableSectionViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CollapsibleTableSectionViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 212992D9667EAD3AF415D69AA72A8C39 /* Pods-Examples-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Examples-acknowledgements.plist"; sourceTree = ""; }; - 22BDD4A2B125783DF7E90BDA7A748BA9 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2B038BDA4A2DE18B6392A8EB939D461B /* Pods-Examples-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Examples-acknowledgements.markdown"; sourceTree = ""; }; - 40901DD0329B0CD99DA5643235F7FC6D /* CollapsibleTableSectionViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CollapsibleTableSectionViewController.swift; sourceTree = ""; }; - 4B5D175174FED0D211005E28DCCB9A59 /* Pods-Examples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Examples.debug.xcconfig"; sourceTree = ""; }; - 5B01107EB1B9BD80E1F283B8EE931EB1 /* Pods-Examples-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Examples-frameworks.sh"; sourceTree = ""; }; - 75F9D2EC38E545C2FACA3821912CB964 /* CollapsibleTableSectionViewController.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = CollapsibleTableSectionViewController.modulemap; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - A4286613166589E2719A2DB5F24F4D3F /* Pods-Examples-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Examples-resources.sh"; sourceTree = ""; }; - A9CAD72ABED699BF6E5726387A50E8F7 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AEA989834329C60EEEF30AF4F9BC718F /* Pods-Examples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Examples.release.xcconfig"; sourceTree = ""; }; - B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - BDD3EE2F75942A736C0F76B03D159F83 /* CollapsibleTableSectionViewController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CollapsibleTableSectionViewController.xcconfig; sourceTree = ""; }; - C7A65E463F26A4A1237CAD57F81FB3F3 /* Pods_Examples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Examples.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - CC67987DCD20B0E11FEC64AD36A08104 /* Pods-Examples-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Examples-dummy.m"; sourceTree = ""; }; - CF476AA8B123161C7E43AA19423F34A0 /* Pods-Examples-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Examples-umbrella.h"; sourceTree = ""; }; - D88AAE1F92055A60CC2FC970D7D34634 /* 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; }; - D9CA44F239A02B1465B499499E983902 /* CollapsibleTableSectionViewController-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CollapsibleTableSectionViewController-umbrella.h"; sourceTree = ""; }; - DE26838C539E2AD6AC2B44FB718E805B /* CollapsibleTableSectionViewController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CollapsibleTableSectionViewController-dummy.m"; sourceTree = ""; }; - DFC10EBCF2BB0F855B7753C3B621D319 /* CollapsibleTableSectionViewController-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CollapsibleTableSectionViewController-prefix.pch"; sourceTree = ""; }; - E329317942600C29B668F24E5DFE7E93 /* Pods-Examples.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Examples.modulemap"; sourceTree = ""; }; - ED81EBDB5C5865A9E06E1CC68B333E40 /* CollapsibleTableViewHeader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CollapsibleTableViewHeader.swift; sourceTree = ""; }; + 07C2661B06471E1EF6BB20457DEA2205 /* CollapsibleTableSectionViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CollapsibleTableSectionViewController.framework; path = CollapsibleTableSectionViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 088CE4DEBD5AFD36D1D4293911018293 /* Pods-Examples-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Examples-dummy.m"; sourceTree = ""; }; + 0E85C4F4BE728F6D81B641C896B26881 /* Pods-Examples-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Examples-acknowledgements.markdown"; sourceTree = ""; }; + 111DC45B5FD20BF05C148331AE06E860 /* CollapsibleTableSectionViewController-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CollapsibleTableSectionViewController-umbrella.h"; sourceTree = ""; }; + 14B1F560F71F7318CE93DA402207C4A6 /* CollapsibleTableSectionViewController-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CollapsibleTableSectionViewController-prefix.pch"; sourceTree = ""; }; + 1FCAA6E671C703951F9F9CD9F8DFBE2C /* CollapsibleTableViewHeader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CollapsibleTableViewHeader.swift; path = CollapsibleTableSectionViewController/CollapsibleTableViewHeader.swift; sourceTree = ""; }; + 23DDC2117ADBDBEA3983436B4D327BF7 /* Pods-Examples.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Examples.modulemap"; sourceTree = ""; }; + 25D24A4923125F0787F9AC31237C307D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 32D342C4D77B9A698F19E480C7302F2C /* CollapsibleTableSectionViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CollapsibleTableSectionViewController.swift; path = CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.swift; sourceTree = ""; }; + 3BB6BAB5F29420DAA5309332369F2967 /* cover-static.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = "cover-static.png"; path = "docs/images/cover-static.png"; sourceTree = ""; }; + 46F8A3D3F0984D3DA8E7A4D3DED400CC /* Pods-Examples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Examples.debug.xcconfig"; sourceTree = ""; }; + 526C87AAE61AF7D56D0A31C47144DFD0 /* Pods-Examples-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Examples-frameworks.sh"; sourceTree = ""; }; + 5A9352DA421ECA500F201990AEAD8223 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + 708CE1D611334D20D20054A47B165A45 /* Pods-Examples-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Examples-umbrella.h"; sourceTree = ""; }; + 775DA30F8DFCC5C8BE00EF8258601B30 /* CollapsibleTableSectionViewController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CollapsibleTableSectionViewController-dummy.m"; sourceTree = ""; }; + 792DE662D1755A3DEE82B8DCEA0A3A37 /* CollapsibleTableSectionViewController.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = CollapsibleTableSectionViewController.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 7C897361360FCD6C1A86A494B6785833 /* CollapsibleTableSectionViewController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CollapsibleTableSectionViewController.xcconfig; sourceTree = ""; }; + 908E902E026C5C22904CF9014A5604AD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + A406BF30564367A16E99E942E8963FD6 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B1FB8612BC577D3F77B698722906DE03 /* Pods-Examples-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Examples-acknowledgements.plist"; sourceTree = ""; }; + BC2C02191C153C1554B35DEE8B2D09D4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + C7A65E463F26A4A1237CAD57F81FB3F3 /* Pods_Examples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Examples.framework; path = "Pods-Examples.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + C872153C1DBBB645D10776EE1A47A445 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + DD4D1E3AFD802BF8F7580C35AF94D1BB /* Pods-Examples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Examples.release.xcconfig"; sourceTree = ""; }; + E5D108E1B04478F957CBAA08E5B094DE /* CollapsibleTableSectionViewController.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = CollapsibleTableSectionViewController.modulemap; sourceTree = ""; }; + EC461691A22FF7DB4A1FB4F7A7487EA4 /* Pods-Examples-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Examples-resources.sh"; sourceTree = ""; }; + F35AB2C8D6CD35EB7099273446B2023C /* jeantimex-logo.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = "jeantimex-logo.png"; path = "docs/images/jeantimex-logo.png"; sourceTree = ""; }; + F5ED62390E8118304049E733A8DDAB29 /* cover.gif */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.gif; name = cover.gif; path = docs/images/cover.gif; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 90F485364DBB9AAEBB3094893D5D7343 /* Frameworks */ = { + 1373784678DAEF0608B4ABF1F5160AC6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E1A5AE58934AA54E3BEBF79570E4AF22 /* Foundation.framework in Frameworks */, + 9FD89EFAA07371D4A39A7384D6847FBF /* Foundation.framework in Frameworks */, + B278194E3C79DEBDC4E78219A109DB2B /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - CB249CC43CC20AD8293856A565BDACC6 /* Frameworks */ = { + 273A49FF11ADFA5C3F98C46CAD141F38 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9E0A0E7BCCE32BC40C44496BC60C0DE8 /* Foundation.framework in Frameworks */, - 602B980C71B2A6F1E89E455C1F3321E3 /* UIKit.framework in Frameworks */, + 59736F516C17B52ECBB78493F86D7292 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2483E1BCAF92676B2A1253373DA1BEBA /* Development Pods */ = { + 10DEDCB394BAA0C7FEDEBE330207B074 /* iOS */ = { isa = PBXGroup; children = ( - 940F8743A46EB46E121561B6B33BDF99 /* CollapsibleTableSectionViewController */, + 908E902E026C5C22904CF9014A5604AD /* Foundation.framework */, + BC2C02191C153C1554B35DEE8B2D09D4 /* UIKit.framework */, ); - name = "Development Pods"; + name = iOS; sourceTree = ""; }; - 356E0D42B01364958C36CF1518750B2E /* Support Files */ = { + 2BE154C4D0BF4B1F8648C7B5D87586AF /* Pods-Examples */ = { isa = PBXGroup; children = ( - 75F9D2EC38E545C2FACA3821912CB964 /* CollapsibleTableSectionViewController.modulemap */, - BDD3EE2F75942A736C0F76B03D159F83 /* CollapsibleTableSectionViewController.xcconfig */, - DE26838C539E2AD6AC2B44FB718E805B /* CollapsibleTableSectionViewController-dummy.m */, - DFC10EBCF2BB0F855B7753C3B621D319 /* CollapsibleTableSectionViewController-prefix.pch */, - D9CA44F239A02B1465B499499E983902 /* CollapsibleTableSectionViewController-umbrella.h */, - 22BDD4A2B125783DF7E90BDA7A748BA9 /* Info.plist */, + 25D24A4923125F0787F9AC31237C307D /* Info.plist */, + 23DDC2117ADBDBEA3983436B4D327BF7 /* Pods-Examples.modulemap */, + 0E85C4F4BE728F6D81B641C896B26881 /* Pods-Examples-acknowledgements.markdown */, + B1FB8612BC577D3F77B698722906DE03 /* Pods-Examples-acknowledgements.plist */, + 088CE4DEBD5AFD36D1D4293911018293 /* Pods-Examples-dummy.m */, + 526C87AAE61AF7D56D0A31C47144DFD0 /* Pods-Examples-frameworks.sh */, + EC461691A22FF7DB4A1FB4F7A7487EA4 /* Pods-Examples-resources.sh */, + 708CE1D611334D20D20054A47B165A45 /* Pods-Examples-umbrella.h */, + 46F8A3D3F0984D3DA8E7A4D3DED400CC /* Pods-Examples.debug.xcconfig */, + DD4D1E3AFD802BF8F7580C35AF94D1BB /* Pods-Examples.release.xcconfig */, ); - name = "Support Files"; - path = "Examples/Pods/Target Support Files/CollapsibleTableSectionViewController"; + name = "Pods-Examples"; + path = "Target Support Files/Pods-Examples"; sourceTree = ""; }; 433CD3331B6C3787F473C941B61FC68F /* Frameworks */ = { isa = PBXGroup; children = ( - 438B396F6B4147076630CAEFE34282C1 /* iOS */, + 10DEDCB394BAA0C7FEDEBE330207B074 /* iOS */, ); name = Frameworks; sourceTree = ""; }; - 438B396F6B4147076630CAEFE34282C1 /* iOS */ = { - isa = PBXGroup; - children = ( - D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */, - B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */, - ); - name = iOS; - sourceTree = ""; - }; - 6B333696FCF08235E417336B6A77B269 /* Pods-Examples */ = { + 4D4D6B70A7DDC526B82B9736D84A33F4 /* Support Files */ = { isa = PBXGroup; children = ( - A9CAD72ABED699BF6E5726387A50E8F7 /* Info.plist */, - E329317942600C29B668F24E5DFE7E93 /* Pods-Examples.modulemap */, - 2B038BDA4A2DE18B6392A8EB939D461B /* Pods-Examples-acknowledgements.markdown */, - 212992D9667EAD3AF415D69AA72A8C39 /* Pods-Examples-acknowledgements.plist */, - CC67987DCD20B0E11FEC64AD36A08104 /* Pods-Examples-dummy.m */, - 5B01107EB1B9BD80E1F283B8EE931EB1 /* Pods-Examples-frameworks.sh */, - A4286613166589E2719A2DB5F24F4D3F /* Pods-Examples-resources.sh */, - CF476AA8B123161C7E43AA19423F34A0 /* Pods-Examples-umbrella.h */, - 4B5D175174FED0D211005E28DCCB9A59 /* Pods-Examples.debug.xcconfig */, - AEA989834329C60EEEF30AF4F9BC718F /* Pods-Examples.release.xcconfig */, + E5D108E1B04478F957CBAA08E5B094DE /* CollapsibleTableSectionViewController.modulemap */, + 7C897361360FCD6C1A86A494B6785833 /* CollapsibleTableSectionViewController.xcconfig */, + 775DA30F8DFCC5C8BE00EF8258601B30 /* CollapsibleTableSectionViewController-dummy.m */, + 14B1F560F71F7318CE93DA402207C4A6 /* CollapsibleTableSectionViewController-prefix.pch */, + 111DC45B5FD20BF05C148331AE06E860 /* CollapsibleTableSectionViewController-umbrella.h */, + A406BF30564367A16E99E942E8963FD6 /* Info.plist */, ); - name = "Pods-Examples"; - path = "Target Support Files/Pods-Examples"; + name = "Support Files"; + path = "Examples/Pods/Target Support Files/CollapsibleTableSectionViewController"; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 2483E1BCAF92676B2A1253373DA1BEBA /* Development Pods */, + C63414DD2543CCBE700C36138623F6B0 /* Development Pods */, 433CD3331B6C3787F473C941B61FC68F /* Frameworks */, EAEB2EAEF75D8F895DCE7B12A788B00D /* Products */, F872D0250D61C30260F42D978EB4C3C0 /* Targets Support Files */, ); sourceTree = ""; }; - 940F8743A46EB46E121561B6B33BDF99 /* CollapsibleTableSectionViewController */ = { + BDCC6E75D719C7DFDD61F1F203EF231D /* CollapsibleTableSectionViewController */ = { isa = PBXGroup; children = ( - C543904CC5E41E56C6A9B0E1839DC1FB /* CollapsibleTableSectionViewController */, - 356E0D42B01364958C36CF1518750B2E /* Support Files */, + 32D342C4D77B9A698F19E480C7302F2C /* CollapsibleTableSectionViewController.swift */, + 1FCAA6E671C703951F9F9CD9F8DFBE2C /* CollapsibleTableViewHeader.swift */, + D8F2CB2BADF3A5E3129C6876D43D68B8 /* Pod */, + 4D4D6B70A7DDC526B82B9736D84A33F4 /* Support Files */, ); name = CollapsibleTableSectionViewController; path = ../..; sourceTree = ""; }; - C543904CC5E41E56C6A9B0E1839DC1FB /* CollapsibleTableSectionViewController */ = { + C63414DD2543CCBE700C36138623F6B0 /* Development Pods */ = { + isa = PBXGroup; + children = ( + BDCC6E75D719C7DFDD61F1F203EF231D /* CollapsibleTableSectionViewController */, + ); + name = "Development Pods"; + sourceTree = ""; + }; + D8F2CB2BADF3A5E3129C6876D43D68B8 /* Pod */ = { isa = PBXGroup; children = ( - 40901DD0329B0CD99DA5643235F7FC6D /* CollapsibleTableSectionViewController.swift */, - ED81EBDB5C5865A9E06E1CC68B333E40 /* CollapsibleTableViewHeader.swift */, + 792DE662D1755A3DEE82B8DCEA0A3A37 /* CollapsibleTableSectionViewController.podspec */, + F5ED62390E8118304049E733A8DDAB29 /* cover.gif */, + 3BB6BAB5F29420DAA5309332369F2967 /* cover-static.png */, + F35AB2C8D6CD35EB7099273446B2023C /* jeantimex-logo.png */, + 5A9352DA421ECA500F201990AEAD8223 /* LICENSE */, + C872153C1DBBB645D10776EE1A47A445 /* README.md */, ); - path = CollapsibleTableSectionViewController; + name = Pod; sourceTree = ""; }; EAEB2EAEF75D8F895DCE7B12A788B00D /* Products */ = { @@ -174,7 +186,7 @@ F872D0250D61C30260F42D978EB4C3C0 /* Targets Support Files */ = { isa = PBXGroup; children = ( - 6B333696FCF08235E417336B6A77B269 /* Pods-Examples */, + 2BE154C4D0BF4B1F8648C7B5D87586AF /* Pods-Examples */, ); name = "Targets Support Files"; sourceTree = ""; @@ -182,58 +194,60 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - DA95C10EC50DA26E6A4CEE552E640CC8 /* Headers */ = { + 836332C6D167CB1B07BB018938C7459C /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 2D806E212B56004C3150EA8C52215BB3 /* CollapsibleTableSectionViewController-umbrella.h in Headers */, + 69B52F37C8B9049929A45543B5C3D399 /* CollapsibleTableSectionViewController-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - F31BBED61CACC4E1C7D7A3811F1DB2B8 /* Headers */ = { + DD354A9DDB053B43C0AA3A405090ABFA /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - EA86E580D4690310E09D0360A99B38A0 /* Pods-Examples-umbrella.h in Headers */, + 1286544254D0CAE9C7BA5E9F1771522C /* Pods-Examples-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 59580D95E1D0F2CC301DC5FEC580ADF5 /* CollapsibleTableSectionViewController */ = { + CE75DB23E09E8236A87E574145CBAC2C /* Pods-Examples */ = { isa = PBXNativeTarget; - buildConfigurationList = 418D6C867D46E83AA9B0F6707114DD88 /* Build configuration list for PBXNativeTarget "CollapsibleTableSectionViewController" */; + buildConfigurationList = BDD109F3C4BA6D072250FC90DC545BD9 /* Build configuration list for PBXNativeTarget "Pods-Examples" */; buildPhases = ( - 301FF70EBE26FFDAA33CEA2C2E0AE857 /* Sources */, - CB249CC43CC20AD8293856A565BDACC6 /* Frameworks */, - DA95C10EC50DA26E6A4CEE552E640CC8 /* Headers */, + DD354A9DDB053B43C0AA3A405090ABFA /* Headers */, + 36E3FE0880964AF90CB35A1FF678BE60 /* Sources */, + 273A49FF11ADFA5C3F98C46CAD141F38 /* Frameworks */, + 90D5CBDF8F15E4BF34864BFC26ACA8BD /* Resources */, ); buildRules = ( ); dependencies = ( + F55CEB0F4597BD2C011ECFF1BE129794 /* PBXTargetDependency */, ); - name = CollapsibleTableSectionViewController; - productName = CollapsibleTableSectionViewController; - productReference = 07C2661B06471E1EF6BB20457DEA2205 /* CollapsibleTableSectionViewController.framework */; + name = "Pods-Examples"; + productName = "Pods-Examples"; + productReference = C7A65E463F26A4A1237CAD57F81FB3F3 /* Pods_Examples.framework */; productType = "com.apple.product-type.framework"; }; - E503F9B5700392F58286A38FF5B7A60B /* Pods-Examples */ = { + F2D5C1B3DC0C9435311859AC86278559 /* CollapsibleTableSectionViewController */ = { isa = PBXNativeTarget; - buildConfigurationList = 75E7FD0BB0924D9AC8DE424C54E79A54 /* Build configuration list for PBXNativeTarget "Pods-Examples" */; + buildConfigurationList = C1795CB42704813DE3925004DBAD0658 /* Build configuration list for PBXNativeTarget "CollapsibleTableSectionViewController" */; buildPhases = ( - DACB13FDE1ECF9A9B2F7F162F7F831FC /* Sources */, - 90F485364DBB9AAEBB3094893D5D7343 /* Frameworks */, - F31BBED61CACC4E1C7D7A3811F1DB2B8 /* Headers */, + 836332C6D167CB1B07BB018938C7459C /* Headers */, + E688E31B84D670C785B2AE6F6CCE301A /* Sources */, + 1373784678DAEF0608B4ABF1F5160AC6 /* Frameworks */, + 9A8765CC77AD8CE1C972A14E1C56A772 /* Resources */, ); buildRules = ( ); dependencies = ( - 81A204A50E7B5E2DD2DCB7FF127F366E /* PBXTargetDependency */, ); - name = "Pods-Examples"; - productName = "Pods-Examples"; - productReference = C7A65E463F26A4A1237CAD57F81FB3F3 /* Pods_Examples.framework */; + name = CollapsibleTableSectionViewController; + productName = CollapsibleTableSectionViewController; + productReference = 07C2661B06471E1EF6BB20457DEA2205 /* CollapsibleTableSectionViewController.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -242,8 +256,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -257,229 +271,312 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 59580D95E1D0F2CC301DC5FEC580ADF5 /* CollapsibleTableSectionViewController */, - E503F9B5700392F58286A38FF5B7A60B /* Pods-Examples */, + F2D5C1B3DC0C9435311859AC86278559 /* CollapsibleTableSectionViewController */, + CE75DB23E09E8236A87E574145CBAC2C /* Pods-Examples */, ); }; /* End PBXProject section */ +/* Begin PBXResourcesBuildPhase section */ + 90D5CBDF8F15E4BF34864BFC26ACA8BD /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9A8765CC77AD8CE1C972A14E1C56A772 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ - 301FF70EBE26FFDAA33CEA2C2E0AE857 /* Sources */ = { + 36E3FE0880964AF90CB35A1FF678BE60 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B0C10DAB4AB5381E07911DE2296C2503 /* CollapsibleTableSectionViewController-dummy.m in Sources */, - 9E03D9F54A8E79D56E36F119405B6658 /* CollapsibleTableSectionViewController.swift in Sources */, - EDBD94203929E71E34AA07E2ED8D507C /* CollapsibleTableViewHeader.swift in Sources */, + FDDDA2950835C2D0B7B340E999499BDD /* Pods-Examples-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - DACB13FDE1ECF9A9B2F7F162F7F831FC /* Sources */ = { + E688E31B84D670C785B2AE6F6CCE301A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2A0CF1B8B3FEC30AFC260E9C3A58C5E6 /* Pods-Examples-dummy.m in Sources */, + 7C7F05217E6A89973686FEB4DF5DCB32 /* CollapsibleTableSectionViewController-dummy.m in Sources */, + 5BFFB88A2D3D2AD05CEA92D4596889AB /* CollapsibleTableSectionViewController.swift in Sources */, + 5AC974D6D5F0B72FCC82BB3FF4595E75 /* CollapsibleTableViewHeader.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 81A204A50E7B5E2DD2DCB7FF127F366E /* PBXTargetDependency */ = { + F55CEB0F4597BD2C011ECFF1BE129794 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = CollapsibleTableSectionViewController; - target = 59580D95E1D0F2CC301DC5FEC580ADF5 /* CollapsibleTableSectionViewController */; - targetProxy = 45B2F42772F2A52884AD44D10B58C10F /* PBXContainerItemProxy */; + target = F2D5C1B3DC0C9435311859AC86278559 /* CollapsibleTableSectionViewController */; + targetProxy = B9881B016FCAFCA67AAA0BD4E4667120 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 4E487F173E6C9664F4E9E26B9635D23C /* Debug */ = { + 1CE3BE3CD39C69297D8937AFD550D948 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DD4D1E3AFD802BF8F7580C35AF94D1BB /* Pods-Examples.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + 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"; + INFOPLIST_FILE = "Target Support Files/Pods-Examples/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + 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-Examples/Pods-Examples.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_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 60DAF49CA7A9F362148D49C3C3123B2A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = 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_OBJC_ROOT_CLASS = 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; + 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; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", "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 = 9.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = 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; }; - 61F346941741E4D1FDEC0C772CCF2344 /* Debug */ = { + A82AA0167A6E3B3FAB41091CBBD27E26 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4B5D175174FED0D211005E28DCCB9A59 /* Pods-Examples.debug.xcconfig */; + baseConfigurationReference = 46F8A3D3F0984D3DA8E7A4D3DED400CC /* Pods-Examples.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = 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-Examples/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-Examples/Pods-Examples.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_Examples; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 9042C93C8BF14F256BC56C301A1A93E7 /* Release */ = { + C4EAA84F44D044E108500A81C635F21E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD3EE2F75942A736C0F76B03D159F83 /* CollapsibleTableSectionViewController.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = ""; - "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; - GCC_PREFIX_HEADER = "Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/CollapsibleTableSectionViewController/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + 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; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = CollapsibleTableSectionViewController; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; }; name = Release; }; - 914D294767F70AD3C33B74FAF48AD1E4 /* Release */ = { + CB4DD1C696CEBF551086C2034A00FB48 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AEA989834329C60EEEF30AF4F9BC718F /* Pods-Examples.release.xcconfig */; + baseConfigurationReference = 7C897361360FCD6C1A86A494B6785833 /* CollapsibleTableSectionViewController.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-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; - INFOPLIST_FILE = "Target Support Files/Pods-Examples/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/CollapsibleTableSectionViewController/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-Examples/Pods-Examples.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_Examples; + MODULEMAP_FILE = "Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.modulemap"; + PRODUCT_MODULE_NAME = CollapsibleTableSectionViewController; + PRODUCT_NAME = CollapsibleTableSectionViewController; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - A4695EAFCEA497F9DF69702C0A462F49 /* Debug */ = { + E68FC064A4986C8CED212021FB31780B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD3EE2F75942A736C0F76B03D159F83 /* CollapsibleTableSectionViewController.xcconfig */; + baseConfigurationReference = 7C897361360FCD6C1A86A494B6785833 /* CollapsibleTableSectionViewController.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/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController-prefix.pch"; INFOPLIST_FILE = "Target Support Files/CollapsibleTableSectionViewController/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/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_MODULE_NAME = CollapsibleTableSectionViewController; PRODUCT_NAME = CollapsibleTableSectionViewController; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -488,76 +585,32 @@ }; name = Debug; }; - BDD0139D6EB93FA375F887ABD62DAB2E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - 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_OBJC_ROOT_CLASS = 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; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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 = 9.0; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 4E487F173E6C9664F4E9E26B9635D23C /* Debug */, - BDD0139D6EB93FA375F887ABD62DAB2E /* Release */, + 60DAF49CA7A9F362148D49C3C3123B2A /* Debug */, + C4EAA84F44D044E108500A81C635F21E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 418D6C867D46E83AA9B0F6707114DD88 /* Build configuration list for PBXNativeTarget "CollapsibleTableSectionViewController" */ = { + BDD109F3C4BA6D072250FC90DC545BD9 /* Build configuration list for PBXNativeTarget "Pods-Examples" */ = { isa = XCConfigurationList; buildConfigurations = ( - A4695EAFCEA497F9DF69702C0A462F49 /* Debug */, - 9042C93C8BF14F256BC56C301A1A93E7 /* Release */, + A82AA0167A6E3B3FAB41091CBBD27E26 /* Debug */, + 1CE3BE3CD39C69297D8937AFD550D948 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 75E7FD0BB0924D9AC8DE424C54E79A54 /* Build configuration list for PBXNativeTarget "Pods-Examples" */ = { + C1795CB42704813DE3925004DBAD0658 /* Build configuration list for PBXNativeTarget "CollapsibleTableSectionViewController" */ = { isa = XCConfigurationList; buildConfigurations = ( - 61F346941741E4D1FDEC0C772CCF2344 /* Debug */, - 914D294767F70AD3C33B74FAF48AD1E4 /* Release */, + E68FC064A4986C8CED212021FB31780B /* Debug */, + CB4DD1C696CEBF551086C2034A00FB48 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.xcconfig b/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.xcconfig index 6fc82b0..a559756 100644 --- a/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.xcconfig +++ b/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.xcconfig @@ -1,10 +1,9 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/CollapsibleTableSectionViewController +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CollapsibleTableSectionViewController GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" 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/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/Info.plist b/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/Info.plist index 294cbb9..3c175b6 100644 --- a/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/Info.plist +++ b/Examples/Pods/Target Support Files/CollapsibleTableSectionViewController/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.0.7 + 1.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.markdown b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.markdown index 7aeb31f..ae193fe 100644 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.markdown +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.markdown @@ -5,7 +5,7 @@ This application makes use of the following third party libraries: MIT License -Copyright (c) 2017 Su +Copyright (c) 2017 Yong Su @jeantimex Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.plist b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.plist index 84f8b68..c693232 100644 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.plist +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-acknowledgements.plist @@ -16,7 +16,7 @@ FooterText MIT License -Copyright (c) 2017 Su +Copyright (c) 2017 Yong Su @jeantimex Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh index 34f23b0..6ee177c 100755 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-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/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework" + install_framework "${BUILT_PRODUCTS_DIR}/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework" + install_framework "${BUILT_PRODUCTS_DIR}/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-resources.sh b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-resources.sh index aed060f..345301f 100755 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-resources.sh +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples-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" ;; @@ -44,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) @@ -74,7 +86,7 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac @@ -88,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) @@ -98,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/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.debug.xcconfig b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.debug.xcconfig index 5bbc54d..d025939 100644 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.debug.xcconfig +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.debug.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CollapsibleTableSectionViewController" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CollapsibleTableSectionViewController" 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/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CollapsibleTableSectionViewController" 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/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.release.xcconfig b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.release.xcconfig index 5bbc54d..d025939 100644 --- a/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.release.xcconfig +++ b/Examples/Pods/Target Support Files/Pods-Examples/Pods-Examples.release.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CollapsibleTableSectionViewController" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CollapsibleTableSectionViewController" 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/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CollapsibleTableSectionViewController/CollapsibleTableSectionViewController.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CollapsibleTableSectionViewController" 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