Strict mode for concurrency - Swift 6 support

catowseriOS/BrowserNetworking/AlamofireReachabilityAdaptee.swift

@@ -7,7 +7,7 @@
 //
 
 import CottonRestKit
-import Alamofire
+@preconcurrency import Alamofire
 import CottonBase
 
 public final class AlamofireReachabilityAdaptee<S: ServerDescription>: NetworkReachabilityAdapter {

catowseriOS/BrowserNetworking/Downloadable.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import Alamofire
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(CryptoKit)
 import CryptoKit
 #endif

catowseriOS/BrowserNetworking/Endpoints/DNSoverHTTPS/GoogleJSONDNSoHTTPsEndpoint.swift

@@ -9,7 +9,7 @@
 import CottonRestKit
 import CottonBase
 import ReactiveHttpKit
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(Combine)
 import Combine
 #endif

catowseriOS/BrowserNetworking/Endpoints/DuckDuckGoAutocomplete/DuckDuckGoSearchEndpoint.swift

@@ -8,7 +8,7 @@
 
 import CottonRestKit
 import Combine
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 import CottonBase
 import ReactiveHttpKit
 import Alamofire

catowseriOS/BrowserNetworking/Endpoints/Google/GoogleSearchEndpoint.swift

@@ -9,7 +9,7 @@
 import CottonRestKit
 import CottonBase
 import ReactiveHttpKit
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(Combine)
 import Combine
 #endif

catowseriOS/BrowserNetworking/HttpClient+Alamofire.swift

@@ -7,7 +7,7 @@
 //
 
 import CottonRestKit
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 import CottonBase
 
 /// This typealias could be an issue, because the same defined in ReactiveSwift HttpClient+RxSwift.swift

catowseriOS/BrowserNetworking/OpenSearch/SearchEngine+OpenSearchParser.swift

@@ -108,7 +108,7 @@ extension OpenSearch {
         case xIcon = "image/x-icon"
     }
 
-    public enum ImageParseResult {
+    public enum ImageParseResult: Sendable {
         case base64(Data)
         case url(URL)
         case none

catowseriOS/BrowserNetworking/SearchEngines/SearchEngine.swift

@@ -9,8 +9,11 @@
 import Foundation
 import CottonBase
 
+/// Alamofire's http method type can't be retroactivly silenced because sendable is a system protocol.
+extension HTTPMethod: @unchecked Sendable { }
+
 /// The model for OpenSearch format URL
-public struct SearchEngine {
+public struct SearchEngine: Sendable {
     /// Name e.g. "DuckDuckGo"
     let shortName: String
     /// Valid components for final URL

catowseriOS/BrowserNetworking/TransportAdapters/AlamofireHTTPAdaptee.swift

@@ -9,7 +9,7 @@
 import CottonRestKit
 import ReactiveHttpKit
 import Alamofire
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(Combine)
 import Combine
 #endif

catowseriOS/BrowserNetworking/TransportAdapters/AlamofireHTTPRxAdaptee.swift

@@ -6,10 +6,11 @@
 //  Copyright © 2021 Cotton/Catowser Andrei Ermoshin. All rights reserved.
 //
 
+import AutoMockable
 import CottonRestKit
 import ReactiveHttpKit
 import Alamofire
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(Combine)
 import Combine
 #endif
@@ -104,8 +105,13 @@ extension URLRequest /* : URLRequestCreatable */ {
     }
 }
 
-/// Wrapper around Alamofire method
-extension JSONEncoding: JSONRequestEncodable {
+/// Wrapper around Alamofire method.
+/// Can't be retroactive because it is from 3rd party Alamofire lib.
+extension JSONEncoding: @unchecked Sendable {}
+/// Can be retroactivly Auto mockable because it is our own protocol which can't be known by Alamofire devs.
+extension JSONEncoding: @retroactive AutoMockable {}
+/// Can be retroactivly conforming to JSONRequestEncodable because Alamofire devs won't know that protocol for sure.
+extension JSONEncoding: @retroactive JSONRequestEncodable {
     public func encodeRequest(_ urlRequest: URLRequestCreatable, with parameters: [String: Any]?) throws -> URLRequest {
         return try encode(urlRequest.convertToURLRequest(), with: parameters)
     }

catowseriOS/BrowserNetworking/TransportAdapters/AlamofireHTTPRxVoidAdaptee.swift

@@ -8,7 +8,7 @@
 
 import CottonRestKit
 import Alamofire
-import ReactiveSwift
+@preconcurrency import ReactiveSwift
 #if canImport(Combine)
 import Combine
 #endif

catowseriOS/CoreBrowser/Filesystem/ResourceReader.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum KnownSearchPluginName: String {
+public enum KnownSearchPluginName: String, Sendable {
     case google
     case duckduckgo
 }

catowseriOS/CoreBrowser/History/DomainsHistory.swift

@@ -9,12 +9,16 @@
 import CottonBase
 import AutoMockable
 
-/// Interface for known domain checks. Has to have async methods because actual class is a global actor
-public protocol KnownDomainsSource: AutoMockable {
+/// Interface for known domain checks. Has to have async methods because actual class is a global actor.
+///
+/// Can be sendable because implementation is a global actor.
+public protocol KnownDomainsSource: AutoMockable, Sendable {
     func domainNames(whereURLContains filter: String) async -> [String]
 }
 
-/// Interface for domain checks. Has to have async methods because actual class is a global actor
-public protocol DomainsHistory {
+/// Interface for domain checks. Has to have async methods because actual class is a global actor.
+///
+/// Can be sendable because implementation is a global actor.
+public protocol DomainsHistory: Sendable {
     func remember(host: CottonBase.Host) async
 }

catowseriOS/CoreBrowser/History/InMemoryDomainSearchProvider.swift

@@ -13,14 +13,14 @@ private let filename = "topdomains"
 
 @globalActor
 public final class InMemoryDomainSearchProvider {
-    public static let shared = Provider()
+    public static let shared = StateHolder()
 
-    public actor Provider {
+    public actor StateHolder {
         fileprivate let storage: Trie
 
         init() {
             storage = Trie()
-            let bundle = Bundle(for: Provider.self)
+            let bundle = Bundle(for: StateHolder.self)
 
             guard let filePath = bundle.path(forResource: filename, ofType: "txt") else {
                 assertionFailure("Failed to find \"\(filename)\" file in framework bundle")
@@ -39,7 +39,9 @@ public final class InMemoryDomainSearchProvider {
     }
 }
 
-extension InMemoryDomainSearchProvider.Provider: DomainsHistory {
+extension CottonBase.Host: @unchecked Sendable {}
+
+extension InMemoryDomainSearchProvider.StateHolder: DomainsHistory {
     public func remember(host: CottonBase.Host) async {
         storage.insert(word: host.rawString)
         if let withoutWww = host.rawString.withoutPrefix("www.") {
@@ -48,7 +50,7 @@ extension InMemoryDomainSearchProvider.Provider: DomainsHistory {
     }
 }
 
-extension InMemoryDomainSearchProvider.Provider: KnownDomainsSource {
+extension InMemoryDomainSearchProvider.StateHolder: KnownDomainsSource {
     public func domainNames(whereURLContains filter: String) async -> [String] {
         let words: [String] = storage.findWordsWithPrefix(prefix: filter)
         return words

catowseriOS/CoreBrowser/Models/Tab.swift

@@ -1,5 +1,5 @@
 //
-//  Tab.swift
+//  CoreBrowser.Tab.swift
 //  catowser
 //
 //  Created by admin on 12/06/2017.
@@ -9,8 +9,8 @@
 import CottonBase
 
 /// Site is an obj-c type.
-///  https://github.com/apple/swift-evolution/blob/main/proposals/0302-concurrent-value-and-concurrent-closures.md
-extension Site: @unchecked Sendable {}
+/// can mark with retroactive because Site type is from my CottonBase library
+extension Site: @unchecked @retroactive Sendable {}
 
 public extension Tab {
     enum ContentType: Sendable {
@@ -43,7 +43,7 @@ public extension Tab {
                 return .blank
             case 1:
                 guard let actualSite = site else {
-                    print("No site instance for Tab.ContentType site \(rawValue)")
+                    print("No site instance for CoreBrowser.Tab.ContentType site \(rawValue)")
                     return nil
                 }
                 return .site(actualSite)
@@ -54,7 +54,7 @@ public extension Tab {
             case 4:
                 return .topSites
             default:
-                print("Unexpected Tab.ContentType \(rawValue)")
+                print("Unexpected CoreBrowser.Tab.ContentType \(rawValue)")
                 return nil
             }
         }
@@ -101,7 +101,7 @@ public extension Tab {
 }
 
 extension Tab.ContentType: CaseIterable {
-    public static var allCases: [Tab.ContentType] {
+    public static var allCases: [CoreBrowser.Tab.ContentType] {
         [.blank, .homepage, .topSites, .favorites]
     }
 }
@@ -127,7 +127,7 @@ extension Tab.ContentType: CustomDebugStringConvertible {
 }
 
 extension Tab.ContentType: Equatable {
-    public static func == (lhs: Tab.ContentType, rhs: Tab.ContentType) -> Bool {
+    public static func == (lhs: CoreBrowser.Tab.ContentType, rhs: CoreBrowser.Tab.ContentType) -> Bool {
         switch (lhs, rhs) {
         case (.site(let lSite), .site(let rSite)):
             return lSite.compareWith(rSite)
@@ -210,7 +210,7 @@ public struct Tab: Sendable {
     }
 
     /**
-     Initializes an instance of `Tab` type.
+     Initializes an instance of `CoreBrowser.Tab` type.
      */
     public init(contentType: ContentType,
                 idenifier: UUID = .init(),
@@ -220,11 +220,11 @@ public struct Tab: Sendable {
         id = idenifier
     }
 
-    public static let blank: Tab = Tab(contentType: .blank)
+    public static let blank: CoreBrowser.Tab = CoreBrowser.Tab(contentType: .blank)
 }
 
 extension Tab: Equatable {
-    public static func == (lhs: Tab, rhs: Tab) -> Bool {
+    public static func == (lhs: CoreBrowser.Tab, rhs: CoreBrowser.Tab) -> Bool {
         return lhs.id == rhs.id
     }
 }

catowseriOS/CoreBrowser/Tabs/TabAddStates.swift

@@ -10,7 +10,7 @@ import Foundation
 
 /// Describes how new tab is added to the list.
 /// Uses `Int` as raw value to be able to store it in settings.
-public enum AddedTabPosition: Int, CaseIterable {
+public enum AddedTabPosition: Int, CaseIterable, Sendable {
     case listEnd = 0
     case afterSelected = 1
 }

catowseriOS/CoreBrowser/Tabs/TabContentState.swift

@@ -8,15 +8,15 @@
 
 import Foundation
 
-/// Twin type for `Tab.ContentType` to have `rawValue`
+/// Twin type for `CoreBrowser.Tab.ContentType` to have `rawValue`
 /// and use it for settings.
-public enum TabContentDefaultState: Int, CaseIterable, CustomStringConvertible {
+public enum TabContentDefaultState: Int, CaseIterable, CustomStringConvertible, Sendable {
     case blank
     case homepage
     case favorites
     case topSites
 
-    public var contentType: Tab.ContentType {
+    public var contentType: CoreBrowser.Tab.ContentType {
         switch self {
         case .blank:
             return .blank

catowseriOS/CoreBrowser/Tabs/TabSelectionStrategy.swift

@@ -14,9 +14,11 @@ public protocol IndexSelectionContext: AutoMockable {
     var currentlySelectedIndex: Int { get async }
 }
 
-public protocol TabSelectionStrategy: AutoMockable {
+/// CoreBrowser.Tab selection protocol can be sendable, because implementation
+/// only hold a constant which can't be mutated, so that, no any mutable state for now.
+public protocol TabSelectionStrategy: AutoMockable, Sendable {
     /**
-     A Tab selection strategy (Compositor) defines the algorithms of tab selection in specific cases
+     A CoreBrowser.Tab selection strategy (Compositor) defines the algorithms of tab selection in specific cases
      - when tab was removed and need to select another
      */
     func autoSelectedIndexAfterTabRemove(_ context: IndexSelectionContext, removedIndex: Int) async -> Int