Merge pull request #2 from oversizedev/develop

Develop
oversizedev · Nov 11, 2024 · c31b6b7 · c31b6b7
2 parents d67eef6 + 49504ef
commit c31b6b7
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/Package.swift b/Package.swift
@@ -43,7 +43,7 @@ let package = Package(
         .library(name: "OversizeNotificationService", targets: ["OversizeNotificationService"]),
         .library(name: "OversizeFileManagerService", targets: ["OversizeFileManagerService"]),
     ],
-    dependencies: remoteDependencies,
+    dependencies: dependencies,
     targets: [
         .target(
             name: "OversizeServices",

diff --git a/Sources/OversizeCalendarService/CalendarService.swift b/Sources/OversizeCalendarService/CalendarService.swift
@@ -11,7 +11,7 @@ import OversizeCore
 import OversizeModels
 
 #if !os(tvOS)
-    public actor CalendarService {
+public class CalendarService: @unchecked Sendable {
         private let eventStore: EKEventStore = .init()
         public init() {}
 

diff --git a/Sources/OversizeCalendarService/Extensions/EKCalendarExtension.swift b/Sources/OversizeCalendarService/Extensions/EKCalendarExtension.swift
@@ -9,7 +9,7 @@
 import SwiftUI
 
 #if os(iOS) || os(macOS)
-    extension EKCalendar: @retroactive Identifiable {
+extension EKCalendar: Identifiable {
         public var id: String {
             calendarIdentifier
         }

diff --git a/Sources/OversizeCalendarService/Extensions/EKEventExtension.swift b/Sources/OversizeCalendarService/Extensions/EKEventExtension.swift
@@ -10,7 +10,7 @@ import OversizeCore
 import SwiftUI
 
 #if os(iOS) || os(macOS)
-    extension EKEvent: @retroactive Identifiable {
+    extension EKEvent: Identifiable {
         public var color: Color {
             Color(calendar.cgColor)
         }

diff --git a/Sources/OversizeCalendarService/Model/CalendarAlertsTimes.swift b/Sources/OversizeCalendarService/Model/CalendarAlertsTimes.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 #if !os(tvOS)
-    public enum CalendarAlertsTimes: CaseIterable, Equatable, Identifiable, Sendable {
+    public enum CalendarAlertsTimes: CaseIterable, Equatable, Identifiable, @unchecked Sendable {
         case oneMinuteBefore, fiveMinutesBefore, tenMinutesBefore, thirtyMinutesBefore, oneHourBefore, twoHoursBefore, oneDayBefore, twoDaysBefore, oneWeekBefore, custom(EKAlarm)
 
         public var title: String {

diff --git a/Sources/OversizeCalendarService/Model/CalendarEventRecurrenceRules.swift b/Sources/OversizeCalendarService/Model/CalendarEventRecurrenceRules.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 #if !os(tvOS)
-    public enum CalendarEventRecurrenceRules: CaseIterable, Equatable, Identifiable, Sendable {
+    public enum CalendarEventRecurrenceRules: CaseIterable, Equatable, Identifiable, @unchecked Sendable {
         case never, everyDay, everyWorkingDay, everyWeekend, everyWeek, everyTwoWeeks, everyMonth, everyYear, custom(EKRecurrenceRule?)
 
         public var rule: EKRecurrenceRule? {
@@ -85,7 +85,7 @@ import Foundation
         public static let allCases: [CalendarEventRecurrenceRules] = [.never, .everyDay, .everyWorkingDay, .everyWeekend, .everyWeek, .everyTwoWeeks, .everyMonth, .everyYear]
     }
 
-    public enum CalendarEventEndRecurrenceRules: CaseIterable, Equatable, Identifiable, Hashable, Sendable {
+    public enum CalendarEventEndRecurrenceRules: CaseIterable, Equatable, Identifiable, Hashable, @unchecked Sendable {
         case never, occurrenceCount(Int), endDate(Date)
 
         public var end: EKRecurrenceEnd? {

diff --git a/Sources/OversizeLocationService/LocationService.swift b/Sources/OversizeLocationService/LocationService.swift
@@ -8,7 +8,7 @@ import Foundation
 import MapKit
 import OversizeModels
 
-public protocol LocationServiceProtocol {
+public protocol LocationServiceProtocol: Sendable {
     func currentLocation() async throws -> CLLocationCoordinate2D?
     func systemPermissionsStatus() -> CLAuthorizationStatus
     func permissionsStatus() -> Result<Bool, AppError>

diff --git a/Sources/OversizeLocationService/Models/LocationAddress.swift b/Sources/OversizeLocationService/Models/LocationAddress.swift
@@ -7,7 +7,7 @@ import Foundation
 import MapKit
 import OversizeCore
 
-public struct LocationAddress: Codable {
+public struct LocationAddress: Codable, @unchecked Sendable {
     public let streetNumber: String // eg. 1
     public let streetName: String // eg. Infinite Loop
     public let city: String // eg. Cupertino
@@ -28,7 +28,7 @@ public struct LocationAddress: Codable {
         """
     }
 
-    public enum CardKeys: CodingKey {
+    public enum CardKeys: CodingKey, Sendable {
         case streetNumber
         case streetName
         case city

diff --git a/Sources/OversizeLocationService/Models/MapPin.swift b/Sources/OversizeLocationService/Models/MapPin.swift
@@ -6,7 +6,7 @@
 import Foundation
 import MapKit
 
-public struct MapPoint: Identifiable {
+public struct MapPoint: Identifiable, @unchecked Sendable {
     public let id: UUID
     public let name: String
     public let coordinate: CLLocationCoordinate2D