Upgrade to Swift 5.3

sindresorhus · Sep 16, 2020 · 7e1a6c9 · 7e1a6c9
1 parent 6f934d2
commit 7e1a6c9
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 109 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -119,7 +119,6 @@ whitelist_rules:
   - unneeded_parentheses_in_closure_argument
   - unowned_variable_capture
   - untyped_error_in_catch
-  - unused_capture_list
   - unused_closure_parameter
   - unused_control_flow_label
   - unused_enumerated

diff --git a/Plash.xcodeproj/project.pbxproj b/Plash.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1120;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Sindre Sorhus";
 				TargetAttributes = {
 					E324212F2384E9D700D28A91 = {
@@ -212,7 +212,7 @@
 				};
 			};
 			buildConfigurationList = E324212B2384E9D700D28A91 /* Build configuration list for PBXProject "Plash" */;
-			compatibilityVersion = "Xcode 11.4";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -350,6 +350,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -410,6 +411,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/Plash.xcodeproj/xcshareddata/xcschemes/Plash.xcscheme b/Plash.xcodeproj/xcshareddata/xcschemes/Plash.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Plash/AppDelegate.swift b/Plash/AppDelegate.swift
@@ -111,8 +111,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 			return
 		}
 
-		reloadTimer = Timer.scheduledTimer(withTimeInterval: reloadInterval, repeats: true) { _ in
-			self.loadUserURL()
+		reloadTimer = Timer.scheduledTimer(withTimeInterval: reloadInterval, repeats: true) { [self] _ in
+			loadUserURL()
 		}
 	}
 
@@ -160,8 +160,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
 		// TODO: Add a callback to `loadURL` when it's done loading instead.
 		// TODO: Fade in the web view.
-		delay(seconds: 1) {
-			self.desktopWindow.contentView?.isHidden = false
+		delay(seconds: 1) { [self] in
+			desktopWindow.contentView?.isHidden = false
 		}
 	}
 
@@ -185,8 +185,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 			panel.directoryURL = url
 		}
 
