Enable Swift 6

Whisky-App · Jun 11, 2024 · fca40c0 · fca40c0 · kambala-decapitator · Aug 11, 2024
1 parent 57082e3
commit fca40c0
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 57 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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