Update for swift 5.8 (#4)

* updated result builder * updated views init to avoid ambiguity
KazaiMazai · Aug 21, 2023 · dfc9c59 · dfc9c59
1 parent 3715de1
commit dfc9c59
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/Sources/SwiftyUIKit/HStackView.swift b/Sources/SwiftyUIKit/HStackView.swift
@@ -8,12 +8,8 @@
 import UIKit
 
 public extension HStackView {
-    convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
-        self.init(spacing: spacing, content: content())
-    }
-
-    convenience init(spacing: CGFloat = 0, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
-        self.init(spacing: spacing, content: optionalContent())
+    convenience init(spacing: CGFloat = 0, @ViewContentBuilder contentBuilder: () -> [UIView]) {
+        self.init(spacing: spacing, content: contentBuilder())
     }
 }
 

diff --git a/Sources/SwiftyUIKit/VStackView.swift b/Sources/SwiftyUIKit/VStackView.swift
@@ -8,12 +8,8 @@
 import UIKit
 
 public extension VStackView {
-     convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
-        self.init(spacing: spacing, content: content())
-    }
-
-    convenience init(spacing: CGFloat = 0, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
-        self.init(spacing: spacing, content: optionalContent())
+     convenience init(spacing: CGFloat = 0, @ViewContentBuilder _ contentBuilder: () -> [UIView]) {
+        self.init(spacing: spacing, content: contentBuilder())
     }
 }
 

diff --git a/Sources/SwiftyUIKit/ViewContentBuilder.swift b/Sources/SwiftyUIKit/ViewContentBuilder.swift
@@ -9,13 +9,6 @@ import UIKit
 
 @resultBuilder
 public struct ViewContentBuilder {
-    public static func buildBlock(_ subviews: UIView...) -> [UIView] {
-        subviews
-    }
-}
-
-@resultBuilder
-public struct OptionalViewContentBuilder {
     public static func buildBlock(_ subviews: UIView?...) -> [UIView] {
         subviews.compactMap { $0 }
     }

diff --git a/Sources/SwiftyUIKit/ZStackView.swift b/Sources/SwiftyUIKit/ZStackView.swift
@@ -8,12 +8,8 @@
 import UIKit
 
 public extension ZStackView {
-     convenience init(alignment: Alignment = .all, @ViewContentBuilder content: () -> [UIView]) {
-        self.init(alignment: alignment, content: content())
-    }
-
-    convenience init(alignment: Alignment = .all, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
-        self.init(alignment: alignment, content: optionalContent())
+    convenience init(alignment: Alignment = .all, @ViewContentBuilder _ contentBuilder: () -> [UIView]) {
+        self.init(alignment: alignment, content: contentBuilder())
     }
 }