SWIFT_STRICT_CONCURRENCY = complete (#40)

LunarBar-app · Apr 17, 2024 · 0ea4c3b · 0ea4c3b
1 parent e7ae92a
commit 0ea4c3b
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ jobs:
     name: LunarBarMac
     runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
 
     steps:
       - uses: actions/checkout@v4

diff --git a/LunarBar.xcodeproj/project.pbxproj b/LunarBar.xcodeproj/project.pbxproj
@@ -20,6 +20,7 @@
 		8740E30B2B37F969004A06C2 /* EventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8740E30A2B37F969004A06C2 /* EventView.swift */; };
 		8740E30F2B37FB36004A06C2 /* CalendarManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8740E30E2B37FB36004A06C2 /* CalendarManager.swift */; };
 		8740E31B2B39210F004A06C2 /* AppPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8740E31A2B39210F004A06C2 /* AppPreferences.swift */; };
+		874D77772BCF94900093662D /* Unchecked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874D77762BCF94900093662D /* Unchecked.swift */; };
 		874E992D2B33D8C0002FC90A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874E992C2B33D8C0002FC90A /* AppDelegate.swift */; };
 		874E99312B33D8C1002FC90A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 874E99302B33D8C1002FC90A /* Assets.xcassets */; };
 		875A81282B39558000C031C3 /* AppVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 875A81262B39558000C031C3 /* AppVersion.swift */; };
@@ -63,6 +64,7 @@
 		8740E30A2B37F969004A06C2 /* EventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventView.swift; sourceTree = "<group>"; };
 		8740E30E2B37FB36004A06C2 /* CalendarManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarManager.swift; sourceTree = "<group>"; };
 		8740E31A2B39210F004A06C2 /* AppPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppPreferences.swift; sourceTree = "<group>"; };
+		874D77762BCF94900093662D /* Unchecked.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Unchecked.swift; sourceTree = "<group>"; };
 		874E99292B33D8C0002FC90A /* LunarBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LunarBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		874E992C2B33D8C0002FC90A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		874E99302B33D8C1002FC90A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -199,6 +201,7 @@
 				8740E2FD2B37C823004A06C2 /* Managers */,
 				8782F4752B33F8EF008B1912 /* Views */,
 				875A81252B39558000C031C3 /* Updater */,
+				874D77762BCF94900093662D /* Unchecked.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -372,6 +375,7 @@
 				875A81282B39558000C031C3 /* AppVersion.swift in Sources */,
 				8782F46F2B33F627008B1912 /* AppDefinitions.swift in Sources */,
 				8740E31B2B39210F004A06C2 /* AppPreferences.swift in Sources */,
+				874D77772BCF94900093662D /* Unchecked.swift in Sources */,
 				87F81C542B43EBDE0071CA30 /* main.swift in Sources */,
 				87DA5AFF2B3433D400CE2C1A /* WeekdayView.swift in Sources */,
 				8740E2FF2B37C841004A06C2 /* HolidayManager.swift in Sources */,
@@ -484,6 +488,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -498,6 +503,7 @@
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -544,6 +550,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -556,6 +563,7 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Release;
 		};

