Require macOS 11 and rewrite the app

Author: sindresorhus

Diff for: .github/funding.yml

@@ -1,4 +1,4 @@
-whitelist_rules:
+only_rules:
   - anyobject_protocol
   - array_init
   - block_based_kvo
@@ -35,7 +35,7 @@ whitelist_rules:
   - empty_parentheses_with_trailing_closure
   - empty_string
   - empty_xctest_method
-  - enum_case_associated_value_count
+  - enum_case_associated_values_count
   - explicit_init
   - fallthrough
   - fatal_error_message
@@ -48,6 +48,7 @@ whitelist_rules:
   - identifier_name
   - implicit_getter
   - implicit_return
+  - inclusive_language
   - inert_defer
   - is_disjoint
   - joined_default_parameter
@@ -86,7 +87,6 @@ whitelist_rules:
   - private_action
   - private_outlet
   - private_unit_test
-  - prohibited_nan_comparison
   - prohibited_super_call
   - protocol_property_accessors_order
   - reduce_boolean
@@ -100,7 +100,6 @@ whitelist_rules:
   - redundant_type_annotation
   - redundant_void_return
   - required_enum_case
-  - return_value_from_void_function
   - return_arrow_whitespace
   - shorthand_operator
   - sorted_first_last
@@ -111,19 +110,19 @@ whitelist_rules:
   - switch_case_alignment
   - switch_case_on_newline
   - syntactic_sugar
+  - test_case_accessibility
   - toggle_bool
   - trailing_closure
   - trailing_comma
   - trailing_newline
   - trailing_semicolon
   - trailing_whitespace
-  - tuple_pattern
   - unavailable_function
   - unneeded_break_in_switch
-  - unneeded_notification_center_removal
   - unneeded_parentheses_in_closure_argument
   - unowned_variable_capture
   - untyped_error_in_catch
+  - unused_capture_list
   - unused_closure_parameter
   - unused_control_flow_label
   - unused_enumerated
@@ -135,16 +134,12 @@ whitelist_rules:
   - vertical_whitespace_closing_braces
   - vertical_whitespace_opening_braces
   - void_return
-  - weak_delegate
   - xct_specific_matcher
   - xctfail_message
   - yoda_condition
 analyzer_rules:
   - unused_declaration
   - unused_import
-force_cast: warning
-force_try: warning
-force_unwrapping: warning
 number_separator:
   minimum_length: 5
 identifier_name:
@@ -167,7 +162,7 @@ identifier_name:
     - 'y1'
     - 'y2'
 deployment_target:
-  macOS_deployment_target: '10.15.5'
+  macOS_deployment_target: '11'
 custom_rules:
   no_nsrect:
     regex: '\bNSRect\b'

Diff for: .swiftlint.yml

@@ -12,31 +12,31 @@
 		E337758A2486CB9200DBE2A0 /* AppCenterCrashes in Frameworks */ = {isa = PBXBuildFile; productRef = E33775892486CB9200DBE2A0 /* AppCenterCrashes */; };
 		E338690024AC782D0074DFF8 /* InternetAccessPolicy.json in Resources */ = {isa = PBXBuildFile; fileRef = E33868FF24AC782D0074DFF8 /* InternetAccessPolicy.json */; };
 		E353C8B4256BE26800D08A09 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E353C8B3256BE26800D08A09 /* WelcomeView.swift */; };
-		E3A7F1DD23F7DAD400CDF428 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A7F1DC23F7DAD400CDF428 /* AppDelegate.swift */; };
+		E3A7F1DD23F7DAD400CDF428 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A7F1DC23F7DAD400CDF428 /* App.swift */; };
 		E3A7F1DF23F7DAD400CDF428 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A7F1DE23F7DAD400CDF428 /* ContentView.swift */; };
 		E3A7F1E123F7DAD700CDF428 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E3A7F1E023F7DAD700CDF428 /* Assets.xcassets */; };
 		E3A7F1E423F7DAD700CDF428 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E3A7F1E323F7DAD700CDF428 /* Preview Assets.xcassets */; };
