Support swift 4.2 (#4)

Vyazovoy · heiberg · commit 4daf22932898 · 2018-09-24T08:50:03.000+02:00
* Update code to swift 4.2

* Update test project to swift 4.2

* Update Travis config

* Fix Travis pod update

* Temporary allow warnings to pass `Quick` pod warning
`WARN  | xcodebuild:  Quick/Sources/Quick/Behavior.swift:7:21: warning: static declarations are implicitly 'final'; use 'public' instead of 'open'`
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
-osx_image: xcode9.4
+osx_image: xcode10
 language: swift
 script:
+  - pod repo update
   - pod install --project-directory=Examples
   - set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Examples/SimpleSourceExample.xcworkspace -scheme SimpleSource-Unit-Tests -destination 'name=iPhone 8' ONLY_ACTIVE_ARCH=YES | xcpretty
-  - pod lib lint
+  - pod lib lint --allow-warnings
 after_success:
   - bash <(curl -s https://codecov.io/bash) -J 'SimpleSource'
diff --git a/Examples/SimpleSourceExample.xcodeproj/project.pbxproj b/Examples/SimpleSourceExample.xcodeproj/project.pbxproj
@@ -291,6 +291,7 @@
 				TargetAttributes = {
 					C424C2641E3B4B2900CEE8C0 = {
 						CreatedOnToolsVersion = 8.2;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -538,7 +539,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.squarespace.SimpleSourceExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -551,7 +552,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.squarespace.SimpleSourceExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/Examples/SimpleSourceExample/AppDelegate.swift b/Examples/SimpleSourceExample/AppDelegate.swift
@@ -4,7 +4,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         return true
     }
 }
diff --git a/Examples/SimpleSourceExample/HeaderColorGridViewController.swift b/Examples/SimpleSourceExample/HeaderColorGridViewController.swift
@@ -60,7 +60,7 @@ final class HeaderColorGridViewController: UICollectionViewController {
         let configureHeader = ColorGridHeader.configureHeader(dataSource: dataSource)
         viewFactory.registerSupplementaryView(
             method: .dynamic,
-            kind: UICollectionElementKindSectionHeader,
+            kind: UICollectionView.elementKindSectionHeader,
             reuseIdentifier: ColorGridHeader.reuseIdentifier,
             in: collectionView,
             configuration: configureHeader)
diff --git a/Examples/SimpleSourceExample/ItemListTableViewController.swift b/Examples/SimpleSourceExample/ItemListTableViewController.swift
@@ -78,7 +78,7 @@ final class ItemListTableViewController: UITableViewController {
 
     // This method is part of UITableViewDelegate, so it will not be provided or proxied by the SimpleSource data source.
     // SimpleSource only implements methods from UITableViewDataSource.
-    override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle {
+    override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {
         return .delete
     }
 
@@ -98,7 +98,7 @@ final class ItemListTableViewController: UITableViewController {
 // MARK: Editing
 
 extension ItemListTableViewController: TableViewEditingDelegate {
-    func editing(tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
+    func editing(tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
         dataSource.sections[0].items.remove(at: indexPath.item)
     }
 }
diff --git a/SimpleSource.podspec b/SimpleSource.podspec
@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
   s.name                 = 'SimpleSource'
-  s.version              = '1.0.1'
+  s.version              = '2.0.0'
   s.summary              = 'Composable, easy to use data sources for UITableView and UICollectionView.'
   s.homepage             = 'https://github.com/Squarespace/simple-source'
   s.license              = { :type => 'Apache', :file => 'LICENSE' }
   s.authors              = { 'Morten Heiberg' => 'mheiberg@squarespace.com', 'Thor Frolich' => 'tfrolich@squarespace.com' }
   s.platform             = :ios, '9.0'
-  s.swift_version        = '4.0'
+  s.swift_version        = '4.2'
   s.source               = { :git => 'https://github.com/Squarespace/simple-source.git', :tag => s.version }
   s.source_files         = 'Sources/**/*.{h,m,swift}'
-  s.dependency           'Dwifft', '0.7'
+  s.dependency           'Dwifft', '~> 0.9.0'
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.resource = 'Tests/Model/*.xcdatamodeld'
diff --git a/Sources/UITableView/TableViewDataSource.swift b/Sources/UITableView/TableViewDataSource.swift
@@ -87,7 +87,7 @@ open class TableViewDataSource<DS, VF>: NSObject, UITableViewDataSource where DS
         return editingDelegate?.editing(tableView: tableView, canEditRowAt: indexPath) ?? false
     }
 
-    public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
+    public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
         editingDelegate?.editing(tableView: tableView, commit: editingStyle, forRowAt: indexPath)
     }
 
diff --git a/Sources/UITableView/TableViewEditingDelegate.swift b/Sources/UITableView/TableViewEditingDelegate.swift
@@ -12,7 +12,7 @@ import UIKit
 /// Set the `editingDelegate` property of your `TableViewDataSource` to control editing.
 public protocol TableViewEditingDelegate: class {
     func editing(tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool
-    func editing(tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath)
+    func editing(tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath)
 }
 
 extension TableViewEditingDelegate {
diff --git a/Sources/UITableView/TableViewFactory.swift b/Sources/UITableView/TableViewFactory.swift
@@ -3,7 +3,7 @@ import UIKit
 public enum TableViewRegistrationMethod {
     case classBased(AnyClass?)
     case nibBased(UINib?)
-    case style(UITableViewCellStyle)
+    case style(UITableViewCell.CellStyle)
     case dynamic
 }
 
diff --git a/Sources/UITableView/UITableView+Updates.swift b/Sources/UITableView/UITableView+Updates.swift
@@ -5,7 +5,7 @@ extension UITableView {
         return { [weak self] _ in self?.reloadData() }
     }
     
-    public func defaultViewUpdate(with animation: UITableViewRowAnimation = .fade) -> IndexedUpdateHandler.Observer {
+    public func defaultViewUpdate(with animation: UITableView.RowAnimation = .fade) -> IndexedUpdateHandler.Observer {
         return { [weak self] update in
             guard let _ = self?.window else {
                 self?.reloadData()

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import UIKit`
`4`	`4`	`class AppDelegate: UIResponder, UIApplicationDelegate {`
`5`	`5`	`var window: UIWindow?`
`6`	`6`
`7`		`- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
	`7`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {`
`8`	`8`	`return true`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ final class ItemListTableViewController: UITableViewController {`
`78`	`78`
`79`	`79`	`// This method is part of UITableViewDelegate, so it will not be provided or proxied by the SimpleSource data source.`
`80`	`80`	`// SimpleSource only implements methods from UITableViewDataSource.`
`81`		`- override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle {`
	`81`	`+ override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {`
`82`	`82`	`return .delete`
`83`	`83`	`}`
`84`	`84`
`@@ -98,7 +98,7 @@ final class ItemListTableViewController: UITableViewController {`
`98`	`98`	`// MARK: Editing`
`99`	`99`
`100`	`100`	`extension ItemListTableViewController: TableViewEditingDelegate {`
`101`		`- func editing(tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {`
	`101`	`+ func editing(tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {`
`102`	`102`	`dataSource.sections[0].items.remove(at: indexPath.item)`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ open class TableViewDataSource<DS, VF>: NSObject, UITableViewDataSource where DS`
`87`	`87`	`return editingDelegate?.editing(tableView: tableView, canEditRowAt: indexPath) ?? false`
`88`	`88`	`}`
`89`	`89`
`90`		`- public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {`
	`90`	`+ public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {`
`91`	`91`	`editingDelegate?.editing(tableView: tableView, commit: editingStyle, forRowAt: indexPath)`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import UIKit`
`12`	`12`	/// Set the `editingDelegate` property of your `TableViewDataSource` to control editing.
`13`	`13`	`public protocol TableViewEditingDelegate: class {`
`14`	`14`	`func editing(tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool`
`15`		`- func editing(tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath)`
	`15`	`+ func editing(tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`extension TableViewEditingDelegate {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import UIKit`
`3`	`3`	`public enum TableViewRegistrationMethod {`
`4`	`4`	`case classBased(AnyClass?)`
`5`	`5`	`case nibBased(UINib?)`
`6`		`- case style(UITableViewCellStyle)`
	`6`	`+ case style(UITableViewCell.CellStyle)`
`7`	`7`	`case dynamic`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ extension UITableView {`
`5`	`5`	`return { [weak self] _ in self?.reloadData() }`
`6`	`6`	`}`
`7`	`7`
`8`		`- public func defaultViewUpdate(with animation: UITableViewRowAnimation = .fade) -> IndexedUpdateHandler.Observer {`
	`8`	`+ public func defaultViewUpdate(with animation: UITableView.RowAnimation = .fade) -> IndexedUpdateHandler.Observer {`
`9`	`9`	`return { [weak self] update in`
`10`	`10`	`guard let _ = self?.window else {`
`11`	`11`	`self?.reloadData()`