From fca40c0e401706a005088eb834cb9e9cb1325f18 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Tue, 11 Jun 2024 18:38:32 +0100
Subject: [PATCH] Enable Swift 6

---
 Whisky.xcodeproj/project.pbxproj              | 30 +++++++++++++------
 .../xcshareddata/xcschemes/Whisky.xcscheme    |  2 +-
 .../xcshareddata/xcschemes/WhiskyCmd.xcscheme |  2 +-
 .../xcschemes/WhiskyThumbnail.xcscheme        |  2 +-
 Whisky/AppDelegate.swift                      |  3 +-
 Whisky/Utils/Winetricks.swift                 |  2 +-
 Whisky/View Models/BottleVM.swift             |  6 ++--
 Whisky/Views/Bottle/BottleListEntry.swift     |  3 +-
 Whisky/Views/Bottle/WinetricksView.swift      |  6 +++-
 Whisky/Views/ContentView.swift                |  2 +-
 Whisky/Views/FileOpenView.swift               |  2 +-
 Whisky/Views/Setup/RosettaView.swift          |  4 +--
 .../Views/Setup/WhiskyWineDownloadView.swift  | 10 +++++--
 .../Views/Setup/WhiskyWineInstallView.swift   |  2 +-
 Whisky/Views/WhiskyApp.swift                  |  4 +--
 WhiskyCmd/Main.swift                          | 24 +++++++--------
 WhiskyKit/Package.swift                       |  3 +-
 .../WhiskyKit/Extensions/URL+Extensions.swift |  2 +-
 .../Sources/WhiskyKit/PE/COFFFileHeader.swift |  2 +-
 WhiskyKit/Sources/WhiskyKit/PE/Magic.swift    |  2 +-
 .../Sources/WhiskyKit/PE/OptionalHeader.swift |  2 +-
 .../WhiskyKit/PE/PortableExecutable.swift     |  2 +-
 WhiskyKit/Sources/WhiskyKit/PE/Section.swift  |  5 ++--
 WhiskyKit/Sources/WhiskyKit/ShellLink.swift   |  4 +--
 WhiskyKit/Sources/WhiskyKit/Tar.swift         |  2 +-
 .../Sources/WhiskyKit/Whisky/Bottle.swift     |  4 ++-
 .../Sources/WhiskyKit/Whisky/BottleData.swift |  2 +-
 .../WhiskyKit/Whisky/BottleSettings.swift     |  4 +--
 .../Sources/WhiskyKit/Whisky/Program.swift    |  4 ++-
 29 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/Whisky.xcodeproj/project.pbxproj b/Whisky.xcodeproj/project.pbxproj
index 0075057f2..b69cb40ba 100644
--- a/Whisky.xcodeproj/project.pbxproj
+++ b/Whisky.xcodeproj/project.pbxproj
@@ -475,7 +475,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1500;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					6E40495129CCA19C006E3F1B = {
 						CreatedOnToolsVersion = 14.2;
@@ -685,6 +685,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -748,6 +749,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -772,7 +774,6 @@
 		6E40497829CCA19D006E3F1B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -781,6 +782,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 40;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
@@ -803,14 +805,14 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
 		6E40497929CCA19D006E3F1B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -819,6 +821,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 40;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
@@ -842,7 +845,8 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = Whisky;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
@@ -853,6 +857,7 @@
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -867,7 +872,8 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -878,6 +884,7 @@
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -891,7 +898,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
@@ -903,6 +911,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 40;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -925,7 +934,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -937,6 +947,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 40;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -958,7 +969,8 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
diff --git a/Whisky.xcodeproj/xcshareddata/xcschemes/Whisky.xcscheme b/Whisky.xcodeproj/xcshareddata/xcschemes/Whisky.xcscheme
index cd031525c..75d05b17a 100644
--- a/Whisky.xcodeproj/xcshareddata/xcschemes/Whisky.xcscheme
+++ b/Whisky.xcodeproj/xcshareddata/xcschemes/Whisky.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyCmd.xcscheme b/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyCmd.xcscheme
index b6e07ecee..452db21ae 100644
--- a/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyCmd.xcscheme
+++ b/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyCmd.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyThumbnail.xcscheme b/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyThumbnail.xcscheme
index 9ed4843fc..d9b4e717d 100644
--- a/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyThumbnail.xcscheme
+++ b/Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyThumbnail.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Whisky/AppDelegate.swift b/Whisky/AppDelegate.swift
index 0d5366aec..5eb58cc46 100644
--- a/Whisky/AppDelegate.swift
+++ b/Whisky/AppDelegate.swift
@@ -56,7 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         Bundle.main.resourceURL?.deletingLastPathComponent().deletingLastPathComponent()
     }
 