-		panel.begin {
+		panel.begin { [weak self] in
 			guard
+				let self = self,
 				$0 == .OK,
 				let url = panel.url
 			else {

diff --git a/Plash/Assets.xcassets/MenuBarIcon.imageset/Contents.json b/Plash/Assets.xcassets/MenuBarIcon.imageset/Contents.json
@@ -1,21 +1,16 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "MenuBarIcon.pdf",
-      "scale" : "2x"
+      "filename" : "MenuBarIcon.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template",
-    "preserves-vector-representation" : true
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
   }
-}
+}
diff --git a/Plash/Assets.xcassets/MenuBarIcon.imageset/MenuBarIcon.pdf b/Plash/Assets.xcassets/MenuBarIcon.imageset/MenuBarIcon.pdf
diff --git a/Plash/Assets.xcassets/MenuBarIcon.imageset/MenuBarIcon.svg b/Plash/Assets.xcassets/MenuBarIcon.imageset/MenuBarIcon.svg
diff --git a/Plash/Events.swift b/Plash/Events.swift
@@ -4,95 +4,95 @@ import KeyboardShortcuts
 
 extension AppDelegate {
 	func setUpEvents() {
-		menu.onUpdate = { _ in
-			self.updateMenu()
+		menu.onUpdate = { [self] _ in
+			updateMenu()
 		}
 
-		webViewController.onLoaded = { error in
-			self.webViewError = error
+		webViewController.onLoaded = { [self] error in
+			webViewError = error
 
 			guard error == nil else {
 				return
 			}
 
 			// Set the persisted zoom level.
-			let zoomLevel = self.webViewController.webView.zoomLevelWrapper
+			let zoomLevel = webViewController.webView.zoomLevelWrapper
 			if zoomLevel != 1 {
-				self.webViewController.webView.zoomLevelWrapper = zoomLevel
+				webViewController.webView.zoomLevelWrapper = zoomLevel
 			}
 
 			if let url = Defaults[.url] {
-				let title = self.webViewController.webView.title.map { "\($0)\n" } ?? ""
+				let title = webViewController.webView.title.map { "\($0)\n" } ?? ""
 				let urlString = url.isFileURL ? url.lastPathComponent : url.absoluteString
-				self.statusItemButton.toolTip = "\(title)\(urlString)"
+				statusItemButton.toolTip = "\(title)\(urlString)"
 			} else {
-				self.statusItemButton.toolTip = ""
+				statusItemButton.toolTip = ""
 			}
 		}
 
-		powerSourceWatcher?.onChange = { _ in
+		powerSourceWatcher?.onChange = { [self] _ in
 			guard Defaults[.deactivateOnBattery] else {
 				return
 			}
 
-			self.setEnabledStatus()
+			setEnabledStatus()
 		}
 
 		NSWorkspace.shared.notificationCenter
 			.publisher(for: NSWorkspace.didWakeNotification)
-			.sink { _ in
-				self.loadUserURL()
+			.sink { [self] _ in
+				loadUserURL()
 			}
 			.store(in: &cancellables)
 
-		Defaults.observe(.url, options: []) { change in
-			self.resetTimer()
-			self.loadURL(change.newValue)
+		Defaults.observe(.url, options: []) { [self] change in
+			resetTimer()
+			loadURL(change.newValue)
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.opacity) { change in
-			self.isBrowsingMode = false
-			self.desktopWindow.alphaValue = CGFloat(change.newValue)
+		Defaults.observe(.opacity) { [self] change in
+			isBrowsingMode = false
+			desktopWindow.alphaValue = CGFloat(change.newValue)
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.reloadInterval) { _ in
-			self.resetTimer()
+		Defaults.observe(.reloadInterval) { [self] _ in
+			resetTimer()
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.display, options: []) { change in
-			self.desktopWindow.targetScreen = change.newValue.screen
+		Defaults.observe(.display, options: []) { [self] change in
+			desktopWindow.targetScreen = change.newValue.screen
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.invertColors, options: []) { _ in
-			self.recreateWebViewAndReload()
+		Defaults.observe(.invertColors, options: []) { [self] _ in
+			recreateWebViewAndReload()
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.customCSS, options: []) { _ in
-			self.recreateWebViewAndReload()
+		Defaults.observe(.customCSS, options: []) { [self] _ in
+			recreateWebViewAndReload()
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.deactivateOnBattery) { _ in
-			self.setEnabledStatus()
+		Defaults.observe(.deactivateOnBattery) { [self] _ in
+			setEnabledStatus()
 		}
 			.tieToLifetime(of: self)
 
-		Defaults.observe(.showOnAllSpaces) { change in
-			self.desktopWindow.collectionBehavior.toggleExistence(.canJoinAllSpaces, shouldExist: change.newValue)
+		Defaults.observe(.showOnAllSpaces) { [self] change in
+			desktopWindow.collectionBehavior.toggleExistence(.canJoinAllSpaces, shouldExist: change.newValue)
 		}
 			.tieToLifetime(of: self)
 
-		KeyboardShortcuts.onKeyUp(for: .toggleBrowsingMode) {
-			self.isBrowsingMode.toggle()
+		KeyboardShortcuts.onKeyUp(for: .toggleBrowsingMode) { [self] in
+			isBrowsingMode.toggle()
 		}
 
-		KeyboardShortcuts.onKeyUp(for: .reload) {
-			self.loadUserURL()
+		KeyboardShortcuts.onKeyUp(for: .reload) { [self] in
+			loadUserURL()
 		}
 	}
 }
diff --git a/Plash/Menus.swift b/Plash/Menus.swift
@@ -111,8 +111,8 @@ extension AppDelegate {
 			key: "o",
 			keyModifiers: .option,
 			isEnabled: isEnabled
-		) { _ in
-			self.openLocalWebsite()
+		) { [weak self] _ in
+			self?.openLocalWebsite()
 		}
 
 		menu.addSeparator()
@@ -121,17 +121,17 @@ extension AppDelegate {
 			"Reload",
 			key: "r",
 			isEnabled: isEnabled && Defaults[.url] != nil
-		) { _ in
-			self.loadUserURL()
+		) { [weak self] _ in
+			self?.loadUserURL()
 		}
 
 		menu.addCallbackItem(
 			"Browsing Mode",
 			key: "b",
 			isEnabled: isEnabled && Defaults[.url] != nil,
 			isChecked: isBrowsingMode
-		) { _ in
-			self.isBrowsingMode.toggle()
+		) { [weak self] _ in
+			self?.isBrowsingMode.toggle()
 		}
 
 		menu.addSeparator()

diff --git a/Plash/OpenURLView.swift b/Plash/OpenURLView.swift
@@ -28,7 +28,7 @@ struct OpenURLView: View {
 					HStack(spacing: 3) {
 						Text("You could, for example,")
 						Button("show the time.") {
-							self.urlString = "https://time.pablopunk.com/?seconds&fg=white&bg=transparent"
+							urlString = "https://time.pablopunk.com/?seconds&fg=white&bg=transparent"
 						}
 							.buttonStyle(LinkButtonStyle())
 					}
@@ -44,17 +44,19 @@ struct OpenURLView: View {
 				"sindresorhus.com",
 				// `removingNewlines` is a workaround for a SwiftUI bug where it doesn't respect the line limit when pasting in multiple lines.
 				// TODO: Report to Apple.
+				// TODO: Check if it's fixed on macOS 11.
 				text: $urlString.setMap(\.removingNewlines)
 			)
 				.lineLimit(1)
 				.frame(minWidth: 400)
 				.padding(.vertical)
+			// TODO: Use `Button` when targeting macOS 11.
 			NativeButton("Open", keyEquivalent: .return) {
-				guard let url = URL(string: self.normalizedUrlString) else {
+				guard let url = URL(string: normalizedUrlString) else {
 					return
 				}
 
-				self.loadHandler(url)
+				loadHandler(url)
 			}
 				.disabled(!URL.isValid(string: normalizedUrlString))
 		}

diff --git a/Plash/PreferencesView.swift b/Plash/PreferencesView.swift
@@ -157,7 +157,7 @@ private struct ClearWebsiteDataPreference: View {
 
 	var body: some View {
 		Button("Clear Website Data") {
-			self.hasCleared = true
+			hasCleared = true
 			AppDelegate.shared.webViewController.webView.clearWebsiteData(completion: nil)
 		}
 			.disabled(hasCleared)

diff --git a/Plash/SSWebView.swift b/Plash/SSWebView.swift
@@ -58,16 +58,16 @@ final class SSWebView: WKWebView {
 
 		menu.addSeparator()
 
-		menu.addCallbackItem("Actual Size", isEnabled: zoomLevel != 1) { _ in
-			self.zoomLevelWrapper = 1
+		menu.addCallbackItem("Actual Size", isEnabled: zoomLevel != 1) { [weak self] _ in
+			self?.zoomLevelWrapper = 1
 		}
 
-		menu.addCallbackItem("Zoom In") { _ in
-			self.zoomLevelWrapper += 0.2
+		menu.addCallbackItem("Zoom In") { [weak self] _ in
+			self?.zoomLevelWrapper += 0.2
 		}
 
-		menu.addCallbackItem("Zoom Out") { _ in
-			self.zoomLevelWrapper -= 0.2
+		menu.addCallbackItem("Zoom Out") { [weak self] _ in
+			self?.zoomLevelWrapper -= 0.2
 		}
 
 		// Move the “Inspect Element” menu item to the end.
@@ -84,7 +84,7 @@ final class SSWebView: WKWebView {
 extension SSWebView {
 	// TODO: Use https://developer.apple.com/documentation/webkit/wkwebview/3516411-pagezoom instead when macOS 10.15.4 is out.
 	private var zoomLevelDefaultsKey: Defaults.Key<Double?>? {
-		guard let url = self.url?.normalized(removeFragment: true, removeQuery: true) else {
+		guard let url = url?.normalized(removeFragment: true, removeQuery: true) else {
 			return nil
 		}
 
@@ -93,7 +93,7 @@ extension SSWebView {
 
 	var zoomLevelDefaultsValue: Double? {
 		guard
-			let zoomLevelDefaultsKey = self.zoomLevelDefaultsKey,
+			let zoomLevelDefaultsKey = zoomLevelDefaultsKey,
 			let zoomLevel = Defaults[zoomLevelDefaultsKey]
 		else {
 			return nil