Fix multi-platform builds

danielsaidi · Mar 16, 2024 · 17c914c · 17c914c
1 parent 95a3687
commit 17c914c
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 22 deletions.
diff --git a/Sources/SwiftUIKit/Lists/ListAction.swift b/Sources/SwiftUIKit/Lists/ListAction.swift
@@ -19,10 +19,8 @@ public enum ListAction {
     /// Call a certain phone number.
     case call(phoneNumber: String)
 
-    #if os(macOS) || os(iOS)
     /// Copy a certain value.
     case copy(String)
-    #endif
 
     /// Email a certain address.
     case email(address: String)

diff --git a/Sources/SwiftUIKit/Lists/ListSelectItem.swift b/Sources/SwiftUIKit/Lists/ListSelectItem.swift
@@ -90,9 +90,11 @@ public struct ListSelectItem<Content: View, SelectIndicator: View>: View {
                             Label("Item \(index)", systemImage: "\(index).circle")
                         }
                     }
+                    #if os(iOS) || os(macOS) || os(visionOS)
                     .onTapGesture {
                         selection = index
                     }
+                    #endif
                 }
             }
         }

diff --git a/Sources/SwiftUIKit/Pickers/ForEachMultiPicker.swift b/Sources/SwiftUIKit/Pickers/ForEachMultiPicker.swift
@@ -16,7 +16,7 @@ import SwiftUI
  to get more control over the list item views. The view uses
  the provided `listItem` to build an item view for each item.
  */
-public struct ForEachMultiPicker<Item: Identifiable, ItemView: View>: View, DismissableView {
+public struct ForEachMultiPicker<Item: Identifiable, ItemView: View>: View {
 
     /// Create a for-each multi-picker.
     ///

diff --git a/Sources/SwiftUIKit/Pickers/ForEachPicker.swift b/Sources/SwiftUIKit/Pickers/ForEachPicker.swift
@@ -19,7 +19,7 @@ import SwiftUI
  If `dismissAfterPick` is `true` the picker dismisses itself
  automatically when an item is picked.
  */
-public struct ForEachPicker<Item: Identifiable, ItemView: View>: View, DismissableView {
+public struct ForEachPicker<Item: Identifiable, ItemView: View>: View {
 
     /// Create a for-each picker.
     ///

diff --git a/Sources/SwiftUIKit/Pickers/ListMultiPicker.swift b/Sources/SwiftUIKit/Pickers/ListMultiPicker.swift
@@ -16,7 +16,7 @@ import SwiftUI
  to get more control over the list item views. The view uses
  the provided `listItem` to build an item view for each item.
  */
-public struct ListMultiPicker<Item: Identifiable, ItemView: View>: View, DismissableView {
+public struct ListMultiPicker<Item: Identifiable, ItemView: View>: View {
 
     /// Create a list picker.
     ///

diff --git a/Sources/SwiftUIKit/Pickers/ListPicker.swift b/Sources/SwiftUIKit/Pickers/ListPicker.swift
@@ -19,7 +19,7 @@ import SwiftUI
  If `dismissAfterPick` is `true` the picker dismisses itself
  automatically when an item is picked.
  */
-public struct ListPicker<Item: Identifiable, ItemView: View>: View, DismissableView {
+public struct ListPicker<Item: Identifiable, ItemView: View>: View {
 
     /// Create a list picker.
     ///

diff --git a/Sources/SwiftUIKit/Progress/LinearProgressBar+Style.swift b/Sources/SwiftUIKit/Progress/LinearProgressBar+Style.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2024 Daniel Saidi. All rights reserved.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS)
+#if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
 import SwiftUI
 
 public extension LinearProgressBar {
@@ -96,5 +96,4 @@ public extension EnvironmentValues {
         set { self [LinearProgressBar.Style.Key.self] = newValue }
     }
 }
-
 #endif
diff --git a/Sources/SwiftUIKit/Progress/LinearProgressBar.swift b/Sources/SwiftUIKit/Progress/LinearProgressBar.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2024 Daniel Saidi. All rights reserved.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS)
+#if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
 import SwiftUI
 
 /**

diff --git a/Sources/SwiftUIKit/SwiftUIKit.docc/Resources/Logo.png b/Sources/SwiftUIKit/SwiftUIKit.docc/Resources/Logo.png
diff --git a/Sources/SwiftUIKit/Text/LinkText.swift b/Sources/SwiftUIKit/Text/LinkText.swift
@@ -270,7 +270,7 @@ private extension View {
     func preferredFontWeight(
         _ weight: Font.Weight
     ) -> some View {
-        if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 8.0, *) {
+        if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) {
             self.fontWeight(weight)
         } else {
             self

diff --git a/Sources/SwiftUIKit/Views/CustomRoundedRectangle.swift b/Sources/SwiftUIKit/Views/CustomRoundedRectangle.swift
@@ -64,17 +64,6 @@ public struct CustomRoundedRectangle: Shape {
 #Preview {
 
     VStack {
-        if #available(iOS 16.0, *) {
-            UnevenRoundedRectangle(
-                cornerRadii: .init(
-                    topLeading: 10,
-                    bottomLeading: 20,
-                    bottomTrailing: 30,
-                    topTrailing: 40
-                )
-            )
-        }
-
         CustomRoundedRectangle(
             topLeft: 10,
             topRight: 20,

diff --git a/Sources/SwiftUIKit/_Deprecated/Progress+Deprecated.swift b/Sources/SwiftUIKit/_Deprecated/Progress+Deprecated.swift
@@ -13,6 +13,7 @@ public extension CircularProgressBar {
     }
 }
 
+#if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
 public extension LinearProgressBar {
 
     @available(*, deprecated, message: "Custom styles must now be applied with .circularProgressBarStyle.")
@@ -24,7 +25,7 @@ public extension LinearProgressBar {
         self.init(progress: progress)
     }
 }
-
+#endif
 
 @available(*, deprecated, message: "This is deprecated, use the new SwiftUI animations instead")
 public extension Animation {