From 6f3daa337b71e500189ca9499d3a9b0b78f5abdc Mon Sep 17 00:00:00 2001 From: Max Sokolov Date: Mon, 13 Jun 2016 13:51:02 +0300 Subject: [PATCH] support Swift Package Manager --- TableKit/Info.plist => Configs/TableKit.plist | 0 .../Info.plist => Configs/TableKitTests.plist | 0 .../Classes/Application/AppDelegate.swift | 0 .../Controllers/HeaderFooterController.swift | 0 .../Controllers/MainController.swift | 0 .../Views/StoryboardImageTableViewCell.swift | 0 .../Views/StoryboardTableViewCell.swift | 0 .../AppIcon.appiconset/Contents.json | 0 {TableKitDemo => Demo}/Resources/Info.plist | 0 .../Storyboards/LaunchScreen.storyboard | 0 .../Resources/Storyboards/Main.storyboard | 0 .../TableKitDemo.xcodeproj/project.pbxproj | 91 +++++++- .../contents.xcworkspacedata | 0 Package.swift | 5 + {TableKit => Sources}/ConfigurableCell.swift | 0 {TableKit => Sources}/HeightStrategy.swift | 0 {TableKit => Sources}/Operators.swift | 0 {TableKit => Sources}/TableCellAction.swift | 0 {TableKit => Sources}/TableDirector.swift | 0 {TableKit => Sources}/TableRow.swift | 0 {TableKit => Sources}/TableRowAction.swift | 0 {TableKit => Sources}/TableRowBuilder.swift | 2 + {TableKit => Sources}/TableSection.swift | 0 TableKit.podspec | 4 +- .../project.pbxproj | 210 +++++++++++++----- .../contents.xcworkspacedata | 7 + .../xcshareddata/xcschemes/TableKit.xcscheme | 0 TableKit.xcworkspace/contents.xcworkspacedata | 10 - TableKit/TableKit.h | 19 -- ...{TabletTests.swift => TableKitTests.swift} | 6 +- 30 files changed, 264 insertions(+), 90 deletions(-) rename TableKit/Info.plist => Configs/TableKit.plist (100%) rename Tests/Info.plist => Configs/TableKitTests.plist (100%) rename {TableKitDemo => Demo}/Classes/Application/AppDelegate.swift (100%) rename {TableKitDemo => Demo}/Classes/Presentation/Controllers/HeaderFooterController.swift (100%) rename {TableKitDemo => Demo}/Classes/Presentation/Controllers/MainController.swift (100%) rename {TableKitDemo => Demo}/Classes/Presentation/Views/StoryboardImageTableViewCell.swift (100%) rename {TableKitDemo => Demo}/Classes/Presentation/Views/StoryboardTableViewCell.swift (100%) rename {TableKitDemo => Demo}/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {TableKitDemo => Demo}/Resources/Info.plist (100%) rename {TableKitDemo => Demo}/Resources/Storyboards/LaunchScreen.storyboard (100%) rename {TableKitDemo => Demo}/Resources/Storyboards/Main.storyboard (100%) rename {TableKitDemo => Demo}/TableKitDemo.xcodeproj/project.pbxproj (79%) rename {TableKitDemo => Demo}/TableKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) create mode 100644 Package.swift rename {TableKit => Sources}/ConfigurableCell.swift (100%) rename {TableKit => Sources}/HeightStrategy.swift (100%) rename {TableKit => Sources}/Operators.swift (100%) rename {TableKit => Sources}/TableCellAction.swift (100%) rename {TableKit => Sources}/TableDirector.swift (100%) rename {TableKit => Sources}/TableRow.swift (100%) rename {TableKit => Sources}/TableRowAction.swift (100%) rename {TableKit => Sources}/TableRowBuilder.swift (99%) rename {TableKit => Sources}/TableSection.swift (100%) rename {TableKit/TableKit.xcodeproj => TableKit.xcodeproj}/project.pbxproj (56%) create mode 100644 TableKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename {TableKit/TableKit.xcodeproj => TableKit.xcodeproj}/xcshareddata/xcschemes/TableKit.xcscheme (100%) delete mode 100644 TableKit.xcworkspace/contents.xcworkspacedata delete mode 100644 TableKit/TableKit.h rename Tests/{TabletTests.swift => TableKitTests.swift} (99%) diff --git a/TableKit/Info.plist b/Configs/TableKit.plist similarity index 100% rename from TableKit/Info.plist rename to Configs/TableKit.plist diff --git a/Tests/Info.plist b/Configs/TableKitTests.plist similarity index 100% rename from Tests/Info.plist rename to Configs/TableKitTests.plist diff --git a/TableKitDemo/Classes/Application/AppDelegate.swift b/Demo/Classes/Application/AppDelegate.swift similarity index 100% rename from TableKitDemo/Classes/Application/AppDelegate.swift rename to Demo/Classes/Application/AppDelegate.swift diff --git a/TableKitDemo/Classes/Presentation/Controllers/HeaderFooterController.swift b/Demo/Classes/Presentation/Controllers/HeaderFooterController.swift similarity index 100% rename from TableKitDemo/Classes/Presentation/Controllers/HeaderFooterController.swift rename to Demo/Classes/Presentation/Controllers/HeaderFooterController.swift diff --git a/TableKitDemo/Classes/Presentation/Controllers/MainController.swift b/Demo/Classes/Presentation/Controllers/MainController.swift similarity index 100% rename from TableKitDemo/Classes/Presentation/Controllers/MainController.swift rename to Demo/Classes/Presentation/Controllers/MainController.swift diff --git a/TableKitDemo/Classes/Presentation/Views/StoryboardImageTableViewCell.swift b/Demo/Classes/Presentation/Views/StoryboardImageTableViewCell.swift similarity index 100% rename from TableKitDemo/Classes/Presentation/Views/StoryboardImageTableViewCell.swift rename to Demo/Classes/Presentation/Views/StoryboardImageTableViewCell.swift diff --git a/TableKitDemo/Classes/Presentation/Views/StoryboardTableViewCell.swift b/Demo/Classes/Presentation/Views/StoryboardTableViewCell.swift similarity index 100% rename from TableKitDemo/Classes/Presentation/Views/StoryboardTableViewCell.swift rename to Demo/Classes/Presentation/Views/StoryboardTableViewCell.swift diff --git a/TableKitDemo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from TableKitDemo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Demo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/TableKitDemo/Resources/Info.plist b/Demo/Resources/Info.plist similarity index 100% rename from TableKitDemo/Resources/Info.plist rename to Demo/Resources/Info.plist diff --git a/TableKitDemo/Resources/Storyboards/LaunchScreen.storyboard b/Demo/Resources/Storyboards/LaunchScreen.storyboard similarity index 100% rename from TableKitDemo/Resources/Storyboards/LaunchScreen.storyboard rename to Demo/Resources/Storyboards/LaunchScreen.storyboard diff --git a/TableKitDemo/Resources/Storyboards/Main.storyboard b/Demo/Resources/Storyboards/Main.storyboard similarity index 100% rename from TableKitDemo/Resources/Storyboards/Main.storyboard rename to Demo/Resources/Storyboards/Main.storyboard diff --git a/TableKitDemo/TableKitDemo.xcodeproj/project.pbxproj b/Demo/TableKitDemo.xcodeproj/project.pbxproj similarity index 79% rename from TableKitDemo/TableKitDemo.xcodeproj/project.pbxproj rename to Demo/TableKitDemo.xcodeproj/project.pbxproj index 9175ff7..67cde0e 100644 --- a/TableKitDemo/TableKitDemo.xcodeproj/project.pbxproj +++ b/Demo/TableKitDemo.xcodeproj/project.pbxproj @@ -8,7 +8,8 @@ /* Begin PBXBuildFile section */ DA08A0531CF4E9B500BBF1F8 /* StoryboardImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA08A0521CF4E9B500BBF1F8 /* StoryboardImageTableViewCell.swift */; }; - DA9EA7821D0B6B070021F650 /* TableKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9EA7811D0B6B070021F650 /* TableKit.framework */; }; + DA9EA7D91D0EC65B0021F650 /* TableKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9EA7D61D0EC5C60021F650 /* TableKit.framework */; }; + DA9EA7DA1D0EC65B0021F650 /* TableKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA9EA7D61D0EC5C60021F650 /* TableKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DAC2D5CA1C9D303E009E9C19 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC2D5C91C9D303E009E9C19 /* AppDelegate.swift */; }; DAC2D5CF1C9D30A7009E9C19 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAC2D5CD1C9D30A7009E9C19 /* Main.storyboard */; }; DAC2D5D01C9D30A7009E9C19 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAC2D5CE1C9D30A7009E9C19 /* LaunchScreen.storyboard */; }; @@ -18,9 +19,47 @@ DACB717A1CC2D89D00432BD3 /* HeaderFooterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DACB71791CC2D89D00432BD3 /* HeaderFooterController.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + DA9EA7D51D0EC5C60021F650 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DA9EA7561D0B679A0021F650; + remoteInfo = TableKit; + }; + DA9EA7D71D0EC5C60021F650 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DA9EA7C41D0EC45F0021F650; + remoteInfo = TableKitTests; + }; + DA9EA7DB1D0EC65B0021F650 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = DA9EA7551D0B679A0021F650; + remoteInfo = TableKit; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + DA9EA7DD1D0EC65B0021F650 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + DA9EA7DA1D0EC65B0021F650 /* TableKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ DA08A0521CF4E9B500BBF1F8 /* StoryboardImageTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardImageTableViewCell.swift; sourceTree = ""; }; - DA9EA7811D0B6B070021F650 /* TableKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TableKit.framework; path = "../../../../../Library/Developer/Xcode/DerivedData/TableKit-blgxvmkyvpocltgadmpliruugomo/Build/Products/Debug-iphonesimulator/TableKit.framework"; sourceTree = ""; }; + DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TableKit.xcodeproj; path = ../TableKit.xcodeproj; sourceTree = ""; }; DAB7EB271BEF787300D2AD5E /* TableKitDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TableKitDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; DAC2D5C91C9D303E009E9C19 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; DAC2D5CD1C9D30A7009E9C19 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; @@ -37,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DA9EA7821D0B6B070021F650 /* TableKit.framework in Frameworks */, + DA9EA7D91D0EC65B0021F650 /* TableKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -47,14 +86,23 @@ DA539C871CF50B1800368ACB /* Frameworks */ = { isa = PBXGroup; children = ( - DA9EA7811D0B6B070021F650 /* TableKit.framework */, ); name = Frameworks; sourceTree = ""; }; + DA9EA7D11D0EC5C50021F650 /* Products */ = { + isa = PBXGroup; + children = ( + DA9EA7D61D0EC5C60021F650 /* TableKit.framework */, + DA9EA7D81D0EC5C60021F650 /* TableKitTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; DAB7EB1E1BEF787300D2AD5E = { isa = PBXGroup; children = ( + DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */, DAC2D5C61C9D2FE5009E9C19 /* Classes */, DAC2D5CB1C9D3058009E9C19 /* Resources */, DA539C871CF50B1800368ACB /* Frameworks */, @@ -151,10 +199,12 @@ DAB7EB231BEF787300D2AD5E /* Sources */, DAB7EB241BEF787300D2AD5E /* Frameworks */, DAB7EB251BEF787300D2AD5E /* Resources */, + DA9EA7DD1D0EC65B0021F650 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + DA9EA7DC1D0EC65B0021F650 /* PBXTargetDependency */, ); name = TableKitDemo; productName = TabletDemo; @@ -188,6 +238,12 @@ mainGroup = DAB7EB1E1BEF787300D2AD5E; productRefGroup = DAB7EB281BEF787300D2AD5E /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = DA9EA7D11D0EC5C50021F650 /* Products */; + ProjectRef = DA9EA7D01D0EC5C50021F650 /* TableKit.xcodeproj */; + }, + ); projectRoot = ""; targets = ( DAB7EB261BEF787300D2AD5E /* TableKitDemo */, @@ -195,6 +251,23 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + DA9EA7D61D0EC5C60021F650 /* TableKit.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = TableKit.framework; + remoteRef = DA9EA7D51D0EC5C60021F650 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + DA9EA7D81D0EC5C60021F650 /* TableKitTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = TableKitTests.xctest; + remoteRef = DA9EA7D71D0EC5C60021F650 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ DAB7EB251BEF787300D2AD5E /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -223,6 +296,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + DA9EA7DC1D0EC65B0021F650 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = TableKit; + targetProxy = DA9EA7DB1D0EC65B0021F650 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ DAB7EB371BEF787300D2AD5E /* Debug */ = { isa = XCBuildConfiguration; @@ -311,6 +392,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -326,6 +408,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/TableKitDemo/TableKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/TableKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from TableKitDemo/TableKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Demo/TableKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..35ee9ed --- /dev/null +++ b/Package.swift @@ -0,0 +1,5 @@ +import PackageDescription + +let package = Package( + name: "TableKit" +) \ No newline at end of file diff --git a/TableKit/ConfigurableCell.swift b/Sources/ConfigurableCell.swift similarity index 100% rename from TableKit/ConfigurableCell.swift rename to Sources/ConfigurableCell.swift diff --git a/TableKit/HeightStrategy.swift b/Sources/HeightStrategy.swift similarity index 100% rename from TableKit/HeightStrategy.swift rename to Sources/HeightStrategy.swift diff --git a/TableKit/Operators.swift b/Sources/Operators.swift similarity index 100% rename from TableKit/Operators.swift rename to Sources/Operators.swift diff --git a/TableKit/TableCellAction.swift b/Sources/TableCellAction.swift similarity index 100% rename from TableKit/TableCellAction.swift rename to Sources/TableCellAction.swift diff --git a/TableKit/TableDirector.swift b/Sources/TableDirector.swift similarity index 100% rename from TableKit/TableDirector.swift rename to Sources/TableDirector.swift diff --git a/TableKit/TableRow.swift b/Sources/TableRow.swift similarity index 100% rename from TableKit/TableRow.swift rename to Sources/TableRow.swift diff --git a/TableKit/TableRowAction.swift b/Sources/TableRowAction.swift similarity index 100% rename from TableKit/TableRowAction.swift rename to Sources/TableRowAction.swift diff --git a/TableKit/TableRowBuilder.swift b/Sources/TableRowBuilder.swift similarity index 99% rename from TableKit/TableRowBuilder.swift rename to Sources/TableRowBuilder.swift index dc0aefe..4b37799 100644 --- a/TableKit/TableRowBuilder.swift +++ b/Sources/TableRowBuilder.swift @@ -18,6 +18,8 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +import UIKit + public protocol RowBuilder { func rowItems() -> [Row]? diff --git a/TableKit/TableSection.swift b/Sources/TableSection.swift similarity index 100% rename from TableKit/TableSection.swift rename to Sources/TableSection.swift diff --git a/TableKit.podspec b/TableKit.podspec index cdabc6c..ffb675c 100644 --- a/TableKit.podspec +++ b/TableKit.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = 'TableKit' s.module_name = 'TableKit' - s.version = '0.6.0' + s.version = '0.7.0' s.homepage = 'https://github.com/maxsokolov/TableKit' s.summary = 'Type-safe declarative table views. Swift 2.2 is required.' @@ -12,6 +12,6 @@ Pod::Spec.new do |s| s.platforms = { :ios => '8.0' } s.ios.deployment_target = '8.0' - s.source_files = 'TableKit/*.swift' + s.source_files = 'Sources/*.swift' s.source = { :git => 'https://github.com/maxsokolov/TableKit.git', :tag => s.version } end \ No newline at end of file diff --git a/TableKit/TableKit.xcodeproj/project.pbxproj b/TableKit.xcodeproj/project.pbxproj similarity index 56% rename from TableKit/TableKit.xcodeproj/project.pbxproj rename to TableKit.xcodeproj/project.pbxproj index 085b763..a72f71f 100644 --- a/TableKit/TableKit.xcodeproj/project.pbxproj +++ b/TableKit.xcodeproj/project.pbxproj @@ -7,31 +7,44 @@ objects = { /* Begin PBXBuildFile section */ - DA9EA7711D0B68460021F650 /* ConfigurableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7681D0B68460021F650 /* ConfigurableCell.swift */; }; - DA9EA7721D0B68460021F650 /* HeightStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7691D0B68460021F650 /* HeightStrategy.swift */; }; - DA9EA7731D0B68460021F650 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA76A1D0B68460021F650 /* Operators.swift */; }; - DA9EA7741D0B68460021F650 /* TableDirector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA76B1D0B68460021F650 /* TableDirector.swift */; }; - DA9EA7751D0B68460021F650 /* TableRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA76C1D0B68460021F650 /* TableRow.swift */; }; - DA9EA7761D0B68460021F650 /* TableRowAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA76D1D0B68460021F650 /* TableRowAction.swift */; }; - DA9EA7781D0B68460021F650 /* TableSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA76F1D0B68460021F650 /* TableSection.swift */; }; - DA9EA7791D0B68460021F650 /* TableCellAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7701D0B68460021F650 /* TableCellAction.swift */; }; - DA9EA7801D0B689C0021F650 /* TableKit.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9EA77E1D0B689C0021F650 /* TableKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DA9EA7861D0DFAD60021F650 /* TableRowBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7851D0DFAD60021F650 /* TableRowBuilder.swift */; }; + DA9EA7AF1D0EC2C90021F650 /* ConfigurableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */; }; + DA9EA7B01D0EC2C90021F650 /* HeightStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */; }; + DA9EA7B11D0EC2C90021F650 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A81D0EC2C90021F650 /* Operators.swift */; }; + DA9EA7B21D0EC2C90021F650 /* TableCellAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */; }; + DA9EA7B31D0EC2C90021F650 /* TableDirector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */; }; + DA9EA7B41D0EC2C90021F650 /* TableRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AB1D0EC2C90021F650 /* TableRow.swift */; }; + DA9EA7B51D0EC2C90021F650 /* TableRowAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AC1D0EC2C90021F650 /* TableRowAction.swift */; }; + DA9EA7B61D0EC2C90021F650 /* TableRowBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AD1D0EC2C90021F650 /* TableRowBuilder.swift */; }; + DA9EA7B71D0EC2C90021F650 /* TableSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AE1D0EC2C90021F650 /* TableSection.swift */; }; + DA9EA7C91D0EC45F0021F650 /* TableKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9EA7561D0B679A0021F650 /* TableKit.framework */; }; + DA9EA7CF1D0EC4930021F650 /* TableKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7BE1D0EC41D0021F650 /* TableKitTests.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + DA9EA7CA1D0EC45F0021F650 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DA9EA74D1D0B679A0021F650 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DA9EA7551D0B679A0021F650; + remoteInfo = TableKit; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ DA9EA7561D0B679A0021F650 /* TableKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TableKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DA9EA7681D0B68460021F650 /* ConfigurableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurableCell.swift; sourceTree = ""; }; - DA9EA7691D0B68460021F650 /* HeightStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeightStrategy.swift; sourceTree = ""; }; - DA9EA76A1D0B68460021F650 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = ""; }; - DA9EA76B1D0B68460021F650 /* TableDirector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableDirector.swift; sourceTree = ""; }; - DA9EA76C1D0B68460021F650 /* TableRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRow.swift; sourceTree = ""; }; - DA9EA76D1D0B68460021F650 /* TableRowAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRowAction.swift; sourceTree = ""; }; - DA9EA76F1D0B68460021F650 /* TableSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableSection.swift; sourceTree = ""; }; - DA9EA7701D0B68460021F650 /* TableCellAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableCellAction.swift; sourceTree = ""; }; - DA9EA77D1D0B689C0021F650 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DA9EA77E1D0B689C0021F650 /* TableKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableKit.h; sourceTree = ""; }; - DA9EA7851D0DFAD60021F650 /* TableRowBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRowBuilder.swift; sourceTree = ""; }; + DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurableCell.swift; sourceTree = ""; }; + DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeightStrategy.swift; sourceTree = ""; }; + DA9EA7A81D0EC2C90021F650 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = ""; }; + DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableCellAction.swift; sourceTree = ""; }; + DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableDirector.swift; sourceTree = ""; }; + DA9EA7AB1D0EC2C90021F650 /* TableRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRow.swift; sourceTree = ""; }; + DA9EA7AC1D0EC2C90021F650 /* TableRowAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRowAction.swift; sourceTree = ""; }; + DA9EA7AD1D0EC2C90021F650 /* TableRowBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRowBuilder.swift; sourceTree = ""; }; + DA9EA7AE1D0EC2C90021F650 /* TableSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableSection.swift; sourceTree = ""; }; + DA9EA7B91D0EC34E0021F650 /* TableKit.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TableKit.plist; sourceTree = ""; }; + DA9EA7BA1D0EC34E0021F650 /* TableKitTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TableKitTests.plist; sourceTree = ""; }; + DA9EA7BE1D0EC41D0021F650 /* TableKitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableKitTests.swift; sourceTree = ""; }; + DA9EA7C41D0EC45F0021F650 /* TableKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TableKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -42,15 +55,24 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DA9EA7C11D0EC45F0021F650 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DA9EA7C91D0EC45F0021F650 /* TableKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ DA9EA74C1D0B679A0021F650 = { isa = PBXGroup; children = ( - DA9EA7671D0B68340021F650 /* Classes */, + DA9EA7B81D0EC31B0021F650 /* Configs */, DA9EA7571D0B679A0021F650 /* Products */, - DA9EA77C1D0B68860021F650 /* Supporting Files */, + DA9EA7A51D0EC2B90021F650 /* Sources */, + DA9EA7BD1D0EC3D70021F650 /* Tests */, ); sourceTree = ""; }; @@ -58,33 +80,42 @@ isa = PBXGroup; children = ( DA9EA7561D0B679A0021F650 /* TableKit.framework */, + DA9EA7C41D0EC45F0021F650 /* TableKitTests.xctest */, ); name = Products; sourceTree = ""; }; - DA9EA7671D0B68340021F650 /* Classes */ = { + DA9EA7A51D0EC2B90021F650 /* Sources */ = { isa = PBXGroup; children = ( - DA9EA76B1D0B68460021F650 /* TableDirector.swift */, - DA9EA76F1D0B68460021F650 /* TableSection.swift */, - DA9EA76C1D0B68460021F650 /* TableRow.swift */, - DA9EA7851D0DFAD60021F650 /* TableRowBuilder.swift */, - DA9EA76D1D0B68460021F650 /* TableRowAction.swift */, - DA9EA7701D0B68460021F650 /* TableCellAction.swift */, - DA9EA7681D0B68460021F650 /* ConfigurableCell.swift */, - DA9EA7691D0B68460021F650 /* HeightStrategy.swift */, - DA9EA76A1D0B68460021F650 /* Operators.swift */, + DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */, + DA9EA7AB1D0EC2C90021F650 /* TableRow.swift */, + DA9EA7AD1D0EC2C90021F650 /* TableRowBuilder.swift */, + DA9EA7AC1D0EC2C90021F650 /* TableRowAction.swift */, + DA9EA7AE1D0EC2C90021F650 /* TableSection.swift */, + DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */, + DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */, + DA9EA7A81D0EC2C90021F650 /* Operators.swift */, + DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */, ); - name = Classes; + path = Sources; sourceTree = ""; }; - DA9EA77C1D0B68860021F650 /* Supporting Files */ = { + DA9EA7B81D0EC31B0021F650 /* Configs */ = { isa = PBXGroup; children = ( - DA9EA77D1D0B689C0021F650 /* Info.plist */, - DA9EA77E1D0B689C0021F650 /* TableKit.h */, + DA9EA7B91D0EC34E0021F650 /* TableKit.plist */, + DA9EA7BA1D0EC34E0021F650 /* TableKitTests.plist */, ); - name = "Supporting Files"; + path = Configs; + sourceTree = ""; + }; + DA9EA7BD1D0EC3D70021F650 /* Tests */ = { + isa = PBXGroup; + children = ( + DA9EA7BE1D0EC41D0021F650 /* TableKitTests.swift */, + ); + path = Tests; sourceTree = ""; }; /* End PBXGroup section */ @@ -94,7 +125,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - DA9EA7801D0B689C0021F650 /* TableKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -119,18 +149,40 @@ productReference = DA9EA7561D0B679A0021F650 /* TableKit.framework */; productType = "com.apple.product-type.framework"; }; + DA9EA7C31D0EC45F0021F650 /* TableKitTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = DA9EA7CC1D0EC45F0021F650 /* Build configuration list for PBXNativeTarget "TableKitTests" */; + buildPhases = ( + DA9EA7C01D0EC45F0021F650 /* Sources */, + DA9EA7C11D0EC45F0021F650 /* Frameworks */, + DA9EA7C21D0EC45F0021F650 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + DA9EA7CB1D0EC45F0021F650 /* PBXTargetDependency */, + ); + name = TableKitTests; + productName = TableKitTests; + productReference = DA9EA7C41D0EC45F0021F650 /* TableKitTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ DA9EA74D1D0B679A0021F650 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0730; LastUpgradeCheck = 0730; ORGANIZATIONNAME = "Max Sokolov"; TargetAttributes = { DA9EA7551D0B679A0021F650 = { CreatedOnToolsVersion = 7.3; }; + DA9EA7C31D0EC45F0021F650 = { + CreatedOnToolsVersion = 7.3; + }; }; }; buildConfigurationList = DA9EA7501D0B679A0021F650 /* Build configuration list for PBXProject "TableKit" */; @@ -146,6 +198,7 @@ projectRoot = ""; targets = ( DA9EA7551D0B679A0021F650 /* TableKit */, + DA9EA7C31D0EC45F0021F650 /* TableKitTests */, ); }; /* End PBXProject section */ @@ -158,6 +211,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DA9EA7C21D0EC45F0021F650 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -165,20 +225,36 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DA9EA7711D0B68460021F650 /* ConfigurableCell.swift in Sources */, - DA9EA7721D0B68460021F650 /* HeightStrategy.swift in Sources */, - DA9EA7781D0B68460021F650 /* TableSection.swift in Sources */, - DA9EA7751D0B68460021F650 /* TableRow.swift in Sources */, - DA9EA7761D0B68460021F650 /* TableRowAction.swift in Sources */, - DA9EA7741D0B68460021F650 /* TableDirector.swift in Sources */, - DA9EA7861D0DFAD60021F650 /* TableRowBuilder.swift in Sources */, - DA9EA7791D0B68460021F650 /* TableCellAction.swift in Sources */, - DA9EA7731D0B68460021F650 /* Operators.swift in Sources */, + DA9EA7AF1D0EC2C90021F650 /* ConfigurableCell.swift in Sources */, + DA9EA7B31D0EC2C90021F650 /* TableDirector.swift in Sources */, + DA9EA7B71D0EC2C90021F650 /* TableSection.swift in Sources */, + DA9EA7B01D0EC2C90021F650 /* HeightStrategy.swift in Sources */, + DA9EA7B51D0EC2C90021F650 /* TableRowAction.swift in Sources */, + DA9EA7B21D0EC2C90021F650 /* TableCellAction.swift in Sources */, + DA9EA7B11D0EC2C90021F650 /* Operators.swift in Sources */, + DA9EA7B41D0EC2C90021F650 /* TableRow.swift in Sources */, + DA9EA7B61D0EC2C90021F650 /* TableRowBuilder.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DA9EA7C01D0EC45F0021F650 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA9EA7CF1D0EC4930021F650 /* TableKitTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + DA9EA7CB1D0EC45F0021F650 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DA9EA7551D0B679A0021F650 /* TableKit */; + targetProxy = DA9EA7CA1D0EC45F0021F650 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ DA9EA75C1D0B679A0021F650 /* Debug */ = { isa = XCBuildConfiguration; @@ -218,7 +294,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -261,7 +337,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -279,7 +355,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Configs/TableKit.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -298,7 +374,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Configs/TableKit.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -308,6 +384,28 @@ }; name = Release; }; + DA9EA7CD1D0EC45F0021F650 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = Configs/TableKitTests.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.TableKitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + DA9EA7CE1D0EC45F0021F650 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = Configs/TableKitTests.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.TableKitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -329,6 +427,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + DA9EA7CC1D0EC45F0021F650 /* Build configuration list for PBXNativeTarget "TableKitTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA9EA7CD1D0EC45F0021F650 /* Debug */, + DA9EA7CE1D0EC45F0021F650 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = DA9EA74D1D0B679A0021F650 /* Project object */; diff --git a/TableKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/TableKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/TableKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/TableKit/TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme b/TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme similarity index 100% rename from TableKit/TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme rename to TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme diff --git a/TableKit.xcworkspace/contents.xcworkspacedata b/TableKit.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 134624f..0000000 --- a/TableKit.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/TableKit/TableKit.h b/TableKit/TableKit.h deleted file mode 100644 index c63484c..0000000 --- a/TableKit/TableKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// TableKit.h -// TableKit -// -// Created by Max Sokolov on 11/06/16. -// Copyright © 2016 Max Sokolov. All rights reserved. -// - -#import - -//! Project version number for TableKit. -FOUNDATION_EXPORT double TableKitVersionNumber; - -//! Project version string for TableKit. -FOUNDATION_EXPORT const unsigned char TableKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Tests/TabletTests.swift b/Tests/TableKitTests.swift similarity index 99% rename from Tests/TabletTests.swift rename to Tests/TableKitTests.swift index 839fa6f..868e288 100644 --- a/Tests/TabletTests.swift +++ b/Tests/TableKitTests.swift @@ -19,7 +19,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import XCTest -import Tablet +import TableKit class TestController: UITableViewController { @@ -45,7 +45,7 @@ struct TestTableViewCellOptions { static let EstimatedHeight: Float = 255 } -class TestTableViewCell: UITableViewCell, ConfigurableCell { +/*class TestTableViewCell: UITableViewCell, ConfigurableCell { typealias T = TestData @@ -197,4 +197,4 @@ class TabletTests: XCTestCase { waitForExpectationsWithTimeout(1.0, handler: nil) } -} \ No newline at end of file +}*/ \ No newline at end of file