fix: Add conditional imports for Combine & SwiftUI (#173)

VladislavFitz · web-flow · commit c9ab1d59a875 · 2021-05-27T17:15:13.000+02:00
diff --git a/.github/semantic.yml b/.github/semantic.yml
@@ -0,0 +1,2 @@
+# Always validate the PR title, and ignore the commits
+titleOnly: true
diff --git a/Sources/InstantSearch/SwiftUI/FacetList.swift b/Sources/InstantSearch/SwiftUI/FacetList.swift
@@ -6,9 +6,10 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI) && (os(iOS) || os(macOS))
+import Combine
 import SwiftUI
 
-#if os(iOS) || os(macOS)
 /// A view presenting the list of facets
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
 public struct FacetList<Row: View, NoResults: View>: View {
diff --git a/Sources/InstantSearch/SwiftUI/FacetRow.swift b/Sources/InstantSearch/SwiftUI/FacetRow.swift
@@ -6,6 +6,8 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
 import SwiftUI
 
 /// A view presenting the facet value and its selection state
@@ -46,3 +48,4 @@ public struct FacetRow: View {
   }
 
 }
+#endif
diff --git a/Sources/InstantSearch/SwiftUI/HierarchicalList.swift b/Sources/InstantSearch/SwiftUI/HierarchicalList.swift
@@ -6,9 +6,10 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI) && os(iOS)
+import Combine
 import SwiftUI
 
-#if os(iOS)
 /// A view presenting the list of hierarchical facets
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
 public struct HierarchicalList: View {
diff --git a/Sources/InstantSearch/SwiftUI/HitsList.swift b/Sources/InstantSearch/SwiftUI/HitsList.swift
@@ -6,6 +6,8 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
 import SwiftUI
 
 /// A view presenting the list of search hits
@@ -17,7 +19,7 @@ public struct HitsList<Row: View, Item: Codable, NoResults: View>: View {
   /// Closure constructing a hit row view
   public var row: (Item?, Int) -> Row
 
-  /// Closure constructing a no results view
+  /// Closure constructing a no results view-
   public var noResults: (() -> NoResults)?
 
   public init(_ hitsObservable: HitsObservableController<Item>,
@@ -107,3 +109,4 @@ struct HitsView_Previews: PreviewProvider {
   }
 }
 #endif
+#endif
diff --git a/Sources/InstantSearch/SwiftUI/SearchBar.swift b/Sources/InstantSearch/SwiftUI/SearchBar.swift
@@ -6,9 +6,10 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI) && os(iOS)
+import Combine
 import SwiftUI
 
-#if os(iOS)
 /// A specialized view for receiving search query text from the user.
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
 public struct SearchBar: View {
diff --git a/Sources/InstantSearch/SwiftUI/Text+Highlighting.swift b/Sources/InstantSearch/SwiftUI/Text+Highlighting.swift
@@ -6,6 +6,8 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
 import SwiftUI
 
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -74,3 +76,4 @@ struct HighlightedText_Previews: PreviewProvider {
 
 }
 #endif
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/FacetListObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FacetListObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// FacetListController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -47,3 +50,4 @@ public class FacetListObservableController: ObservableObject, FacetListControlle
   }
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/FilterClearObservableController.swift b/Sources/InstantSearchCore/SwiftUI/FilterClearObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// FilterClearController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -21,3 +24,4 @@ public class FilterClearObservableController: ObservableObject, FilterClearContr
   public init() {}
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/HierarchicalObservableController.swift b/Sources/InstantSearchCore/SwiftUI/HierarchicalObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// HierarchicalController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -30,3 +33,4 @@ public class HierarchicalObservableController: ObservableObject, HierarchicalCon
   }
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/HitsObservableController.swift b/Sources/InstantSearchCore/SwiftUI/HitsObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// HitsController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -43,3 +46,4 @@ public class HitsObservableController<Hit: Codable>: ObservableObject, HitsContr
   }
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/QueryInputObservableController.swift b/Sources/InstantSearchCore/SwiftUI/QueryInputObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// QueryInputController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -36,3 +39,4 @@ public class QueryInputObservableController: ObservableObject, QueryInputControl
   }
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/StatsObservableController.swift b/Sources/InstantSearchCore/SwiftUI/StatsObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// StatsTextController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -23,3 +26,4 @@ public class StatsObservableController: ObservableObject, StatsTextController {
   }
 
 }
+#endif
diff --git a/Sources/InstantSearchCore/SwiftUI/SwitchIndexObservableController.swift b/Sources/InstantSearchCore/SwiftUI/SwitchIndexObservableController.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(Combine) && canImport(SwiftUI)
+import Combine
+import SwiftUI
 
 /// SwitchIndexController implementation adapted for usage with SwiftUI views
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -31,3 +34,4 @@ public class SwitchIndexObservableController: ObservableObject, SwitchIndexContr
   }
 
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Always validate the PR title, and ignore the commits`
	`2`	`+titleOnly: true`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`import Foundation`
	`9`	`+#if canImport(Combine) && canImport(SwiftUI)`
	`10`	`+import Combine`
`9`	`11`	`import SwiftUI`
`10`	`12`
`11`	`13`	`/// A view presenting the facet value and its selection state`
`@@ -46,3 +48,4 @@ public struct FacetRow: View {`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`}`
	`51`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`import Foundation`
	`9`	`+#if canImport(Combine) && canImport(SwiftUI)`
	`10`	`+import Combine`
	`11`	`+import SwiftUI`
`9`	`12`
`10`	`13`	`/// FacetListController implementation adapted for usage with SwiftUI views`
`11`	`14`	`@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)`
`@@ -47,3 +50,4 @@ public class FacetListObservableController: ObservableObject, FacetListControlle`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`}`
	`53`	`+#endif`