WeatherXM · pantelisss · Dec 2, 2024 · Nov 19, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/PresentationLayer/Constants/WeatherFields.swift b/PresentationLayer/Constants/WeatherFields.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import DomainLayer
 import Toolkit
 
-extension WeatherField: CustomStringConvertible {
+extension WeatherField: @retroactive CustomStringConvertible {
 
 	static var stationListFields: [WeatherField] {
 		[.temperature, .wind, .humidity, .precipitation]

diff --git a/PresentationLayer/Extensions/DomainExtensions/Common/CurrentWeather+.swift b/PresentationLayer/Extensions/DomainExtensions/Common/CurrentWeather+.swift
@@ -9,7 +9,7 @@ import Foundation
 import DomainLayer
 import Toolkit
 
-extension CurrentWeather: Identifiable {
+extension CurrentWeather: @retroactive Identifiable {
     public var id: String {
         timestamp ?? ""
     }

diff --git a/PresentationLayer/Extensions/DomainExtensions/Common/UserDeviceFollowState+.swift b/PresentationLayer/Extensions/DomainExtensions/Common/UserDeviceFollowState+.swift
@@ -10,7 +10,7 @@ import DomainLayer
 typealias StateFontAwesome = (icon: FontIcon, color: ColorEnum, font: FontAwesome)
 
 extension UserDeviceFollowState {
-    static let defaultFAIcon: StateFontAwesome = (FontIcon.heart, ColorEnum.favoriteHeart, FontAwesome.FAPro)
+	nonisolated(unsafe) static let defaultFAIcon: StateFontAwesome = (FontIcon.heart, ColorEnum.favoriteHeart, FontAwesome.FAPro)
 
     enum State {
         case owned

diff --git a/...tationLayer/UIComponents/BaseComponents/WeatherOverview/WeatherOverviewView+Content.swift b/...tationLayer/UIComponents/BaseComponents/WeatherOverview/WeatherOverviewView+Content.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import DomainLayer
+@preconcurrency import DomainLayer
 
 private extension WeatherField {
 	func attributedString(from weather: CurrentWeather?,

diff --git a/PresentationLayer/UIComponents/BaseComponents/WeatherOverview/WeatherOverviewView.swift b/PresentationLayer/UIComponents/BaseComponents/WeatherOverview/WeatherOverviewView.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import DomainLayer
+@preconcurrency import DomainLayer
 
 struct WeatherOverviewView: View {
 	var mode: Mode = .default

diff --git a/PresentationLayer/UIComponents/Modifiers/SizeObserver.swift b/PresentationLayer/UIComponents/Modifiers/SizeObserver.swift
@@ -44,7 +44,7 @@ struct SizeObserver: ViewModifier {
 
     private struct FramePreferenceKey: PreferenceKey {
         typealias Value = CGRect
-        static var defaultValue: Value = .zero
+		nonisolated(unsafe) static var defaultValue: Value = .zero
 
         static func reduce(value _: inout Value, nextValue: () -> Value) {
             _ = nextValue()

diff --git a/PresentationLayer/Utils/Weather/WeatherUnitsManager.swift b/PresentationLayer/Utils/Weather/WeatherUnitsManager.swift
@@ -10,8 +10,8 @@ import Toolkit
 import DomainLayer
 
 class WeatherUnitsManager: ObservableObject {
-
-	static let `default`: WeatherUnitsManager =  {
+	
+	nonisolated(unsafe) static let `default`: WeatherUnitsManager =  {
 		let useCase = SwinjectHelper.shared.getContainerForSwinject().resolve(MainUseCase.self)!
 		let manager = WeatherUnitsManager(mainUseCase: useCase)
 

diff --git a/station-intent/IntentHandler.swift b/station-intent/IntentHandler.swift
@@ -6,7 +6,7 @@
 //
 
 import Intents
-import DomainLayer
+@preconcurrency import DomainLayer
 import Combine
 import Toolkit
 

diff --git a/station-widget/Extenstions/DeviceDetails+Widget.swift b/station-widget/Extenstions/DeviceDetails+Widget.swift
@@ -5,7 +5,7 @@
 //  Created by Pantelis Giazitsis on 18/10/23.
 //
 
-import DomainLayer
+@preconcurrency import DomainLayer
 
 // MARK: - Mock
 

diff --git a/station-widget/StationTimelineEntry.swift b/station-widget/StationTimelineEntry.swift
@@ -7,9 +7,9 @@
 
 import Foundation
 import WidgetKit
-import DomainLayer
+@preconcurrency import DomainLayer
 
-struct StationTimelineEntry: TimelineEntry {
+struct StationTimelineEntry: @unchecked Sendable, TimelineEntry {
 	let date: Date
 	let displaySize: CGSize
 	let timelineCase: TimelineCase

diff --git a/station-widget/Station_widget.swift b/station-widget/Station_widget.swift
@@ -7,10 +7,10 @@
 
 import WidgetKit
 import SwiftUI
-import DomainLayer
+@preconcurrency import DomainLayer
 import Toolkit
 
-struct Provider: IntentTimelineProvider {
+struct Provider: IntentTimelineProvider, @unchecked Sendable {
 	private let useCase: WidgetUseCase
 	private let cancellableWrapper: CancellableWrapper = .init()
 	private let refreshInterval: TimeInterval = 5.0 * 60.0 // 5 mins
@@ -49,19 +49,22 @@ struct Provider: IntentTimelineProvider {
         completion(entry)
     }
 
-    func getTimeline(for configuration: StationWidgetConfigurationIntent,
+
+	func getTimeline(for configuration: StationWidgetConfigurationIntent,
 					 in context: Context,
-					 completion: @escaping (Timeline<StationTimelineEntry>) -> Void) {
+					 completion: @escaping @Sendable (Timeline<StationTimelineEntry>) -> Void) {
 
 		let nextUpdate = Date.now.advanced(by: refreshInterval)
 		let displaySize = context.displaySize
-		Task {
-			let entry = await getEntry(for: configuration.selectedStation, displaySize: displaySize)
+		nonisolated(unsafe) let station = configuration.selectedStation
+		Task { @MainActor in
+			let entry = await getEntry(for: station, displaySize: displaySize)
 			let timeline = Timeline(entries: [entry], policy: .after(nextUpdate))
 			completion(timeline)
 		}
     }
 
+	nonisolated
 	private func getEntry(for station: Station?, displaySize: CGSize) async -> StationTimelineEntry {
 		let isUserLoggedIn = useCase.isUserLoggedIn
 		guard let result = try? await useCase.getDevices(useCache: true) else {

diff --git a/station-widget/Views/ErrorView.swift b/station-widget/Views/ErrorView.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import DomainLayer
+@preconcurrency import DomainLayer
 import WidgetKit
 
 struct ErrorView: View {

diff --git a/station-widget/Views/StationWidgetView.swift b/station-widget/Views/StationWidgetView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 import WidgetKit
-import DomainLayer
+@preconcurrency import DomainLayer
 
 struct StationWidgetView: View {
 	let entry: StationTimelineEntry

diff --git a/wxm-ios.xcodeproj/project.pbxproj b/wxm-ios.xcodeproj/project.pbxproj
@@ -3532,7 +3532,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;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -3565,7 +3566,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Mock;
@@ -3599,7 +3601,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -3719,7 +3722,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;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -3755,7 +3759,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Mock;
@@ -3791,7 +3796,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/station-intent.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/station-intent.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/station-widgetExtension.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/station-widgetExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-db.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-db.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-mock.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-mock.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-release.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios-release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios.xcscheme b/wxm-ios.xcodeproj/xcshareddata/xcschemes/wxm-ios.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/wxm-ios/DataLayer/DataLayer.xcodeproj/project.pbxproj b/wxm-ios/DataLayer/DataLayer.xcodeproj/project.pbxproj
@@ -487,7 +487,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1610;
 				TargetAttributes = {
 					B5799E7228254CC100FEBB85 = {
 						CreatedOnToolsVersion = 13.3;
@@ -719,7 +719,8 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = MOCK;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Mock;
@@ -877,7 +878,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -912,7 +914,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = RELEASE;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

diff --git a/wxm-ios/DataLayer/DataLayer.xcodeproj/xcshareddata/xcschemes/DataLayer.xcscheme b/wxm-ios/DataLayer/DataLayer.xcodeproj/xcshareddata/xcschemes/DataLayer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/wxm-ios/DataLayer/DataLayer/Database/DatabaseService.swift b/wxm-ios/DataLayer/DataLayer/Database/DatabaseService.swift
@@ -9,7 +9,7 @@ import CoreData
 
 class DatabaseService {
 
-    static let shared: DatabaseService = DatabaseService()
+	nonisolated(unsafe) static let shared: DatabaseService = DatabaseService()
 
     var context: NSManagedObjectContext {
         persistentContainer.viewContext

diff --git a/wxm-ios/DataLayer/DataLayer/Networking/ApiClient.swift b/wxm-ios/DataLayer/DataLayer/Networking/ApiClient.swift
@@ -30,7 +30,7 @@ public class ApiClient {
         return session
     }()
 
-    static let shared: ApiClient = ApiClient()
+	nonisolated(unsafe) static let shared: ApiClient = ApiClient()
 
     #warning("TODO: Improve publishers caching. For now, we perform everything in main thread to avoid race conditions")
     private let queue = DispatchQueue.main

diff --git a/wxm-ios/DataLayer/DataLayer/Networking/ApiRequestBuilders/MeApiRequestBuilder.swift b/wxm-ios/DataLayer/DataLayer/Networking/ApiRequestBuilders/MeApiRequestBuilder.swift
@@ -6,7 +6,7 @@
 //
 
 import Alamofire
-import DomainLayer
+@preconcurrency import DomainLayer
 import Foundation
 
 enum MeApiRequestBuilder: URLRequestConvertible {

diff --git a/wxm-ios/DataLayer/DataLayer/Networking/Interceptors/AuthInterceptor.swift b/wxm-ios/DataLayer/DataLayer/Networking/Interceptors/AuthInterceptor.swift
@@ -5,13 +5,13 @@
 //  Created by Hristos Condrea on 8/8/22.
 //
 
-import Alamofire
-import Combine
-import DomainLayer
+@preconcurrency import Alamofire
+@preconcurrency import Combine
+@preconcurrency import DomainLayer
 import Toolkit
 import UIKit
 
-class AuthInterceptor: RequestInterceptor {
+class AuthInterceptor: @unchecked Sendable, RequestInterceptor {
     let retryLimit = 4
     let retryDelay: TimeInterval = 1
     let keychainHelperService = KeychainHelperService()