Upgrade to Swift 5.3

sindresorhus · Sep 16, 2020 · 29cab37 · 29cab37
1 parent 84cdafd
commit 29cab37
Show file tree

Hide file tree

Showing 14 changed files with 149 additions and 117 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -124,7 +124,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/Gifski.xcodeproj/project.pbxproj b/Gifski.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -324,7 +324,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Sindre Sorhus";
 				TargetAttributes = {
 					0E79251A2329BDBE00058B94 = {
@@ -345,7 +345,7 @@
 				};
 			};
 			buildConfigurationList = E3AE627E1E5CD2F300035A2F /* Build configuration list for PBXProject "Gifski" */;
-			compatibilityVersion = "Xcode 11.4";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -614,6 +614,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;
@@ -674,6 +675,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/Gifski.xcodeproj/xcshareddata/xcschemes/Gifski.xcscheme b/Gifski.xcodeproj/xcshareddata/xcschemes/Gifski.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Gifski/Assets.xcassets/ButtonTextColor.colorset/Contents.json b/Gifski/Assets.xcassets/ButtonTextColor.colorset/Contents.json
@@ -1,23 +1,18 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "mac",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0xFF",
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF"
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
         }
-      }
+      },
+      "idiom" : "universal"
     },
     {
-      "idiom" : "mac",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -27,12 +22,17 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0x00",
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00"
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Gifski/Assets.xcassets/ProgressCircleColor.colorset/Contents.json b/Gifski/Assets.xcassets/ProgressCircleColor.colorset/Contents.json
@@ -1,18 +1,13 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "mac",
       "color" : {
         "platform" : "osx",
         "reference" : "controlAccentColor"
-      }
+      },
+      "idiom" : "universal"
     },
     {
-      "idiom" : "mac",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -22,7 +17,12 @@
       "color" : {
         "platform" : "osx",
         "reference" : "labelColor"
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Gifski/Assets.xcassets/ShadowColor.colorset/Contents.json b/Gifski/Assets.xcassets/ShadowColor.colorset/Contents.json
@@ -1,41 +1,18 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0.000",
           "alpha" : "0.500",
           "blue" : "0.000",
-          "green" : "0.000"
+          "green" : "0.000",
+          "red" : "0.000"
         }
-      }
+      },
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.000",
-          "alpha" : "0.500",
-          "blue" : "0.000",
-          "green" : "0.000"
-        }
-      }
-    },
-    {
-      "idiom" : "universal",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -45,12 +22,17 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0.000",
           "alpha" : "0.800",
           "blue" : "0.000",
-          "green" : "0.000"
+          "green" : "0.000",
+          "red" : "0.000"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Gifski/ConversionViewController.swift b/Gifski/ConversionViewController.swift
@@ -76,11 +76,11 @@ final class ConversionViewController: NSViewController {
 		timeRemainingEstimator.start()
 
 		progress?.performAsCurrent(withPendingUnitCount: 1) { [weak self] in
-			gifski.run(conversion) { result in
-				guard let self = self else {
-					return
-				}
+			guard let self = self else {
+				return
+			}
 
+			gifski.run(conversion) { result in
 				do {
 					let gifUrl = try self.generateTemporaryGifUrl(for: conversion.video)
 					try result.get().write(to: gifUrl, options: .atomic)

diff --git a/Gifski/DraggableFile.swift b/Gifski/DraggableFile.swift
@@ -16,7 +16,7 @@ final class DraggableFile: NSImageView {
 	var fileUrl: URL? {
 		didSet {
 			guard
-				let fileUrl = self.fileUrl,
+				let fileUrl = fileUrl,
 				let image = NSImage(contentsOf: fileUrl)
 			else {
 				return
@@ -51,8 +51,8 @@ final class DraggableFile: NSImageView {
 
 	override func mouseDragged(with event: NSEvent) {
 		guard
-			let fileUrl = self.fileUrl,
-			let image = self.image
+			let fileUrl = fileUrl,
+			let image = image
 		else {
 			return
 		}

diff --git a/Gifski/EditVideoViewController.swift b/Gifski/EditVideoViewController.swift
@@ -342,11 +342,11 @@ final class EditVideoViewController: NSViewController {
 
 	private func estimateFileSize() {
 		let duration: Double = {
-			if let timeRange = self.timeRange {
-				return timeRange.upperBound - timeRange.lowerBound
-			} else {
+			guard let timeRange = timeRange else {
 				return videoMetadata.duration
 			}
+
+			return timeRange.upperBound - timeRange.lowerBound
 		}()
 
 		let frameCount = duration * frameRateSlider.doubleValue
@@ -376,8 +376,8 @@ final class EditVideoViewController: NSViewController {
 
 	private func updateSelectedItemAsCustomWithSize() {
 		let newType: DimensionsType = resizableDimensions.currentDimensions.type == .percent ? .pixels : .percent
-		let resizableDimensions = self.resizableDimensions.changed(dimensionsType: newType)
-		let selectedCustomTitle = "Custom - \(resizableDimensions.currentDimensions)"
+		let newResizableDimensions = resizableDimensions.changed(dimensionsType: newType)
+		let selectedCustomTitle = "Custom - \(newResizableDimensions.currentDimensions)"
 		predefinedSizesDropdown.item(at: 0)?.title = selectedCustomTitle
 		predefinedSizesDropdown.selectItem(at: 0)
 	}

diff --git a/Gifski/MainWindowController.swift b/Gifski/MainWindowController.swift
@@ -7,7 +7,7 @@ final class MainWindowController: NSWindowController {
 		window?.contentViewController is ConversionViewController
 	}
 
-	private func showWelcomeScreen() {
+	private func showWelcomeScreenIfNeeded() {
 		guard App.isFirstLaunch else {
 			return
 		}
@@ -63,7 +63,7 @@ final class MainWindowController: NSWindowController {
 		NSApp.activate(ignoringOtherApps: false)
 		window.makeKeyAndOrderFront(nil)
 
-		showWelcomeScreen()
+		showWelcomeScreenIfNeeded()
 	}
 
 	func presentOpenPanel() {

diff --git a/Gifski/TimeRemainingEstimator.swift b/Gifski/TimeRemainingEstimator.swift
@@ -114,24 +114,24 @@ final class TimeRemainingEstimator {
 	}
 
 	private func fadeInLabel() {
-		DispatchQueue.main.async {
-			if self.label.isHidden {
-				self.label.fadeIn()
+		DispatchQueue.main.async { [self] in
+			if label.isHidden {
+				label.fadeIn()
 			}
 		}
 	}
 
 	private func fadeOutLabel() {
-		DispatchQueue.main.async {
-			if !self.label.isHidden {
-				self.label.fadeOut()
+		DispatchQueue.main.async { [self] in
+			if !label.isHidden {
+				label.fadeOut()
 			}
 		}
 	}
 
 	private func updateLabel() {
-		DispatchQueue.main.async {
-			self.label.text = self.formattedTimeRemaining ?? ""
+		DispatchQueue.main.async { [self] in
+			label.text = formattedTimeRemaining ?? ""
 		}
 	}
 }