-		E3A7F1E723F7DAD700CDF428 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E3A7F1E523F7DAD700CDF428 /* Main.storyboard */; };
 		E3A7F20F23F7E36000CDF428 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A7F20E23F7E36000CDF428 /* Utilities.swift */; };
 		E3A7F21223F8498F00CDF428 /* PasteboardContentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A7F21123F8498F00CDF428 /* PasteboardContentsView.swift */; };
 		E3BB8DC623FBDBCE007A3849 /* Pasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3BB8DC523FBDBCE007A3849 /* Pasteboard.swift */; };
+		E3E4394225FDF97A000DE4B8 /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3E4394125FDF97A000DE4B8 /* AppState.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		E31C294323FBE32200DF3442 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		E33868FF24AC782D0074DFF8 /* InternetAccessPolicy.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = InternetAccessPolicy.json; sourceTree = "<group>"; };
 		E353C8B3256BE26800D08A09 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
 		E3A7F1D923F7DAD400CDF428 /* Pasteboard Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Pasteboard Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		E3A7F1DC23F7DAD400CDF428 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		E3A7F1DC23F7DAD400CDF428 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		E3A7F1DE23F7DAD400CDF428 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		E3A7F1E023F7DAD700CDF428 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		E3A7F1E323F7DAD700CDF428 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		E3A7F1E623F7DAD700CDF428 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		E3A7F1E823F7DAD700CDF428 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E3A7F1E923F7DAD700CDF428 /* Pasteboard_Viewer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Pasteboard_Viewer.entitlements; sourceTree = "<group>"; };
 		E3A7F20E23F7E36000CDF428 /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
 		E3A7F21123F8498F00CDF428 /* PasteboardContentsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardContentsView.swift; sourceTree = "<group>"; };
 		E3BB8DC523FBDBCE007A3849 /* Pasteboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pasteboard.swift; sourceTree = "<group>"; };
+		E3E4394125FDF97A000DE4B8 /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,7 +72,8 @@
 		E3A7F1DB23F7DAD400CDF428 /* Pasteboard Viewer */ = {
 			isa = PBXGroup;
 			children = (
-				E3A7F1DC23F7DAD400CDF428 /* AppDelegate.swift */,
+				E3A7F1DC23F7DAD400CDF428 /* App.swift */,
+				E3E4394125FDF97A000DE4B8 /* AppState.swift */,
 				E31C294323FBE32200DF3442 /* Constants.swift */,
 				E3A7F1DE23F7DAD400CDF428 /* ContentView.swift */,
 				E3A7F21123F8498F00CDF428 /* PasteboardContentsView.swift */,
@@ -97,7 +98,6 @@
 		E3D883B124C898890001C032 /* Other */ = {
 			isa = PBXGroup;
 			children = (
-				E3A7F1E523F7DAD700CDF428 /* Main.storyboard */,
 				E3A7F1E823F7DAD700CDF428 /* Info.plist */,
 				E3A7F1E923F7DAD700CDF428 /* Pasteboard_Viewer.entitlements */,
 				E33868FF24AC782D0074DFF8 /* InternetAccessPolicy.json */,
@@ -173,7 +173,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				E338690024AC782D0074DFF8 /* InternetAccessPolicy.json in Resources */,
-				E3A7F1E723F7DAD700CDF428 /* Main.storyboard in Resources */,
 				E3A7F1E423F7DAD700CDF428 /* Preview Assets.xcassets in Resources */,
 				E3A7F1E123F7DAD700CDF428 /* Assets.xcassets in Resources */,
 			);
@@ -211,26 +210,16 @@
 				E3A7F20F23F7E36000CDF428 /* Utilities.swift in Sources */,
 				E3A7F21223F8498F00CDF428 /* PasteboardContentsView.swift in Sources */,
 				E3BB8DC623FBDBCE007A3849 /* Pasteboard.swift in Sources */,
+				E3E4394225FDF97A000DE4B8 /* AppState.swift in Sources */,
 				E3A7F1DF23F7DAD400CDF428 /* ContentView.swift in Sources */,
-				E3A7F1DD23F7DAD400CDF428 /* AppDelegate.swift in Sources */,
+				E3A7F1DD23F7DAD400CDF428 /* App.swift in Sources */,
 				E31C294423FBE32200DF3442 /* Constants.swift in Sources */,
 				E353C8B4256BE26800D08A09 /* WelcomeView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		E3A7F1E523F7DAD700CDF428 /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				E3A7F1E623F7DAD700CDF428 /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		E3A7F1EA23F7DAD700CDF428 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -283,7 +272,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15.5;
+				MACOSX_DEPLOYMENT_TARGET = 11.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -338,7 +327,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15.5;
+				MACOSX_DEPLOYMENT_TARGET = 11.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -355,7 +344,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_ASSET_PATHS = "\"Pasteboard Viewer/Preview Content\"";
 				DEVELOPMENT_TEAM = YG56YK5RN5;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -365,7 +354,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sindresorhus.Pasteboard-Viewer";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -381,7 +370,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_ASSET_PATHS = "\"Pasteboard Viewer/Preview Content\"";
 				DEVELOPMENT_TEAM = YG56YK5RN5;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -391,7 +380,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sindresorhus.Pasteboard-Viewer";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Diff for: Pasteboard Viewer.xcodeproj/project.pbxproj

@@ -0,0 +1,57 @@
+import SwiftUI
+import Defaults
+
+@main
+struct AppMain: App {
+	@NSApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
+	@StateObject private var appState = AppState()
+	// TODO: `@Default` doesn't update the state in the menu. Probably a macOS 11 bug. (macOS 11.3)
+	// @Default(.stayOnTop) private var stayOnTop
+	@AppStorage(.stayOnTop) private var stayOnTop
+	@State var window: NSWindow? // swiftlint:disable:this swiftui_state_private
+
+	var body: some Scene {
+		WindowGroup {
+			ContentView()
+				.environmentObject(appState)
+				.onAppear(perform: onAppear)
+				.bindNativeWindow($window)
+				.windowTabbingMode(.disallowed)
+				.windowLevel(stayOnTop ? .floating : .normal)
+				.eraseToAnyView() // This fixes an issue where the window size is not persisted. (macOS 11.3)
+		}
+			.commands {
+				CommandGroup(replacing: .newItem) {}
+				CommandGroup(after: .windowSize) {
+					Toggle("Stay On Top", isOn: $stayOnTop)
+				}
+				CommandGroup(replacing: .help) {
+					// TODO: `Link` doesn't yet work here. (macOS 11.3)
+					// Link("Website", destination: "https://sindresorhus.com/pasteboard-viewer")
+					Button("Website") {
+						"https://sindresorhus.com/pasteboard-viewer".openUrl()
+					}
+					Button("Rate on the App Store") {
+						"macappstore://apps.apple.com/app/id1499215709?action=write-review".openUrl()
+					}
+					Button("More Apps by Me") {
+						"macappstore://apps.apple.com/developer/id328077650".openUrl()
+					}
+					Divider()
+					Button("Send Feedback…") {
+						SSApp.openSendFeedbackPage()
+					}
+				}
+			}
+	}
+
+	private func onAppear() {
+		DispatchQueue.main.async {
+			showWelcomeScreenIfNeeded()
+		}
+	}
+}
+
+private final class AppDelegate: NSObject, NSApplicationDelegate {
+	func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { true }
+}

Diff for: Pasteboard Viewer/App.swift

@@ -0,0 +1,24 @@
+import Combine
+import AppCenter
+import AppCenterCrashes
+
+final class AppState: ObservableObject {
+	init() {
+		setUpConfig()
+	}
+
+	private func setUpConfig() {
+		UserDefaults.standard.register(
+			defaults: [
+				"NSApplicationCrashOnExceptions": true
+			]
+		)
+
+		AppCenter.start(
+			withAppSecret: "3da13331-e82c-4245-b7fa-023424c17f16",
+			services: [
+				Crashes.self
+			]
+		)
+	}
+}

Diff for: Pasteboard Viewer/AppDelegate.swift

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}