Merge branch 'release/1.2.0'

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.swiftlint.yml

@@ -23,3 +23,4 @@ identifier_name:
     - id
     - from
     - to
+    - n

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9
 script:
   - swiftlint
   - travis_retry sh build.sh

CHANGELOG.md

@@ -2,8 +2,18 @@
 All notable changes to this project will be documented in this file.
 
 ---
-
-## [Unreleased]
+## [1.2.0]
+### Added
+- Official support to Swift 4
+- Support for `TableItem` method `redraw()`
+- Support for `scrollViewWillEndDragging`
+- Support for item's `copy` and `paste` action via `ActionPerformable`
+### Changed
+- Deprecated `Item` in favour of `TableItem`
+- Deprecated `Section` in favour of `TableSection`
+- Optimize diff algorithm used by `ObservableArray` for common methods such as `insert(at:)`, `remove(at:)` etc...
+- Fix a bug where `manager` was not set correctly on `Item` or `Section`
+- Fix memory ownership of `ObservableArray` for Swift 4
 
 ## [1.1.0]
 ### Added

Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -236,7 +236,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = ODIGEO;
 				TargetAttributes = {
 					257F72C01D07204A00F7B954 = {
@@ -299,13 +299,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SampleApp-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		6AF3F1B07CA3D96A8145F9B2 /* [CP] Copy Pods Resources */ = {
@@ -329,9 +332,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/TableViewKit/TableViewKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TableViewKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -408,14 +414,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -455,14 +467,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

Examples/SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Examples/SampleApp/SampleApp/ActionBar/ActionBarManager.swift

@@ -20,7 +20,7 @@ class ActionBarManager: ActionBarDelegate {
 
     fileprivate func indexPathForResponder(forDirection direction: Direction) -> IndexPath? {
 
-        func isFirstResponder(item: Item) -> Bool {
+        func isFirstResponder(item: TableItem) -> Bool {
             if isResponder(item: item),
                 let indexPath = item.indexPath,
                 manager.tableView.cellForRow(at: indexPath)?.isFirstResponder == true {
@@ -29,7 +29,7 @@ class ActionBarManager: ActionBarDelegate {
             return false
         }
 
-        func isResponder(item: Item) -> Bool {
+        func isResponder(item: TableItem) -> Bool {
             return (item as? UIResponder)?.canBecomeFirstResponder ?? false
         }
 
@@ -38,7 +38,7 @@ class ActionBarManager: ActionBarDelegate {
             let index = array.index(of: currentItem)
             else { return nil }
 
-        let item: Item?
+        let item: TableItem?
 
         switch direction {
         case .next:

Examples/SampleApp/SampleApp/CustomItem.swift

@@ -13,7 +13,7 @@ public class CustomDrawer: CellDrawer {
     }
 }
 
-public class CustomItem: Selectable, Item {
+public class CustomItem: Selectable, TableItem {
     public static var drawer = AnyCellDrawer(CustomDrawer.self)
 
     public var title: String?

Examples/SampleApp/SampleApp/Example1.swift

@@ -11,9 +11,9 @@ protocol ActionManagerCompatible {
 }
 
 class Example1: UIViewController, TableViewManagerCompatible {
-    fileprivate class FirstSection: Section, StaticStateful {
-        var items: ObservableArray<Item> = []
-        var states: [State: [Item]] = [:]
+    fileprivate class FirstSection: TableSection, StaticStateful {
+        var items: ObservableArray<TableItem> = []
+        var states: [State: [TableItem]] = [:]
 
         enum State: Int {
             case preParty
@@ -63,9 +63,9 @@ class Example1: UIViewController, TableViewManagerCompatible {
 
     }
 
-    fileprivate class SecondSection: Section {
+    fileprivate class SecondSection: TableSection {
 
-        var items: ObservableArray<Item> = []
+        var items: ObservableArray<TableItem> = []
 
         internal var header: HeaderFooterView = .view(CustomHeaderItem(title: "Second Section"))
 
@@ -75,7 +75,7 @@ class Example1: UIViewController, TableViewManagerCompatible {
             self.vc = vc
 
             let total: [Int] = Array(1...100)
-            let items = total.map({ (index) -> Item in
+            let items = total.map({ (index) -> TableItem in
                 if (index % 2 == 0) {
                     let item = TextFieldItem(placeHolder: "Textfield \(index)", actionBarDelegate: vc.actionBarManager)
                     return item
@@ -91,15 +91,15 @@ class Example1: UIViewController, TableViewManagerCompatible {
         }
     }
 
-    fileprivate class ThirdSection: Section, Stateful {
+    fileprivate class ThirdSection: TableSection, Stateful {
 
         enum State {
             case all
-            case selected(Item)
+            case selected(TableItem)
         }
 
-        var items: ObservableArray<Item> = []
-        var allItems: [Item] = []
+        var items: ObservableArray<TableItem> = []
+        var allItems: [TableItem] = []
         var currentState: State = .all
 
         let vc: TableViewManagerCompatible
@@ -108,7 +108,7 @@ class Example1: UIViewController, TableViewManagerCompatible {
             self.vc = vc
 
             let total: [Int] = Array(1...10)
-            self.allItems = total.map { (index) -> Item in
+            self.allItems = total.map { (index) -> TableItem in
                 let item = CustomItem(title: "Label  \(index)")
                 item.onSelection = { item in
                     switch self.currentState {
@@ -124,7 +124,7 @@ class Example1: UIViewController, TableViewManagerCompatible {
             self.transition(to: currentState)
         }
 
-        func items(for state: State) -> [Item] {
+        func items(for state: State) -> [TableItem] {
             switch state {
             case .all:
                 return allItems

Examples/SampleApp/SampleApp/SelectionViewController.swift

@@ -2,14 +2,14 @@ import Foundation
 import UIKit
 import TableViewKit
 
-class SelectionSection: Section {
-    var items: ObservableArray<Item> = []
+class SelectionSection: TableSection {
+    var items: ObservableArray<TableItem> = []
     weak var tableViewManager: TableViewManager!
 
     required init() { }
 }
 
-public protocol SelectionItemProtocol: Item {
+public protocol SelectionItemProtocol: TableItem {
 
     var value: Any { get }
     var selected: Bool { get set }

Examples/SampleApp/SampleApp/TextFieldItem.swift

@@ -3,7 +3,7 @@ import TableViewKit
 
 public class TextFieldCell: UITableViewCell, ItemCompatible, ActionBarDelegate {
 
-    public var item: Item?
+    public var item: TableItem?
 
     public var textFieldItem: TextFieldItem {
         get {
@@ -58,7 +58,7 @@ public class TextFieldDrawer: CellDrawer {
     }
 }
 
-public class TextFieldItem: UIResponder, Item, ContentValidatable, Validationable {
+public class TextFieldItem: UIResponder, TableItem, ContentValidatable, Validationable {
 
     public static var drawer = AnyCellDrawer(TextFieldDrawer.self)
 

Examples/SampleApp/SampleApp/ViewController.swift

@@ -3,8 +3,8 @@ import TableViewKit
 
 class ViewController: UIViewController, TableViewManagerCompatible {
 
-    fileprivate class CustomSection: Section {
-        var items: ObservableArray<Item>
+    fileprivate class CustomSection: TableSection {
+        var items: ObservableArray<TableItem>
 
         let vc: ViewController
 
@@ -13,7 +13,7 @@ class ViewController: UIViewController, TableViewManagerCompatible {
             self.items = []
 
             let array: [UIViewController.Type] = [Example1.self]
-            let mappedItems = array.map({ (className) -> Item in
+            let mappedItems = array.map({ (className) -> TableItem in
                 let viewController = className.init(nibName: String(describing: className), bundle: nil)
 
                 let navigationController = UINavigationController(rootViewController: viewController)

Examples/Viper/TableViewKit+VIPER.xcodeproj/project.pbxproj

@@ -180,7 +180,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "eDreams Odigeo";
 				TargetAttributes = {
 					25A741931D7ED45900473E02 = {
@@ -227,13 +227,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-TableViewKit+VIPER-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		87A11139382E8ED739E3CEEC /* [CP] Embed Pods Frameworks */ = {
@@ -242,9 +245,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-TableViewKit+VIPER/Pods-TableViewKit+VIPER-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/TableViewKit/TableViewKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TableViewKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -311,14 +317,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -358,14 +370,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

Examples/Viper/TableViewKit+VIPER/AboutModule/HelpCenterCell.swift

@@ -13,7 +13,7 @@ class HelpCenterDrawer: CellDrawer {
 
 class HelpCenterCell: UITableViewCell, ItemCompatible {
 
-    public var item: Item?
+    public var item: TableItem?
 
     @IBOutlet var titleLabel: UILabel!
     @IBOutlet var detailLabel: UILabel!