fix: Xcode 13 archive issues (#195)

VladislavFitz · web-flow · commit 15687b0c5e05 · 2021-09-22T10:28:50.000+02:00
* add architecture requirements for SwiftUI sources
* fix macOS compatibility issues
diff --git a/Sources/InstantSearch/SwiftUI/FacetList.swift b/Sources/InstantSearch/SwiftUI/FacetList.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI) && (os(iOS) || os(macOS))
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/FacetRow.swift b/Sources/InstantSearch/SwiftUI/FacetRow.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/FilterList.swift b/Sources/InstantSearch/SwiftUI/FilterList.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI) && (os(iOS) || os(macOS))
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/HierarchicalFacetRow.swift b/Sources/InstantSearch/SwiftUI/HierarchicalFacetRow.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/HierarchicalList.swift b/Sources/InstantSearch/SwiftUI/HierarchicalList.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI) && os(iOS)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
@@ -60,7 +60,7 @@ public extension HierarchicalList where NoResults == Never {
 
 }
 
-@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+@available(iOS 13.0, OSX 11.0, tvOS 13.0, watchOS 6.0, *)
 struct HierarchicalListPreview: PreviewProvider {
 
   static var previews: some View {
diff --git a/Sources/InstantSearch/SwiftUI/HitsList.swift b/Sources/InstantSearch/SwiftUI/HitsList.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/SearchBar.swift b/Sources/InstantSearch/SwiftUI/SearchBar.swift
@@ -6,12 +6,12 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI) && os(iOS)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
 /// A specialized view for receiving search query text from the user.
-@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+@available(iOS 13.0, OSX 11.0, tvOS 13.0, watchOS 6.0, *)
 public struct SearchBar: View {
 
   /// Search query text
@@ -41,7 +41,6 @@ public struct SearchBar: View {
       })
       .padding(7)
       .padding(.horizontal, 25)
-      .background(Color(.systemGray5))
       .cornerRadius(8)
       .overlay(
         HStack {
@@ -81,7 +80,7 @@ public struct SearchBar: View {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
+@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
 public extension View {
   func hideKeyboard() {
 //      UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
diff --git a/Sources/InstantSearch/SwiftUI/SuggestionRow.swift b/Sources/InstantSearch/SwiftUI/SuggestionRow.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearch/SwiftUI/Text+Highlighting.swift b/Sources/InstantSearch/SwiftUI/Text+Highlighting.swift
@@ -6,12 +6,12 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
-public extension Text {
+public extension SwiftUI.Text {
 
   /**
    - parameter highlightedString: HighlightedString value
diff --git a/Sources/InstantSearchCore/SwiftUI/CurrentFiltersObservableController.swift b/Sources/InstantSearchCore/SwiftUI/CurrentFiltersObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/DynamicFacetListObservableController.swift b/Sources/InstantSearchCore/SwiftUI/DynamicFacetListObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/FacetListObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FacetListObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/FilterClearObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FilterClearObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/FilterListObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FilterListObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/FilterToggleObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FilterToggleObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/HierarchicalObservableController.swift b/Sources/InstantSearchCore/SwiftUI/HierarchicalObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/HitsObservableController.swift b/Sources/InstantSearchCore/SwiftUI/HitsObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/LoadingObservableController.swift b/Sources/InstantSearchCore/SwiftUI/LoadingObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/NumberRangeObservableController.swift b/Sources/InstantSearchCore/SwiftUI/NumberRangeObservableController.swift
@@ -5,7 +5,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/QueryInputObservableController.swift b/Sources/InstantSearchCore/SwiftUI/QueryInputObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/RelevantSortObservableController.swift b/Sources/InstantSearchCore/SwiftUI/RelevantSortObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/SelectableSegmentObservableController.swift b/Sources/InstantSearchCore/SwiftUI/SelectableSegmentObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/StatsObservableController.swift b/Sources/InstantSearchCore/SwiftUI/StatsObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/StatsTextObservableController.swift b/Sources/InstantSearchCore/SwiftUI/StatsTextObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
diff --git a/Sources/InstantSearchCore/SwiftUI/SwitchIndexObservableController.swift b/Sources/InstantSearchCore/SwiftUI/SwitchIndexObservableController.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if canImport(Combine) && canImport(SwiftUI)
+#if canImport(Combine) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import Combine
 import SwiftUI
 
