Update to Swift 4.2

pietervisser · Sep 24, 2018 · 544cf84 · 544cf84
1 parent 61a6773
commit 544cf84
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Turbolinks.xcodeproj/project.pbxproj b/Turbolinks.xcodeproj/project.pbxproj
@@ -391,7 +391,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -410,7 +410,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.basecamp.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Turbolinks/Session.swift b/Turbolinks/Session.swift
@@ -199,7 +199,7 @@ extension Session: VisitableDelegate {
     public func visitableViewWillAppear(_ visitable: Visitable) {
         guard let topmostVisit = self.topmostVisit, let currentVisit = self.currentVisit else { return }
 
-        if visitable === topmostVisit.visitable && visitable.visitableViewController.isMovingToParentViewController {
+        if visitable === topmostVisit.visitable && visitable.visitableViewController.isMovingToParent {
             // Back swipe gesture canceled
             if topmostVisit.state == .completed {
                 currentVisit.cancel()

diff --git a/Turbolinks/VisitableView.swift b/Turbolinks/VisitableView.swift
@@ -89,7 +89,7 @@ open class VisitableView: UIView {
     // MARK: Activity Indicator
 
     open lazy var activityIndicatorView: UIActivityIndicatorView = {
-        let view = UIActivityIndicatorView(activityIndicatorStyle: .white)
+        let view = UIActivityIndicatorView(style: .white)
         view.translatesAutoresizingMaskIntoConstraints = false
         view.color = UIColor.gray
         view.hidesWhenStopped = true
@@ -104,7 +104,7 @@ open class VisitableView: UIView {
     open func showActivityIndicator() {
         if !isRefreshing {
             activityIndicatorView.startAnimating()
-            bringSubview(toFront: activityIndicatorView)
+            bringSubviewToFront(activityIndicatorView)
         }
     }
 

diff --git a/Turbolinks/WebView.swift b/Turbolinks/WebView.swift
@@ -35,7 +35,7 @@ class WebView: WKWebView {
         configuration.userContentController.add(self, name: "turbolinks")
 
         translatesAutoresizingMaskIntoConstraints = false
-        scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
+        scrollView.decelerationRate = UIScrollView.DecelerationRate.normal
 
         if #available(iOS 11, *) {
             scrollView.contentInsetAdjustmentBehavior = .never