Updated compability.

sparrowcode · Sep 8, 2023 · 08529c0 · 08529c0
1 parent 19ffe80
commit 08529c0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,9 @@ import PackageDescription
 let package = Package(
     name: "SwiftUIExtension",
     platforms: [
-        .iOS(.v14)
+        .iOS(.v14), 
+        .watchOS(.v6),
+        .macOS(.v10_15)
     ],
     products: [
         .library(

diff --git a/Sources/SwiftUIExtension/Compability/ViewCompability.swift b/Sources/SwiftUIExtension/Compability/ViewCompability.swift
@@ -3,18 +3,34 @@ import SwiftUI
 extension View {
 
     public func fontWeightCompability(_ weight: Font.Weight) -> some View {
-        if #available(iOS 16.0, watchOS 9.0, *) {
+        if #available(iOS 16.0, watchOS 9.0, macOS 13.0, *) {
             return self.fontWeight(weight)
         } else {
             return self
         }
     }
 
     public func invalidatableContentCompability() -> some View {
-        if #available(iOS 17.0, watchOS 10.0, *) {
+        if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
             return self.invalidatableContent()
         } else {
             return self
         }
     }
+
+    public func scrollTargetLayoutCompability(isEnabled: Bool = true) -> some View {
+        if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
+            return self.scrollTargetLayout(isEnabled: isEnabled)
+        } else {
+            return self
+        }
+    }
+
+    public func scrollClipDisabledCompability(_ disabled: Bool = true) -> some View {
+        if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
+            return self.scrollClipDisabled(disabled)
+        } else {
+            return self
+        }
+    }
 }
diff --git a/Sources/SwiftUIExtension/Compability/WidgetConfigurationCompability.swift b/Sources/SwiftUIExtension/Compability/WidgetConfigurationCompability.swift
@@ -1,11 +1,11 @@
 import SwiftUI
 import WidgetKit
 
-@available(watchOS 9.0, *)
+@available(watchOS 9.0, macOS 11.0, *)
 extension WidgetConfiguration {
 
     public func contentMarginsSafeDisabled() -> some WidgetConfiguration {
-        if #available(iOS 15.0, *) {
+        if #available(iOS 15.0, macOS 12.0, *) {
             return self.contentMarginsDisabled()
         } else {
             return self

diff --git a/Sources/SwiftUIExtension/Compability/WidgetViewCompability.swift b/Sources/SwiftUIExtension/Compability/WidgetViewCompability.swift
@@ -13,7 +13,7 @@ struct ContainerBackgroundForWidgetCompabilityModifier<Background>: ViewModifier
     let background: () -> Background
 
     func body(content: Content) -> some View {
-        if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, *) {
+        if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, macOS 14.0, *) {
             content
                 .containerBackground(for: .widget) {
                     background()

diff --git a/Sources/SwiftUIExtension/Extensions/ColorExtension.swift b/Sources/SwiftUIExtension/Extensions/ColorExtension.swift
@@ -3,8 +3,10 @@ import SwiftBoost
 
 extension View {
 
+    #if canImport(UIKit)
     @available(iOS 15.0, watchOS 8.0, *)
     public func foregroundColor(_ color: UIColor) -> some View {
         self.foregroundColor(.init(uiColor: color))
     }
+    #endif
 }
diff --git a/Sources/SwiftUIExtension/Views/FadeBlurView.swift b/Sources/SwiftUIExtension/Views/FadeBlurView.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 
-@available(iOS 15.0, iOSApplicationExtension 15.0, watchOS 8.0, *)
+@available(iOS 15.0, iOSApplicationExtension 15.0, watchOS 8.0, macOS 12.0, *)
 public struct FadeBlurView: View {
 
     let style: any ShapeStyle