Skip to content

Commit 08529c0

Browse files
committed
Updated compability.
1 parent 19ffe80 commit 08529c0

File tree

6 files changed

+27
-7
lines changed

6 files changed

+27
-7
lines changed

Package.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import PackageDescription
55
let package = Package(
66
name: "SwiftUIExtension",
77
platforms: [
8-
.iOS(.v14)
8+
.iOS(.v14),
9+
.watchOS(.v6),
10+
.macOS(.v10_15)
911
],
1012
products: [
1113
.library(

Sources/SwiftUIExtension/Compability/ViewCompability.swift

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,34 @@ import SwiftUI
33
extension View {
44

55
public func fontWeightCompability(_ weight: Font.Weight) -> some View {
6-
if #available(iOS 16.0, watchOS 9.0, *) {
6+
if #available(iOS 16.0, watchOS 9.0, macOS 13.0, *) {
77
return self.fontWeight(weight)
88
} else {
99
return self
1010
}
1111
}
1212

1313
public func invalidatableContentCompability() -> some View {
14-
if #available(iOS 17.0, watchOS 10.0, *) {
14+
if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
1515
return self.invalidatableContent()
1616
} else {
1717
return self
1818
}
1919
}
20+
21+
public func scrollTargetLayoutCompability(isEnabled: Bool = true) -> some View {
22+
if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
23+
return self.scrollTargetLayout(isEnabled: isEnabled)
24+
} else {
25+
return self
26+
}
27+
}
28+
29+
public func scrollClipDisabledCompability(_ disabled: Bool = true) -> some View {
30+
if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
31+
return self.scrollClipDisabled(disabled)
32+
} else {
33+
return self
34+
}
35+
}
2036
}

Sources/SwiftUIExtension/Compability/WidgetConfigurationCompability.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import SwiftUI
22
import WidgetKit
33

4-
@available(watchOS 9.0, *)
4+
@available(watchOS 9.0, macOS 11.0, *)
55
extension WidgetConfiguration {
66

77
public func contentMarginsSafeDisabled() -> some WidgetConfiguration {
8-
if #available(iOS 15.0, *) {
8+
if #available(iOS 15.0, macOS 12.0, *) {
99
return self.contentMarginsDisabled()
1010
} else {
1111
return self

Sources/SwiftUIExtension/Compability/WidgetViewCompability.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct ContainerBackgroundForWidgetCompabilityModifier<Background>: ViewModifier
1313
let background: () -> Background
1414

1515
func body(content: Content) -> some View {
16-
if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, *) {
16+
if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, macOS 14.0, *) {
1717
content
1818
.containerBackground(for: .widget) {
1919
background()

Sources/SwiftUIExtension/Extensions/ColorExtension.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ import SwiftBoost
33

44
extension View {
55

6+
#if canImport(UIKit)
67
@available(iOS 15.0, watchOS 8.0, *)
78
public func foregroundColor(_ color: UIColor) -> some View {
89
self.foregroundColor(.init(uiColor: color))
910
}
11+
#endif
1012
}

Sources/SwiftUIExtension/Views/FadeBlurView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SwiftUI
22

3-
@available(iOS 15.0, iOSApplicationExtension 15.0, watchOS 8.0, *)
3+
@available(iOS 15.0, iOSApplicationExtension 15.0, watchOS 8.0, macOS 12.0, *)
44
public struct FadeBlurView: View {
55

66
let style: any ShapeStyle

0 commit comments

Comments
 (0)