-    private static var expectedUrl = URL(fileURLWithPath: "/Applications/Whisky.app")
+    private static let expectedUrl = URL(fileURLWithPath: "/Applications/Whisky.app")
 
     private static var insideAppsFolder: Bool {
         if let url = appUrl {
@@ -65,6 +65,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         return false
     }
 
+    @MainActor
     private func showAlertOnFirstLaunch() {
         let alert = NSAlert()
         alert.messageText = String(localized: "showAlertOnFirstLaunch.messageText")
diff --git a/Whisky/Utils/Winetricks.swift b/Whisky/Utils/Winetricks.swift
index b218f12db..159162c81 100644
--- a/Whisky/Utils/Winetricks.swift
+++ b/Whisky/Utils/Winetricks.swift
@@ -87,7 +87,7 @@ class Winetricks {
 
         do {
             let (data, _) = try await URLSession.shared.data(from: verbsURL)
-            verbs = String(data: data, encoding: .utf8)
+            verbs = String(decoding: data, as: UTF8.self)
         } catch {
             return []
         }
diff --git a/Whisky/View Models/BottleVM.swift b/Whisky/View Models/BottleVM.swift
index 1f604e27a..aa0c09dcc 100644
--- a/Whisky/View Models/BottleVM.swift	
+++ b/Whisky/View Models/BottleVM.swift	
@@ -20,8 +20,10 @@ import Foundation
 import SemanticVersion
 import WhiskyKit
 
-class BottleVM: ObservableObject {
-    static let shared = BottleVM()
+// swiftlint:disable:next todo
+// TODO: Don't use unchecked!
+final class BottleVM: ObservableObject, @unchecked Sendable {
+    @MainActor static let shared = BottleVM()
 
     var bottlesList = BottleData()
     @Published var bottles: [Bottle] = []
diff --git a/Whisky/Views/Bottle/BottleListEntry.swift b/Whisky/Views/Bottle/BottleListEntry.swift
index 10c079347..8a538e00e 100644
--- a/Whisky/Views/Bottle/BottleListEntry.swift
+++ b/Whisky/Views/Bottle/BottleListEntry.swift
@@ -121,7 +121,8 @@ struct BottleListEntry: View {
                 if selected == bottle.url {
                     selected = nil
                 }
-                await bottle.remove(delete: checkbox.state == .on)
+
+                bottle.remove(delete: checkbox.state == .on)
             }
         }
     }
diff --git a/Whisky/Views/Bottle/WinetricksView.swift b/Whisky/Views/Bottle/WinetricksView.swift
index 2f649be4b..b0f92eeda 100644
--- a/Whisky/Views/Bottle/WinetricksView.swift
+++ b/Whisky/Views/Bottle/WinetricksView.swift
@@ -81,7 +81,11 @@ struct WinetricksView: View {
         .padding()
         .onAppear {
             Task.detached {
-                winetricks = await Winetricks.parseVerbs()
+                let tricks = await Winetricks.parseVerbs()
+
+                await MainActor.run {
+                    winetricks = tricks
+                }
             }
         }
         .frame(minWidth: ViewWidth.large, minHeight: 400)
diff --git a/Whisky/Views/ContentView.swift b/Whisky/Views/ContentView.swift
index c15e5c733..19d9a1f9f 100644
--- a/Whisky/Views/ContentView.swift
+++ b/Whisky/Views/ContentView.swift
@@ -19,7 +19,7 @@
 import SwiftUI
 import UniformTypeIdentifiers
 import WhiskyKit
-import SemanticVersion
+@preconcurrency import SemanticVersion
 
 struct ContentView: View {
     @AppStorage("selectedBottleURL") private var selectedBottleURL: URL?
diff --git a/Whisky/Views/FileOpenView.swift b/Whisky/Views/FileOpenView.swift
index a7ca4b0e8..eb3602b39 100644
--- a/Whisky/Views/FileOpenView.swift
+++ b/Whisky/Views/FileOpenView.swift
@@ -79,7 +79,7 @@ struct FileOpenView: View {
         if let bottle = bottles.first(where: { $0.url == selection }) {
             Task.detached(priority: .userInitiated) {
                 do {
-                    if fileURL.pathExtension == "bat" {
+                    if await fileURL.pathExtension == "bat" {
                         try await Wine.runBatchFile(url: fileURL,
                                                     bottle: bottle)
                     } else {
diff --git a/Whisky/Views/Setup/RosettaView.swift b/Whisky/Views/Setup/RosettaView.swift
index d7cca7606..059bc6f2b 100644
--- a/Whisky/Views/Setup/RosettaView.swift
+++ b/Whisky/Views/Setup/RosettaView.swift
@@ -89,13 +89,13 @@ struct RosettaView: View {
         if Rosetta2.isRosettaInstalled {
             installing = false
             sleep(2)
-            await proceed()
+            proceed()
         } else {
             do {
                 successful = try await Rosetta2.installRosetta()
                 installing = false
                 try await Task.sleep(for: .seconds(2))
-                await proceed()
+                proceed()
             } catch {
                 successful = false
                 installing = false
diff --git a/Whisky/Views/Setup/WhiskyWineDownloadView.swift b/Whisky/Views/Setup/WhiskyWineDownloadView.swift
index e9196505e..c3a60ab51 100644
--- a/Whisky/Views/Setup/WhiskyWineDownloadView.swift
+++ b/Whisky/Views/Setup/WhiskyWineDownloadView.swift
@@ -67,9 +67,13 @@ struct WhiskyWineDownloadView: View {
             Task {
                 if let url: URL = URL(string: "https://data.getwhisky.app/Wine/Libraries.tar.gz") {
                     downloadTask = URLSession(configuration: .ephemeral).downloadTask(with: url) { url, _, _ in
-                        if let url = url {
-                            tarLocation = url
-                            proceed()
+                        Task.detached {
+                            await MainActor.run {
+                                if let url = url {
+                                    tarLocation = url
+                                    proceed()
+                                }
+                            }
                         }
                     }
                     observation = downloadTask?.observe(\.countOfBytesReceived) { task, _ in
diff --git a/Whisky/Views/Setup/WhiskyWineInstallView.swift b/Whisky/Views/Setup/WhiskyWineInstallView.swift
index 39c194f3b..fde12e9a3 100644
--- a/Whisky/Views/Setup/WhiskyWineInstallView.swift
+++ b/Whisky/Views/Setup/WhiskyWineInstallView.swift
@@ -52,7 +52,7 @@ struct WhiskyWineInstallView: View {
         .frame(width: 400, height: 200)
         .onAppear {
             Task.detached {
-                WhiskyWineInstaller.install(from: tarLocation)
+                await WhiskyWineInstaller.install(from: tarLocation)
                 await MainActor.run {
                     installing = false
                 }
diff --git a/Whisky/Views/WhiskyApp.swift b/Whisky/Views/WhiskyApp.swift
index ab4dd8a51..9e03f19ba 100644
--- a/Whisky/Views/WhiskyApp.swift
+++ b/Whisky/Views/WhiskyApp.swift
@@ -179,9 +179,7 @@ struct WhiskyApp: App {
         getconf.waitUntilExit()
 
         let getconfOutput = pipe.fileHandleForReading.readDataToEndOfFile()
-        guard let getconfOutputString = String(data: getconfOutput, encoding: .utf8) else {
-            return
-        }
+        let getconfOutputString = String(decoding: getconfOutput, as: UTF8.self)
 
         let d3dmPath = URL(fileURLWithPath: getconfOutputString.trimmingCharacters(in: .whitespacesAndNewlines))
             .appending(path: "d3dm").path
diff --git a/WhiskyCmd/Main.swift b/WhiskyCmd/Main.swift
index 4481f1920..0dd88bb4c 100644
--- a/WhiskyCmd/Main.swift
+++ b/WhiskyCmd/Main.swift
@@ -17,15 +17,15 @@
 //
 
 import Foundation
-import ArgumentParser
 import WhiskyKit
 import SwiftyTextTable
 import Progress
 import SemanticVersion
+@preconcurrency import ArgumentParser
 
 @main
 struct Whisky: ParsableCommand {
-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
         abstract: "A CLI interface for Whisky.",
         subcommands: [List.self,
                       Create.self,
@@ -41,7 +41,7 @@ struct Whisky: ParsableCommand {
 
 extension Whisky {
     struct List: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "List existing bottles.")
+        static let configuration = CommandConfiguration(abstract: "List existing bottles.")
 
         mutating func run() throws {
             var bottlesList = BottleData()
@@ -63,7 +63,7 @@ extension Whisky {
     }
 
     struct Create: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Create a new bottle.")
+        static let configuration = CommandConfiguration(abstract: "Create a new bottle.")
 
         @Argument var name: String
 
@@ -91,7 +91,7 @@ extension Whisky {
     }
 
     struct Add: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Add an existing bottle.")
+        static let configuration = CommandConfiguration(abstract: "Add an existing bottle.")
 
         @Argument var path: String
 
@@ -106,7 +106,7 @@ extension Whisky {
     }
 
     struct Export: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Export an existing bottle.")
+        static let configuration = CommandConfiguration(abstract: "Export an existing bottle.")
 
         mutating func run() throws {
 //            print("Create a bottle")
@@ -114,7 +114,7 @@ extension Whisky {
     }
 
     struct Delete: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Delete an existing bottle from disk.")
+        static let configuration = CommandConfiguration(abstract: "Delete an existing bottle from disk.")
 
         @Argument var name: String
 
@@ -139,7 +139,7 @@ extension Whisky {
     }
 
     struct Remove: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Remove an existing bottle from Whisky.",
+        static let configuration = CommandConfiguration(abstract: "Remove an existing bottle from Whisky.",
                                                         discussion: "This will not remove the bottle from disk.")
 
         @Argument var name: String
@@ -159,7 +159,7 @@ extension Whisky {
     }
 
     struct Run: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Run a program with Whisky.")
+        static let configuration = CommandConfiguration(abstract: "Run a program with Whisky.")
 
         @Argument var bottleName: String
         @Argument var path: String
@@ -180,7 +180,7 @@ extension Whisky {
     }
 
     struct Shellenv: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Prints export statements for a Bottle for eval.")
+        static let configuration = CommandConfiguration(abstract: "Prints export statements for a Bottle for eval.")
 
         @Argument var bottleName: String
 
@@ -199,7 +199,7 @@ extension Whisky {
     }
 
     struct Install: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Install WhiskyWine.")
+        static let configuration = CommandConfiguration(abstract: "Install WhiskyWine.")
 
         mutating func run() throws {
 
@@ -207,7 +207,7 @@ extension Whisky {
     }
 
     struct Uninstall: ParsableCommand {
-        static var configuration = CommandConfiguration(abstract: "Uninstall WhiskyWine.")
+        static let configuration = CommandConfiguration(abstract: "Uninstall WhiskyWine.")
 
         @Flag(name: [.long, .short], help: "Uninstall WhiskyWine") var whiskyWine = false
 
diff --git a/WhiskyKit/Package.swift b/WhiskyKit/Package.swift
index f0ff04460..852e33191 100644
--- a/WhiskyKit/Package.swift
+++ b/WhiskyKit/Package.swift
@@ -38,5 +38,6 @@ let package = Package(
             name: "WhiskyKit",
             dependencies: ["SemanticVersion"]
         )
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/WhiskyKit/Sources/WhiskyKit/Extensions/URL+Extensions.swift b/WhiskyKit/Sources/WhiskyKit/Extensions/URL+Extensions.swift
index d0e41da25..1bf530e2d 100644
--- a/WhiskyKit/Sources/WhiskyKit/Extensions/URL+Extensions.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Extensions/URL+Extensions.swift
@@ -73,6 +73,6 @@ extension URL {
     }
 }
 
-extension URL: Identifiable {
+extension URL: @retroactive Identifiable {
     public var id: URL { self }
 }
diff --git a/WhiskyKit/Sources/WhiskyKit/PE/COFFFileHeader.swift b/WhiskyKit/Sources/WhiskyKit/PE/COFFFileHeader.swift
index 94ac76f6f..a669f45d9 100644
--- a/WhiskyKit/Sources/WhiskyKit/PE/COFFFileHeader.swift
+++ b/WhiskyKit/Sources/WhiskyKit/PE/COFFFileHeader.swift
@@ -22,7 +22,7 @@ extension PEFile {
     /// COFF File Header (Object and Image)
     ///
     /// https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#coff-file-header-object-and-image
-    public struct COFFFileHeader: Hashable, Equatable {
+    public struct COFFFileHeader: Hashable, Equatable, Sendable {
         public let machine: UInt16
         public let numberOfSections: UInt16
         public let timeDateStamp: Date
diff --git a/WhiskyKit/Sources/WhiskyKit/PE/Magic.swift b/WhiskyKit/Sources/WhiskyKit/PE/Magic.swift
index 391eea0e1..1b5161601 100644
--- a/WhiskyKit/Sources/WhiskyKit/PE/Magic.swift
+++ b/WhiskyKit/Sources/WhiskyKit/PE/Magic.swift
@@ -19,7 +19,7 @@
 import Foundation
 
 extension PEFile {
-    public enum Magic: UInt16, Hashable, Equatable, CustomStringConvertible {
+    public enum Magic: UInt16, Hashable, Equatable, CustomStringConvertible, Sendable {
         case unknown = 0x0
         case pe32 = 0x10b
         case pe32Plus = 0x20b
diff --git a/WhiskyKit/Sources/WhiskyKit/PE/OptionalHeader.swift b/WhiskyKit/Sources/WhiskyKit/PE/OptionalHeader.swift
index d48f116df..5ff26e85b 100644
--- a/WhiskyKit/Sources/WhiskyKit/PE/OptionalHeader.swift
+++ b/WhiskyKit/Sources/WhiskyKit/PE/OptionalHeader.swift
@@ -22,7 +22,7 @@ extension PEFile {
     /// Optional Header
     /// 
     /// https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#optional-header-image-only
-    public struct OptionalHeader: Hashable, Equatable {
+    public struct OptionalHeader: Hashable, Equatable, Sendable {
         // Standard Fields
 
         public let magic: Magic
diff --git a/WhiskyKit/Sources/WhiskyKit/PE/PortableExecutable.swift b/WhiskyKit/Sources/WhiskyKit/PE/PortableExecutable.swift
index 5f9d29cbf..32156e0de 100644
--- a/WhiskyKit/Sources/WhiskyKit/PE/PortableExecutable.swift
+++ b/WhiskyKit/Sources/WhiskyKit/PE/PortableExecutable.swift
@@ -45,7 +45,7 @@ public enum Architecture: Hashable {
 /// Microsoft Portable Executable
 ///
 /// https://learn.microsoft.com/en-us/windows/win32/debug/pe-format
-public struct PEFile: Hashable, Equatable {
+public struct PEFile: Hashable, Equatable, Sendable {
     /// URL to the file
     public let url: URL
     /// COFF File Header (Object and Image)
diff --git a/WhiskyKit/Sources/WhiskyKit/PE/Section.swift b/WhiskyKit/Sources/WhiskyKit/PE/Section.swift
index 8f6dd98ba..bde35162c 100644
--- a/WhiskyKit/Sources/WhiskyKit/PE/Section.swift
+++ b/WhiskyKit/Sources/WhiskyKit/PE/Section.swift
@@ -22,7 +22,7 @@ extension PEFile {
     /// Section Table (Section Headers)
     ///
     /// https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#section-table-section-headers
-    public struct Section: Hashable, Equatable {
+    public struct Section: Hashable, Equatable, Sendable {
         public let name: String
         public let virtualSize: UInt32
         public let virtualAddress: UInt32
@@ -39,7 +39,8 @@ extension PEFile {
 
             do {
                 try handle.seek(toOffset: UInt64(offset))
-                if let data = try handle.read(upToCount: 8), let string = String(data: data, encoding: .utf8) {
+                if let data = try handle.read(upToCount: 8) {
+                    let string = String(decoding: data, as: UTF8.self)
                     self.name = string.replacingOccurrences(of: "\0", with: "")
                 } else {
                     self.name = ""
diff --git a/WhiskyKit/Sources/WhiskyKit/ShellLink.swift b/WhiskyKit/Sources/WhiskyKit/ShellLink.swift
index b10694b13..8c7299640 100644
--- a/WhiskyKit/Sources/WhiskyKit/ShellLink.swift
+++ b/WhiskyKit/Sources/WhiskyKit/ShellLink.swift
@@ -45,7 +45,7 @@ public struct ShellLinkHeader {
     }
 }
 
-public struct LinkFlags: OptionSet, Hashable {
+public struct LinkFlags: OptionSet, Hashable, Sendable {
     public let rawValue: UInt32
 
     public init(rawValue: UInt32) {
@@ -121,7 +121,7 @@ public struct LinkInfo: Hashable {
     }
 }
 
-public struct LinkInfoFlags: OptionSet, Hashable {
+public struct LinkInfoFlags: OptionSet, Hashable, Sendable {
     public let rawValue: UInt32
 
     public init(rawValue: UInt32) {
diff --git a/WhiskyKit/Sources/WhiskyKit/Tar.swift b/WhiskyKit/Sources/WhiskyKit/Tar.swift
index 182171e78..1cf882d1c 100644
--- a/WhiskyKit/Sources/WhiskyKit/Tar.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Tar.swift
@@ -64,4 +64,4 @@ public class Tar {
     }
 }
 
-extension String: Error {}
+extension String: @retroactive Error {}
diff --git a/WhiskyKit/Sources/WhiskyKit/Whisky/Bottle.swift b/WhiskyKit/Sources/WhiskyKit/Whisky/Bottle.swift
index ca480294a..31ff37cc0 100644
--- a/WhiskyKit/Sources/WhiskyKit/Whisky/Bottle.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Whisky/Bottle.swift
@@ -20,7 +20,9 @@ import Foundation
 import SwiftUI
 import os.log
 
-public class Bottle: ObservableObject, Equatable, Hashable, Identifiable, Comparable {
+// swiftlint:disable:next todo
+// TODO: Should not be unchecked!
+public final class Bottle: ObservableObject, Equatable, Hashable, Identifiable, Comparable, @unchecked Sendable {
     public let url: URL
     private let metadataURL: URL
     @Published public var settings: BottleSettings {
diff --git a/WhiskyKit/Sources/WhiskyKit/Whisky/BottleData.swift b/WhiskyKit/Sources/WhiskyKit/Whisky/BottleData.swift
index df40ce1ab..cda55ba0a 100644
--- a/WhiskyKit/Sources/WhiskyKit/Whisky/BottleData.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Whisky/BottleData.swift
@@ -17,7 +17,7 @@
 //
 
 import Foundation
-import SemanticVersion
+@preconcurrency import SemanticVersion
 
 public struct BottleData: Codable {
     public static let containerDir = FileManager.default.homeDirectoryForCurrentUser
diff --git a/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift b/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift
index 365f71bda..2129910af 100644
--- a/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift
@@ -17,7 +17,7 @@
 //
 
 import Foundation
-import SemanticVersion
+@preconcurrency import SemanticVersion
 import os.log
 
 public struct PinnedProgram: Codable, Hashable, Equatable {
@@ -51,7 +51,7 @@ public struct BottleInfo: Codable, Equatable {
     }
 }
 
-public enum WinVersion: String, CaseIterable, Codable {
+public enum WinVersion: String, CaseIterable, Codable, Sendable {
     case winXP = "winxp64"
     case win7 = "win7"
     case win8 = "win8"
diff --git a/WhiskyKit/Sources/WhiskyKit/Whisky/Program.swift b/WhiskyKit/Sources/WhiskyKit/Whisky/Program.swift
index c2d7c2de6..4b5445553 100644
--- a/WhiskyKit/Sources/WhiskyKit/Whisky/Program.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Whisky/Program.swift
@@ -20,7 +20,9 @@ import Foundation
 import SwiftUI
 import os.log
 
-public class Program: ObservableObject, Equatable, Hashable, Identifiable {
+// swiftlint:disable:next todo
+// TODO: Should not be unchecked!
+public final class Program: ObservableObject, Equatable, Hashable, Identifiable, @unchecked Sendable {
     public let bottle: Bottle
     public let url: URL
     public let settingsURL: URL