From 09fb63b3ef7ac6213f244a70ce0536cd9025adc6 Mon Sep 17 00:00:00 2001
From: monzy613 <monzy613@gmail.com>
Date: Thu, 11 Apr 2019 10:37:12 +0800
Subject: [PATCH] support swift 4.2

---
 PageController/PageController.swift | 22 +++++++++++-----------
 PageController/ProgressView.swift   |  6 +++---
 WMPageController-Swift.podspec      |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/PageController/PageController.swift b/PageController/PageController.swift
index 6f200c7..38843f7 100644
--- a/PageController/PageController.swift
+++ b/PageController/PageController.swift
@@ -206,7 +206,7 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
         NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(PageController.growCachePolicyToHigh), object: nil)
         memCache.removeAllObjects()
         if memoryWarningCount < 3 {
-            perform(#selector(PageController.growCachePolicyAfterMemoryWarning), with: nil, afterDelay: 3.0, inModes: [RunLoopMode.commonModes])
+            perform(#selector(PageController.growCachePolicyAfterMemoryWarning), with: nil, afterDelay: 3.0, inModes: [RunLoop.Mode.common])
         }
     }
     
@@ -312,8 +312,8 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
         for viewController in displayingControllers.allValues {
             if let vc = viewController as? UIViewController {
                 vc.view.removeFromSuperview()
-                vc.willMove(toParentViewController: nil)
-                vc.removeFromParentViewController()
+                vc.willMove(toParent: nil)
+                vc.removeFromParent()
             }
         }
         memoryWarningCount = 0
@@ -454,9 +454,9 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
     }
     
     fileprivate func addCachedViewController(_ viewController: UIViewController, atIndex index: Int) {
-        addChildViewController(viewController)
+        addChild(viewController)
         viewController.view.frame = childViewFrames[index]
-        viewController.didMove(toParentViewController: self)
+        viewController.didMove(toParent: self)
         contentView?.addSubview(viewController.view)
         willEnterController(viewController, atIndex: index)
         displayingControllers.setObject(viewController, forKey: index as NSCopying)
@@ -468,9 +468,9 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
         if let optionalKeys = keys {
             viewController.setValue(values?[index], forKey: optionalKeys[index])
         }
-        addChildViewController(viewController)
+        addChild(viewController)
         viewController.view.frame = childViewFrames.count > 0 ? childViewFrames[index] : view.frame
-        viewController.didMove(toParentViewController: self)
+        viewController.didMove(toParent: self)
         contentView?.addSubview(viewController.view)
         willEnterController(viewController, atIndex: index)
         displayingControllers.setObject(viewController, forKey: index as NSCopying)
@@ -478,8 +478,8 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
     
     fileprivate func removeViewController(_ viewController: UIViewController, atIndex index: Int) {
         viewController.view.removeFromSuperview()
-        viewController.willMove(toParentViewController: nil)
-        viewController.removeFromParentViewController()
+        viewController.willMove(toParent: nil)
+        viewController.removeFromParent()
         displayingControllers.removeObject(forKey: index)
         if memCache.object(forKey: NSNumber(integerLiteral: index)) == nil {
             willCachedController(viewController, atIndex: index)
@@ -505,12 +505,12 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
         menuView?.reload()
         guard selectedIndex != 0 else { return }
         menuView?.selectItemAtIndex(selectedIndex)
-        view.bringSubview(toFront: menuView!)
+        view.bringSubviewToFront(menuView!)
     }
     
     @objc fileprivate func growCachePolicyAfterMemoryWarning() {
         cachePolicy = CachePolicy.balanced
-        perform(#selector(PageController.growCachePolicyToHigh), with: nil, afterDelay: 2.0, inModes: [RunLoopMode.commonModes])
+        perform(#selector(PageController.growCachePolicyToHigh), with: nil, afterDelay: 2.0, inModes: [RunLoop.Mode.common])
     }
     
     @objc fileprivate func growCachePolicyToHigh() {
diff --git a/PageController/ProgressView.swift b/PageController/ProgressView.swift
index 26c4d6e..f8b6831 100644
--- a/PageController/ProgressView.swift
+++ b/PageController/ProgressView.swift
@@ -33,13 +33,13 @@ class ProgressView: UIView {
         gap = fabs(progress - pos)
         sign = progress > pos ? -1 : 1
         step = gap / 15.0
-        link?.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
+        link?.remove(from: RunLoop.main, forMode: RunLoop.Mode.common)
         let tempLink = CADisplayLink(target: self, selector: #selector(ProgressView.progressChanged))
-        tempLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+        tempLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
         link = tempLink
     }
     
-    func progressChanged() {
+    @objc func progressChanged() {
         if gap > 0.000001 {
             gap -= step
             if gap < 0.0 {
diff --git a/WMPageController-Swift.podspec b/WMPageController-Swift.podspec
index 1d12fc7..d410f77 100755
--- a/WMPageController-Swift.podspec
+++ b/WMPageController-Swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name         = "WMPageController-Swift"
-   s.version      = "1.4.0"
+   s.version      = "1.4.1"
    s.summary      = "An easy solution to page controllers like NetEase News.(Swift Implementation)"
    s.homepage     = "https://github.com/wangmchn/WMPageController-Swift"
    s.license      = 'MIT (LICENSE)'
@@ -13,4 +13,4 @@ Pod::Spec.new do |s|
 
    s.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
    s.requires_arc = true
- end
\ No newline at end of file
+ end