diff --git a/LunarBarKit/Package.swift b/LunarBarKit/Package.swift
@@ -25,6 +25,9 @@ let package = Package(
       resources: [
         .process("LunarCalendar/Resources"),
       ],
+      swiftSettings: [
+        .enableExperimentalFeature("StrictConcurrency")
+      ],
       plugins: [
         .plugin(name: "SwiftLint", package: "LunarBarTools"),
       ]

diff --git a/LunarBarKit/Sources/LunarCalendar/LunarCalendar.swift b/LunarBarKit/Sources/LunarCalendar/LunarCalendar.swift
@@ -11,7 +11,7 @@ import Foundation
 
  For example, solar terms are hard to be precise if we compute them using formulas.
  */
-public final class LunarCalendar {
+public final class LunarCalendar: Sendable {
   public static let `default` = LunarCalendar()
 
   /**

diff --git a/LunarBarKit/Sources/Unchecked.swift b/LunarBarKit/Sources/Unchecked.swift
@@ -0,0 +1,9 @@
+//
+//  Unchecked.swift
+//
+//  Created by cyan on 2024/4/17.
+//
+
+import os.log
+
+extension os.Logger: @unchecked Sendable {}
diff --git a/LunarBarMac/Sources/Main/AppDelegate.swift b/LunarBarMac/Sources/Main/AppDelegate.swift
@@ -83,7 +83,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       }
     }
 
-    let silentlyCheckUpdates = {
+    let silentlyCheckUpdates: @Sendable () -> Void = {
       Task {
         await AppUpdater.checkForUpdates(explicitly: false)
       }
@@ -122,6 +122,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     return false
   }
 
+  @MainActor
   func updateMenuBarIcon(needsLayout: Bool = false) {
     switch AppPreferences.General.menuBarIcon {
     case .calendar:
@@ -148,6 +149,7 @@ extension AppDelegate: NSPopoverDelegate {
 
 // MARK: - Private
 
+@MainActor
 private extension AppDelegate {
   // periphery:ignore:parameters notification
   @objc func calendarDayDidChange(_ notification: Notification) {

diff --git a/LunarBarMac/Sources/Managers/CalendarManager.swift b/LunarBarMac/Sources/Managers/CalendarManager.swift
@@ -12,6 +12,7 @@ import LunarBarKit
 /**
  For the native Calendar app.
  */
+@MainActor
 final class CalendarManager {
   static let `default` = CalendarManager()
 

diff --git a/LunarBarMac/Sources/Managers/HolidayManager.swift b/LunarBarMac/Sources/Managers/HolidayManager.swift
@@ -16,6 +16,7 @@ enum HolidayType: Int {
 /**
  For public holidays.
  */
+@MainActor
 final class HolidayManager {
   static let `default` = HolidayManager()
 
@@ -83,7 +84,7 @@ final class HolidayManager {
     return nil
   }
 
-  func fetchDefaultHolidays() async {
+  nonisolated func fetchDefaultHolidays() async {
     guard let url = URL(string: Constants.endpoint) else {
       return Logger.assertFail("Failed to create the URL: \(Constants.endpoint)")
     }
@@ -103,15 +104,15 @@ final class HolidayManager {
     Logger.log(.info, "Successfully fetched default holidays")
 
     do {
-      try data.write(
+      try await data.write(
         to: cachesDirectory.appending(
           path: url.lastPathComponent,
           directoryHint: .notDirectory
         ),
         options: .atomic
       )
 
-      reloadCachedFiles()
+      await reloadCachedFiles()
     } catch {
       Logger.log(.error, error.localizedDescription)
     }

diff --git a/LunarBarMac/Sources/Shared/AppIconFactory.swift b/LunarBarMac/Sources/Shared/AppIconFactory.swift
@@ -7,6 +7,7 @@
 
 import AppKit
 
+@MainActor
 enum AppIconFactory {
   static func createCalendarIcon(pointSize: Double = 16) -> NSImage {
     .with(symbolName: Icons.calendar, pointSize: pointSize).asTemplate

diff --git a/LunarBarMac/Sources/Shared/AppPreferences.swift b/LunarBarMac/Sources/Shared/AppPreferences.swift
@@ -50,7 +50,7 @@ enum AppPreferences {
     @Storage(key: "accessibility.reduce-transparency", defaultValue: false)
     static var reduceTransparency: Bool
 
-    static var popoverMaterial: NSVisualEffectView.Material {
+    @MainActor static var popoverMaterial: NSVisualEffectView.Material {
       reduceTransparency ? .windowBackground : .menu
     }
   }
@@ -68,6 +68,7 @@ enum Appearance: Codable {
   case light
   case dark
 
+  @MainActor
   func resolved(with appearance: NSAppearance = NSApp.effectiveAppearance) -> NSAppearance? {
     switch self {
     case .system:
@@ -80,6 +81,7 @@ enum Appearance: Codable {
   }
 }
 
+@MainActor
 @propertyWrapper
 struct Storage<T: Codable> {
   private let key: String

diff --git a/LunarBarMac/Sources/Unchecked.swift b/LunarBarMac/Sources/Unchecked.swift
@@ -0,0 +1,10 @@
+//
+//  Unchecked.swift
+//  LunarBarMac
+//
+//  Created by cyan on 2024/4/17.
+//
+
+import EventKit
+
+extension EKEventStore: @unchecked Sendable {}
diff --git a/LunarBarMac/Sources/Updater/AppUpdater.swift b/LunarBarMac/Sources/Updater/AppUpdater.swift
@@ -49,6 +49,7 @@ enum AppUpdater {
 
 // MARK: - Private
 
+@MainActor
 private extension AppUpdater {
   static func presentError() {
     let alert = NSAlert()

diff --git a/LunarBarMac/Sources/Views/HeaderView.swift b/LunarBarMac/Sources/Views/HeaderView.swift
@@ -9,6 +9,7 @@ import AppKit
 import AppKitControls
 import LunarBarKit
 
+@MainActor
 protocol HeaderViewDelegate: AnyObject {
   func headerView(_ sender: HeaderView, moveTo date: Date)
   func headerView(_ sender: HeaderView, moveBy offset: Int)