Update ACME Browser for iOS Swift project for Swift 4

Author: Kyle Swank

Demos/WebView Demo for iOS Swift/WebView Demo for iOS Swift.xcodeproj/project.pbxproj

@@ -110,7 +110,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "AgileBits Inc.";
 				TargetAttributes = {
 					C0525F661B05831F003613F5 = {
@@ -183,13 +183,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -231,13 +239,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -258,6 +274,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_INSTALL_OBJC_HEADER = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "WebView Demo for iOS Swift/WebView Demo for iOS Swift-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 2.3;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -274,7 +291,7 @@
 				PRODUCT_NAME = "WebView Demo for iOS Swift";
 				SWIFT_OBJC_BRIDGING_HEADER = "WebView Demo for iOS Swift/WebView Demo for iOS Swift-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -289,7 +306,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.agilebits.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "WebView Demo for iOS Swift";
 				SWIFT_OBJC_BRIDGING_HEADER = "WebView Demo for iOS Swift/WebView Demo for iOS Swift-Bridging-Header.h";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Demos/WebView Demo for iOS Swift/WebView Demo for iOS Swift/AppDelegate.swift

@@ -13,30 +13,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	var window: UIWindow?
 
-	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 		// Override point for customization after application launch.
 		return true
 	}
 
-	func applicationWillResignActive(application: UIApplication) {
+	func applicationWillResignActive(_ application: UIApplication) {
 		// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
 		// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
 	}
 
-	func applicationDidEnterBackground(application: UIApplication) {
+	func applicationDidEnterBackground(_ application: UIApplication) {
 		// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
 		// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 	}
 
-	func applicationWillEnterForeground(application: UIApplication) {
+	func applicationWillEnterForeground(_ application: UIApplication) {
 		// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 	}
 
-	func applicationDidBecomeActive(application: UIApplication) {
+	func applicationDidBecomeActive(_ application: UIApplication) {
 		// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 	}
 
-	func applicationWillTerminate(application: UIApplication) {
+	func applicationWillTerminate(_ application: UIApplication) {
 		// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 	}
 

Demos/WebView Demo for iOS Swift/WebView Demo for iOS Swift/WebViewController.swift

@@ -17,114 +17,113 @@ class WebViewController: UIViewController, UISearchBarDelegate, WKNavigationDele
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
-		self.onepasswordFillButton.hidden = (false == OnePasswordExtension.sharedExtension().isAppExtensionAvailable())
+		self.onepasswordFillButton.isHidden = (false == OnePasswordExtension.shared().isAppExtensionAvailable())
 
 		let configuration = WKWebViewConfiguration()
 
 		self.webView = WKWebView(frame: self.webViewContainer.bounds, configuration: configuration)
-		self.webView.autoresizingMask = UIViewAutoresizing(arrayLiteral: .FlexibleHeight, .FlexibleWidth)
+		self.webView.autoresizingMask = UIViewAutoresizing(arrayLiteral: .flexibleHeight, .flexibleWidth)
 		self.webView.navigationDelegate = self
 		self.webViewContainer.addSubview(self.webView)
 
-		let htmlFilePath = NSBundle.mainBundle().pathForResource("welcome", ofType: "html")
+		let htmlFilePath = Bundle.main.path(forResource: "welcome", ofType: "html")
 		var htmlString : String!
 		do {
-			htmlString = try String(contentsOfFile: htmlFilePath!, encoding: NSUTF8StringEncoding)
+			htmlString = try String(contentsOfFile: htmlFilePath!, encoding: String.Encoding.utf8)
 		}
 		catch {
-			print("Failed to obtain the html string from file \(htmlFilePath) with error: <\(error)>")
+			print("Failed to obtain the html string from file \(String(describing: htmlFilePath)) with error: <\(String(describing: error))>")
 		}
 
-		self.webView.loadHTMLString(htmlString, baseURL: NSURL(string: "https://agilebits.com"))
+		self.webView.loadHTMLString(htmlString, baseURL: URL(string: "https://agilebits.com"))
 	}
 
-	@IBAction func fillUsing1Password(sender: AnyObject) -> Void {
-		OnePasswordExtension.sharedExtension().fillItemIntoWebView(self.webView, forViewController: self, sender: sender, showOnlyLogins: false) { (success, error) -> Void in
+	@IBAction func fillUsing1Password(_ sender: AnyObject) -> Void {
+		OnePasswordExtension.shared().fillItem(intoWebView: self.webView, for: self, sender: sender, showOnlyLogins: false) { (success, error) -> Void in
 			if success == false {
-				print("Failed to fill into webview: <\(error)>")
+				print("Failed to fill into webview: <\(String(describing: error))>")
 			}
 		}
 	}
 
-	@IBAction func goBack(sender: AnyObject) -> Void {
+	@IBAction func goBack(_ sender: AnyObject) -> Void {
 		let navigation = self.webView.goBack()
 
 		if navigation == nil {
-			let htmlFilePath = NSBundle.mainBundle().pathForResource("welcome", ofType: "html")
+			let htmlFilePath = Bundle.main.path(forResource: "welcome", ofType: "html")
 			var htmlString : String!
 			do {
-				htmlString = try String(contentsOfFile: htmlFilePath!, encoding: NSUTF8StringEncoding)
+				htmlString = try String(contentsOfFile: htmlFilePath!, encoding: String.Encoding.utf8)
 			}
 			catch {
-				print("Failed to obtain the html string from file \(htmlFilePath) with error: <\(error)>")
+				print("Failed to obtain the html string from file \(String(describing: htmlFilePath)) with error: <\(String(describing: error))>")
 			}
 
-			self.webView.loadHTMLString(htmlString, baseURL: NSURL(string: "https://agilebits.com"))
+			self.webView.loadHTMLString(htmlString, baseURL: URL(string: "https://agilebits.com"))
 		}
 	}
-	@IBAction func goForward(sender: AnyObject) -> Void {
+	@IBAction func goForward(_ sender: AnyObject) -> Void {
 		self.webView.goForward()
 	}
 
 	// UISearchBarDelegate
 	func searchBarSearchButtonClicked(searchBar: UISearchBar) {
-		self.performSearch(searchBar.text)
+		self.performSearch(text: searchBar.text)
 	}
 
 	func searchBarTextDidEndEditing(searchBar: UISearchBar) {
-		self.performSearch(searchBar.text)
+		self.performSearch(text: searchBar.text)
 	}
 
 	func handleSearch(searchBar: UISearchBar) {
-		self.performSearch(searchBar.text)
+		self.performSearch(text: searchBar.text)
 	}
 
 	func searchBarCancelButtonClicked(searchBar: UISearchBar) {
-		self.performSearch(searchBar.text)
+		self.performSearch(text: searchBar.text)
 	}
 
 	// Convenience
 	func performSearch(text: String!) {
-		let lowercaseText = text.lowercaseStringWithLocale(NSLocale.currentLocale())
-		var URL: NSURL?
+		let lowercaseText = text.lowercased(with: NSLocale.current)
+		var url: URL?
 
-		let hasSpaces = lowercaseText.rangeOfString(" ") != nil
-		let hasDots = lowercaseText.rangeOfString(".") != nil
+		let hasSpaces = lowercaseText.range(of: " ") != nil
+		let hasDots = lowercaseText.range(of: ".") != nil
 
 		let search: Bool = !hasSpaces || !hasDots
 		if (search) {
 			let hasScheme = lowercaseText.hasPrefix("http:") || lowercaseText.hasPrefix("https:")
 			if (hasScheme) {
-				URL = NSURL(string: lowercaseText)
+				url = URL(string: lowercaseText)
 			}
 			else {
-				URL = NSURL(string: "https://".stringByAppendingString(lowercaseText))
+				url = URL(string: "https://" + lowercaseText)
 			}
 		}
 
-		if (URL == nil) {
-			let URLComponents = NSURLComponents()
-			URLComponents.scheme = "https"
-			URLComponents.host = "www.google.com"
-			URLComponents.path = "/search"
+		if (url == nil) {
+			let urlComponents = NSURLComponents()
+			urlComponents.scheme = "https"
+			urlComponents.host = "www.google.com"
+			urlComponents.path = "/search"
 
-			let queryItem = NSURLQueryItem(name: "q", value: text)
-			URLComponents.queryItems = [queryItem]
+			let queryItem = URLQueryItem(name: "q", value: text)
+			urlComponents.queryItems = [queryItem]
 
-			URL = URLComponents.URL
+			url = urlComponents.url
 		}
 
-		self.searchBar.text = URL?.absoluteString
+		self.searchBar.text = url?.absoluteString
 		self.searchBar.resignFirstResponder()
 
-		let request = NSURLRequest(URL: URL!)
-		self.webView.loadRequest(request)
+		let request = URLRequest(url: url!)
+		self.webView.load(request)
 	}
 
 	// WKNavigationDelegate
-
-	func webView(webView: WKWebView, didFinishNavigation navigation: WKNavigation!) {
-		self.searchBar.text = webView.URL?.absoluteString
+	func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+		self.searchBar.text = webView.url?.absoluteString
 
 		if self.searchBar.text == "about:blank" {
 			self.searchBar.text = ""