Merge pull request #67 from kazuhiro4949/feature/swift4.2

kazuhiro4949 · web-flow · commit 2b42198d8019 · 2018-09-21T00:27:15.000+09:00
Supporting swift4.2 Xcode10
diff --git a/PagingKit.xcodeproj/project.pbxproj b/PagingKit.xcodeproj/project.pbxproj
@@ -402,7 +402,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -426,7 +426,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/PagingKit/Array+NSLayoutConstraint.swift b/PagingKit/Array+NSLayoutConstraint.swift
@@ -24,7 +24,7 @@
 
 import Foundation
 
-extension Array where Element == NSLayoutAttribute {
+extension Array where Element == NSLayoutConstraint.Attribute {
     /// anchor same attributes between fromView and toView
     /// convert to "view1.attr1 = view2.attr2 * multiplier + constant"
     /// - Parameters:
diff --git a/PagingKit/PagingContentViewController.swift b/PagingKit/PagingContentViewController.swift
@@ -289,7 +289,7 @@ public class PagingContentViewController: UIViewController {
     
     fileprivate func removeAll() {
         scrollView.subviews.forEach { $0.removeFromSuperview() }
-        childViewControllers.forEach { $0.removeFromParentViewController() }
+        children.forEach { $0.removeFromParent() }
     }
     
     fileprivate func initialLoad(with page: Int) {
@@ -306,11 +306,11 @@ public class PagingContentViewController: UIViewController {
         
         if case nil = cachedViewControllers[page], let dataSource = dataSource {
             let vc = dataSource.contentViewController(viewController: self, viewControllerAt: page)
-            addChildViewController(vc)
+            addChild(vc)
             vc.view.frame = scrollView.bounds
             vc.view.frame.origin.x = scrollView.bounds.width * CGFloat(page)
             scrollView.addSubview(vc.view)
-            vc.didMove(toParentViewController: self)
+            vc.didMove(toParent: self)
             cachedViewControllers[page] = vc
         }
     }
diff --git a/PagingKit/PagingKitProxy.swift b/PagingKit/PagingKitProxy.swift
@@ -88,7 +88,7 @@ extension PagingKitProxy where Base == UIView.Type {
         UIView.perform(
             .delete,
             on: [],
-            options: UIViewAnimationOptions(rawValue: 0),
+            options: UIView.AnimationOptions(rawValue: 0),
             animations: animations,
             completion: completion
         )
diff --git a/PagingKit/PagingMenuView.swift b/PagingKit/PagingMenuView.swift
@@ -358,7 +358,7 @@ public class PagingMenuView: UIScrollView {
         focusView.selectedIndex = index
         visibleCells.selectCell(with: index)
         
-        UIView.perform(.delete, on: [], options: UIViewAnimationOptions(rawValue: 0), animations: { [weak self] in
+        UIView.perform(.delete, on: [], options: UIView.AnimationOptions(rawValue: 0), animations: { [weak self] in
             self?.contentOffset = offset
             self?.focusView.frame = itemFrame
             self?.focusView.layoutIfNeeded()
diff --git a/PagingKit/TitleLabelMenuViewCell.swift b/PagingKit/TitleLabelMenuViewCell.swift
@@ -89,7 +89,7 @@ public class TitleLabelMenuViewCell: PagingMenuViewCell {
     
     
     /// syntax sugar of NSLayoutConstraint for titleLabel (Because this library supports iOS8, it cannnot use NSLayoutAnchor.)
-    private func anchorLabel(from fromItem: Any, to toItem: Any, attribute: NSLayoutAttribute) -> NSLayoutConstraint {
+    private func anchorLabel(from fromItem: Any, to toItem: Any, attribute: NSLayoutConstraint.Attribute) -> NSLayoutConstraint {
         return NSLayoutConstraint(
             item: fromItem,
             attribute: attribute,
diff --git a/iOS Sample/iOS Sample.xcodeproj/project.pbxproj b/iOS Sample/iOS Sample.xcodeproj/project.pbxproj
@@ -756,7 +756,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-Sample";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -771,7 +771,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-Sample";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -786,7 +786,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-SampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS Sample.app/iOS Sample";
 			};
 			name = Debug;
@@ -802,7 +802,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-SampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS Sample.app/iOS Sample";
 			};
 			name = Release;
@@ -817,7 +817,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-SampleUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_TARGET_NAME = "iOS Sample";
 			};
 			name = Debug;
@@ -832,7 +832,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kazuhiro.hayashi.iOS-SampleUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_TARGET_NAME = "iOS Sample";
 			};
 			name = Release;
diff --git a/iOS Sample/iOS Sample/AppDelegate.swift b/iOS Sample/iOS Sample/AppDelegate.swift
@@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/iOS Sample/iOS Sample/ArbitraryNumberViewController.swift b/iOS Sample/iOS Sample/ArbitraryNumberViewController.swift
@@ -80,7 +80,7 @@ extension ArbitraryNumberViewController: PagingMenuViewControllerDataSource {
             return UIScreen.main.bounds.width / CGFloat(dataSource.count)
         } else {
             ArbitraryNumberViewController.sizingCell.titleLabel.text = dataSource[index].menu
-            var referenceSize = UILayoutFittingCompressedSize
+            var referenceSize = UIView.layoutFittingCompressedSize
             referenceSize.height = viewController.view.bounds.height
             let size = ArbitraryNumberViewController.sizingCell.systemLayoutSizeFitting(referenceSize)
             return size.width
diff --git a/iOS Sample/iOS Sample/DynamicSizeViewController.swift b/iOS Sample/iOS Sample/DynamicSizeViewController.swift
@@ -70,7 +70,7 @@ class DynamicSizeViewController: UIViewController {
         let height = size.height * CGFloat(arc4random_uniform(100)) / 100
         
         let updateSize = height <= 108 ? .zero : CGSize(width: width, height: height)
-        UIView.perform(.delete, on: [], options: UIViewAnimationOptions(rawValue: 0), animations: { [weak self] in
+        UIView.perform(.delete, on: [], options: UIView.AnimationOptions(rawValue: 0), animations: { [weak self] in
             self?.view.frame.size = updateSize
             self?.view.setNeedsLayout()
             self?.view.layoutIfNeeded()
@@ -88,7 +88,7 @@ extension DynamicSizeViewController: PagingMenuViewControllerDataSource {
     
     func menuViewController(viewController: PagingMenuViewController, widthForItemAt index: Int) -> CGFloat {
         DynamicSizeViewController.sizingCell.titleLabel.text = dataSource[index].menu
-        var referenceSize = UILayoutFittingCompressedSize
+        var referenceSize = UIView.layoutFittingCompressedSize
         referenceSize.height = viewController.view.bounds.height
         let size = DynamicSizeViewController.sizingCell.systemLayoutSizeFitting(referenceSize)
         return size.width
diff --git a/iOS Sample/iOS Sample/FullscreenViewController.swift b/iOS Sample/iOS Sample/FullscreenViewController.swift
@@ -72,7 +72,7 @@ extension FullscreenViewController: PagingMenuViewControllerDataSource {
     
     func menuViewController(viewController: PagingMenuViewController, widthForItemAt index: Int) -> CGFloat {
         TagMenuCell.sizingCell.titieLabel.text = dataSource[index].menu.title
-        var referenceSize = UILayoutFittingCompressedSize
+        var referenceSize = UIView.layoutFittingCompressedSize
         referenceSize.height = viewController.view.bounds.height
         let size = TagMenuCell.sizingCell.systemLayoutSizeFitting(referenceSize)
         return size.width
diff --git a/iOS Sample/iOS Sample/InitializingWithoutStoryboardViewController.swift b/iOS Sample/iOS Sample/InitializingWithoutStoryboardViewController.swift
@@ -39,9 +39,9 @@ class InitializingWithoutStoryboardViewController: UIViewController {
             menuViewController.view.translatesAutoresizingMaskIntoConstraints = false
             
             // add content vc on this vc.
-            addChildViewController(menuViewController)
+            addChild(menuViewController)
             view.addSubview(menuViewController.view)
-            menuViewController.didMove(toParentViewController: self)
+            menuViewController.didMove(toParent: self)
             
             // set autolayout 
             if #available(iOS 11.0, *) {
@@ -69,9 +69,9 @@ class InitializingWithoutStoryboardViewController: UIViewController {
             contentViewController.view.translatesAutoresizingMaskIntoConstraints = false
             
             // add content vc on this vc.
-            addChildViewController(contentViewController)
+            addChild(contentViewController)
             view.addSubview(contentViewController.view)
-            contentViewController.didMove(toParentViewController: self)
+            contentViewController.didMove(toParent: self)
             
             // set autolayout 
             if #available(iOS 11.0, *) {
diff --git a/iOS Sample/iOS Sample/MenuReloadableViewController.swift b/iOS Sample/iOS Sample/MenuReloadableViewController.swift
@@ -96,7 +96,7 @@ extension MenuReloadableViewController: PagingMenuViewControllerDataSource {
     
     func menuViewController(viewController: PagingMenuViewController, widthForItemAt index: Int) -> CGFloat {
         MenuReloadableViewController.sizingCell.titleLabel.text = dataSource[index].menu
-        var referenceSize = UILayoutFittingCompressedSize
+        var referenceSize = UIView.layoutFittingCompressedSize
         referenceSize.height = viewController.view.bounds.height
         let size = MenuReloadableViewController.sizingCell.systemLayoutSizeFitting(referenceSize)
         return size.width
diff --git a/iOS Sample/iOS Sample/OverlayViewController.swift b/iOS Sample/iOS Sample/OverlayViewController.swift
@@ -79,7 +79,7 @@ extension OverlayViewController: PagingMenuViewControllerDataSource {
     
     func menuViewController(viewController: PagingMenuViewController, widthForItemAt index: Int) -> CGFloat {
         OverlayMenuCell.sizingCell.textLabel.text = dataSource[index].menu
-        var referenceSize = UILayoutFittingCompressedSize
+        var referenceSize = UIView.layoutFittingCompressedSize
         referenceSize.height = viewController.view.bounds.height
         let size = OverlayMenuCell.sizingCell.systemLayoutSizeFitting(referenceSize, withHorizontalFittingPriority: UILayoutPriority.defaultLow, verticalFittingPriority: UILayoutPriority.defaultHigh)
         return size.width
diff --git a/iOS Sample/iOS Sample/TagMenuCell.swift b/iOS Sample/iOS Sample/TagMenuCell.swift
@@ -38,7 +38,7 @@ class TagMenuCell: PagingMenuViewCell {
             UIView.perform(
                 .delete,
                 on: [],
-                options: UIViewAnimationOptions(rawValue: 0),
+                options: UIView.AnimationOptions(rawValue: 0),
                 animations: { [weak self] in
                     self?.setNeedsLayout()
                     self?.layoutIfNeeded()
diff --git a/iOS Sample/iOS Sample/TagViewController.swift b/iOS Sample/iOS Sample/TagViewController.swift
@@ -102,7 +102,7 @@ extension TagViewController: PagingMenuViewControllerDataSource {
     
     func menuViewController(viewController: PagingMenuViewController, widthForItemAt index: Int) -> CGFloat {
         TagMenuCell.sizingCell.titieLabel.text = dataSource[index].menu.title
-        var referenceSize = UILayoutFittingCompressedSize
+        var referenceSize = UIView.layoutFittingCompressedSize
         referenceSize.height = viewController.view.bounds.height
         let size = TagMenuCell.sizingCell.systemLayoutSizeFitting(referenceSize)
         return size.width

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public class PagingContentViewController: UIViewController {`
`289`	`289`
`290`	`290`	`fileprivate func removeAll() {`
`291`	`291`	`scrollView.subviews.forEach { $0.removeFromSuperview() }`
`292`		`- childViewControllers.forEach { $0.removeFromParentViewController() }`
	`292`	`+ children.forEach { $0.removeFromParent() }`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`fileprivate func initialLoad(with page: Int) {`
`@@ -306,11 +306,11 @@ public class PagingContentViewController: UIViewController {`
`306`	`306`
`307`	`307`	`if case nil = cachedViewControllers[page], let dataSource = dataSource {`
`308`	`308`	`let vc = dataSource.contentViewController(viewController: self, viewControllerAt: page)`
`309`		`- addChildViewController(vc)`
	`309`	`+ addChild(vc)`
`310`	`310`	`vc.view.frame = scrollView.bounds`
`311`	`311`	`vc.view.frame.origin.x = scrollView.bounds.width * CGFloat(page)`
`312`	`312`	`scrollView.addSubview(vc.view)`
`313`		`- vc.didMove(toParentViewController: self)`
	`313`	`+ vc.didMove(toParent: self)`
`314`	`314`	`cachedViewControllers[page] = vc`
`315`	`315`	`}`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ extension PagingKitProxy where Base == UIView.Type {`
`88`	`88`	`UIView.perform(`
`89`	`89`	`.delete,`
`90`	`90`	`on: [],`
`91`		`- options: UIViewAnimationOptions(rawValue: 0),`
	`91`	`+ options: UIView.AnimationOptions(rawValue: 0),`
`92`	`92`	`animations: animations,`
`93`	`93`	`completion: completion`
`94`	`94`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`30`	`30`	`var window: UIWindow?`
`31`	`31`
`32`	`32`
`33`		`- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
	`33`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {`
`34`	`34`	`// Override point for customization after application launch.`
`35`	`35`	`return true`
`36`	`36`	`}`