fix(xcode13): Xcode 13 beta compiler issues (#179)

algolia · Sep 8, 2021 · 1665c7a · 1665c7a
1 parent 2e0e66a
commit 1665c7a
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 23 deletions.
diff --git a/Sources/InstantSearch/AdvancedConnectors/SingleIndexSearchConnector+UIKit.swift b/Sources/InstantSearch/AdvancedConnectors/SingleIndexSearchConnector+UIKit.swift
@@ -15,7 +15,7 @@ public extension SingleIndexSearchConnector {
 
   init<HC: HitsController>(searcher: SingleIndexSearcher,
                            searchController: UISearchController,
-                           hitsInteractor: HitsInteractor<Record> = .init(),
+                           hitsInteractor: HitsInteractor<Record>,
                            hitsController: HC,
                            filterState: FilterState? = nil)  where HC.DataSource == HitsInteractor<Record> {
     let queryInputInteractor = QueryInputInteractor()
@@ -42,7 +42,7 @@ public extension SingleIndexSearchConnector {
                            apiKey: APIKey,
                            indexName: IndexName,
                            searchController: UISearchController,
-                           hitsInteractor: HitsInteractor<Record> = .init(),
+                           hitsInteractor: HitsInteractor<Record>,
                            hitsController: HC,
                            filterState: FilterState? = nil) where HC.DataSource == HitsInteractor<Record> {
     let searcher = SingleIndexSearcher(appID: appID,

diff --git a/Sources/InstantSearch/SwiftUI/SearchBar.swift b/Sources/InstantSearch/SwiftUI/SearchBar.swift
@@ -84,7 +84,7 @@ public struct SearchBar: View {
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
 public extension View {
   func hideKeyboard() {
-      UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+//      UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
   }
 }
 #endif
diff --git a/Sources/InstantSearchCore/AdvancedConnectors/SingleIndexSearchConnector.swift b/Sources/InstantSearchCore/AdvancedConnectors/SingleIndexSearchConnector.swift
@@ -53,7 +53,7 @@ public struct SingleIndexSearchConnector<Record: Codable>: Connection {
   public init<HC: HitsController, QI: QueryInputController>(searcher: SingleIndexSearcher,
                                                             queryInputInteractor: QueryInputInteractor = .init(),
                                                             queryInputController: QI,
-                                                            hitsInteractor: HitsInteractor<Record> = .init(),
+                                                            hitsInteractor: HitsInteractor<Record>,
                                                             hitsController: HC,
                                                             filterState: FilterState? = nil) where HC.DataSource == HitsInteractor<Record> {
     hitsConnector = .init(searcher: searcher, interactor: hitsInteractor, filterState: filterState)
@@ -88,7 +88,7 @@ public struct SingleIndexSearchConnector<Record: Codable>: Connection {
                                                             indexName: IndexName,
                                                             queryInputInteractor: QueryInputInteractor = .init(),
                                                             queryInputController: QI,
-                                                            hitsInteractor: HitsInteractor<Record> = .init(),
+                                                            hitsInteractor: HitsInteractor<Record>,
                                                             hitsController: HC,
                                                             filterState: FilterState? = nil)  where HC.DataSource == HitsInteractor<Record> {
     let searcher = SingleIndexSearcher(appID: appID,

diff --git a/Sources/InstantSearchCore/Common/SelectableList/SelectableListController.swift b/Sources/InstantSearchCore/Common/SelectableList/SelectableListController.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol SelectableListController: class, Reloadable {
+public protocol SelectableListController: AnyObject, Reloadable {
 
   associatedtype Item
 

diff --git a/Sources/InstantSearchCore/CurrentFilters/ItemListController.swift b/Sources/InstantSearchCore/CurrentFilters/ItemListController.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol ItemListController: class {
+public protocol ItemListController: AnyObject {
 
   associatedtype Item: Hashable
 

diff --git a/Sources/InstantSearchCore/Hits/Connector/HitsConnector+Controller.swift b/Sources/InstantSearchCore/Hits/Connector/HitsConnector+Controller.swift
@@ -18,14 +18,14 @@ public extension HitsConnector {
      - externalReload: Defines if controller will be updated automatically by the events or manually
   */
   convenience init<Controller: HitsController>(searcher: SingleIndexSearcher,
-                                               interactor: HitsInteractor<Hit> = .init(),
+                                               interactor: HitsInteractor<Hit>,
                                                filterState: FilterState? = .none,
                                                controller: Controller,
                                                externalReload: Bool = false) where Controller.DataSource == HitsInteractor<Hit> {
     self.init(searcher: searcher,
               interactor: interactor,
               filterState: filterState,
-              connectSearcher: interactor.connectSearcher,
+              connectSearcher: { interactor.connectSearcher($0) },
               controller: controller,
               externalReload: externalReload)
   }
@@ -56,7 +56,7 @@ public extension HitsConnector {
     self.init(searcher: searcher,
               interactor: interactor,
               filterState: filterState,
-              connectSearcher: interactor.connectSearcher,
+              connectSearcher: { interactor.connectSearcher($0) },
               controller: controller,
               externalReload: externalReload)
   }

diff --git a/Sources/InstantSearchCore/Hits/HitsSource.swift b/Sources/InstantSearchCore/Hits/HitsSource.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol HitsSource: class {
+public protocol HitsSource: AnyObject {
 
   associatedtype Record: Codable
 

diff --git a/Sources/InstantSearchCore/InfiniteScrolling/InfiniteScrollable.swift b/Sources/InstantSearchCore/InfiniteScrolling/InfiniteScrollable.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol InfiniteScrollable: class {
+protocol InfiniteScrollable: AnyObject {
 
   var lastPageIndex: Int? { get set }
   var pageLoader: PageLoadable? { get set }

diff --git a/Sources/InstantSearchCore/MultiIndexHits/MultiIndexHitsSource.swift b/Sources/InstantSearchCore/MultiIndexHits/MultiIndexHitsSource.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol MultiIndexHitsSource: class {
+public protocol MultiIndexHitsSource: AnyObject {
 
   func numberOfSections() -> Int
   func numberOfHits(inSection section: Int) -> Int

diff --git a/Sources/InstantSearchCore/Pagination/PageLoadable.swift b/Sources/InstantSearchCore/Pagination/PageLoadable.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol PageLoadable: class {
+public protocol PageLoadable: AnyObject {
 
   func loadPage(atIndex pageIndex: Int)
 

diff --git a/Sources/InstantSearchCore/QueryInput/QueryInputController.swift b/Sources/InstantSearchCore/QueryInput/QueryInputController.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol QueryInputController: class {
+public protocol QueryInputController: AnyObject {
   var onQueryChanged: ((String?) -> Void)? { get set }
   var onQuerySubmitted: ((String?) -> Void)? { get set }
   func setQuery(_ query: String?)

diff --git a/Sources/InstantSearchCore/Searcher/HierarchicalFacetingDelegate.swift b/Sources/InstantSearchCore/Searcher/HierarchicalFacetingDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol HierarchicalFacetingDelegate: class {
+public protocol HierarchicalFacetingDelegate: AnyObject {
   var hierarchicalAttributes: [Attribute] { get set }
   var hierarchicalFilters: [Filter.Facet] { get set }
 }
diff --git a/Sources/InstantSearchInsights/Logic/EventProcessor.swift b/Sources/InstantSearchInsights/Logic/EventProcessor.swift
@@ -13,8 +13,9 @@ import AlgoliaSearchClient
 /// - Storing of the events in the persistent storage (if provided)
 /// - Forming the bounded packages of the events
 /// – Synchronizing the events with a provided Service
-class EventProcessor<Event, Service: EventsService, PackageStorage: Storage>: Flushable where Service.Event == Event,
-                                                                                              PackageStorage.Item == [Package<Event>] {
+class EventProcessor<Service: EventsService, PackageStorage: Storage>: Flushable where PackageStorage.Item == [Package<Service.Event>] {
+
+  public typealias Event = Service.Event
 
   /// The service to sync the events with
   let service: Service

diff --git a/Tests/InstantSearchTests/Snippets/HitsSnippets.swift b/Tests/InstantSearchTests/Snippets/HitsSnippets.swift
@@ -46,12 +46,12 @@ class HitsSnippets {
     let filterState: FilterState  = .init()
     let hitsTableViewController = CustomHitsTableViewController()
     let hitsConnector = HitsConnector<CustomHitModel>(appID: "YourApplicationID",
-                                                  apiKey: "YourSearchOnlyAPIKey",
-                                                  indexName: "YourIndexName",
-                                                  filterState: filterState,
-                                                  controller: hitsTableViewController)
+                                                      apiKey: "YourSearchOnlyAPIKey",
+                                                      indexName: "YourIndexName",
+                                                      filterState: filterState,
+                                                      controller: hitsTableViewController)
+
 
-
     hitsConnector.searcher.search()
   }