Merge pull request #115 from turbolinks/swift-4

zachwaugh · web-flow · commit cab8da6ba1bc · 2017-11-16T10:53:25.000-05:00
Swift 4
diff --git a/Turbolinks.xcodeproj/project.pbxproj b/Turbolinks.xcodeproj/project.pbxproj
@@ -184,11 +184,11 @@
 				TargetAttributes = {
 					1FC167EE1B55A14900AA6F43 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 					92DF45061C80F7960064E606 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0910;
 					};
 				};
 			};
@@ -310,7 +310,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -360,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -382,13 +382,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Turbolinks/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.basecamp.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -403,12 +402,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Turbolinks/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.basecamp.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -423,7 +421,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.basecamp.Turbolinks.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -436,7 +434,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.basecamp.Turbolinks.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Turbolinks/VisitableView.swift b/Turbolinks/VisitableView.swift
@@ -82,7 +82,7 @@ open class VisitableView: UIView {
         refreshControl.removeFromSuperview()
     }
 
-    func refresh(_ sender: AnyObject) {
+    @objc func refresh(_ sender: AnyObject) {
         visitable?.visitableViewDidRequestRefresh()
     }
 
diff --git a/Turbolinks/WebView.swift b/Turbolinks/WebView.swift
@@ -107,7 +107,9 @@ class WebView: WKWebView {
 
         if let data = try? JSONSerialization.data(withJSONObject: arguments, options: []),
             let string = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as String? {
-                return string[string.characters.index(after: string.startIndex) ..< string.characters.index(before: string.endIndex)]
+                let startIndex = string.index(after: string.startIndex)
+                let endIndex = string.index(before: string.endIndex)
+                return String(string[startIndex..<endIndex])
         }
         
         return nil
diff --git a/TurbolinksDemo.xcodeproj/project.pbxproj b/TurbolinksDemo.xcodeproj/project.pbxproj
@@ -222,10 +222,10 @@
 				TargetAttributes = {
 					1FC168131B55A16C00AA6F43 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 					8442C5A41C9F83D100FD8CC7 = {
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 				};
 			};
@@ -458,7 +458,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.basecamp.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -471,7 +471,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.basecamp.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -484,7 +484,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.basecamp.TurbolinksDemo.UITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = TurbolinksDemo;
 				USES_XCTRUNNER = YES;
 			};
@@ -498,7 +498,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.basecamp.TurbolinksDemo.UITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = TurbolinksDemo;
 				USES_XCTRUNNER = YES;
 			};
diff --git a/TurbolinksDemo/Base.lproj/Main.storyboard b/TurbolinksDemo/Base.lproj/Main.storyboard
@@ -1,15 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="tbq-el-AUE">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="tbq-el-AUE">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application Controller-->
         <scene sceneID="Z6f-pY-U74">
             <objects>
                 <navigationController id="tbq-el-AUE" customClass="ApplicationController" customModule="TurbolinksDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Wy5-gK-0jd">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                 </navigationController>
diff --git a/TurbolinksDemo/DemoViewController.swift b/TurbolinksDemo/DemoViewController.swift
@@ -20,7 +20,7 @@ class DemoViewController: Turbolinks.VisitableViewController {
         view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: [], metrics: nil, views: [ "view": errorView ]))
     }
 
-    func retry(_ sender: AnyObject) {
+    @objc func retry(_ sender: AnyObject) {
         errorView.removeFromSuperview()
         reloadVisitable()
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ open class VisitableView: UIView {`
`82`	`82`	`refreshControl.removeFromSuperview()`
`83`	`83`	`}`
`84`	`84`
`85`		`- func refresh(_ sender: AnyObject) {`
	`85`	`+ @objc func refresh(_ sender: AnyObject) {`
`86`	`86`	`visitable?.visitableViewDidRequestRefresh()`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ class WebView: WKWebView {`
`107`	`107`
`108`	`108`	`if let data = try? JSONSerialization.data(withJSONObject: arguments, options: []),`
`109`	`109`	`let string = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as String? {`
`110`		`- return string[string.characters.index(after: string.startIndex) ..< string.characters.index(before: string.endIndex)]`
	`110`	`+ let startIndex = string.index(after: string.startIndex)`
	`111`	`+ let endIndex = string.index(before: string.endIndex)`
	`112`	`+ return String(string[startIndex..<endIndex])`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DemoViewController: Turbolinks.VisitableViewController {`
`20`	`20`	`view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:\|[view]\|", options: [], metrics: nil, views: [ "view": errorView ]))`
`21`	`21`	`}`
`22`	`22`
`23`		`- func retry(_ sender: AnyObject) {`
	`23`	`+ @objc func retry(_ sender: AnyObject) {`
`24`	`24`	`errorView.removeFromSuperview()`
`25`	`25`	`reloadVisitable()`
`26`	`26`	`}`