🛠 Migrate to Swift 5.5

MihaelIsaev · MihaelIsaev · commit 5587ce4bb0c3 · 2021-09-23T00:10:04.000+04:00
diff --git a/Classes/Controllers/BaseApp/LifeCycle.swift b/Classes/Controllers/BaseApp/LifeCycle.swift
@@ -10,7 +10,7 @@ import UIKit
 
 public var Lifecycle: LifecycleBuilderProtocol { LifecycleBuilder() }
 
-public protocol LifecycleBuilderProtocol: class, AppBuilderContent {
+public protocol LifecycleBuilderProtocol: AnyObject, AppBuilderContent {
     func didFinishLaunching(_ handler: @escaping () -> Void) -> Self
     func willFinishLaunching(_ handler: @escaping (_ launchOptions: [UIApplication.LaunchOptionsKey: Any]) -> Bool) -> Self
     func didFinishLaunching(_ handler: @escaping (_ launchOptions: [UIApplication.LaunchOptionsKey: Any]) -> Bool) -> Self
diff --git a/Classes/Controllers/MacApp.swift b/Classes/Controllers/MacApp.swift
@@ -144,7 +144,7 @@ open class App: NSApplication, NSApplicationDelegate {
 //    let windowsBuilderContent: WindowsBuilderItem
 //}
 //
-//@_functionBuilder public struct WindowsBuilder {
+//@resultBuilder public struct WindowsBuilder {
 //    public typealias Block = () -> WindowsBuilderContent
 //    
 //    public static func buildBlock() -> WindowsBuilderContent {
@@ -188,7 +188,7 @@ struct _AppContent: AppBuilderContent {
     let appBuilderContent: AppBuilderItem
 }
 
-@_functionBuilder public struct AppBuilder {
+@resultBuilder public struct AppBuilder {
     public typealias Block = () -> AppBuilderContent
     
     public static func buildBlock() -> AppBuilderContent {
diff --git a/Classes/Controllers/Menu.swift b/Classes/Controllers/Menu.swift
@@ -129,7 +129,7 @@ struct _MenuContent: MenuBuilderContent {
     let menuBuilderContent: MenuBuilderItem
 }
 
-@_functionBuilder public struct MenuBuilder {
+@resultBuilder public struct MenuBuilder {
     public typealias Block = () -> MenuBuilderContent
     
     public static func buildBlock() -> MenuBuilderContent {
diff --git a/Classes/Objects/ParagraphStyle.swift b/Classes/Objects/ParagraphStyle.swift
@@ -11,7 +11,7 @@ import AppKit
 import UIKit
 #endif
 
-protocol ParagraphStyleDelegate: class {
+protocol ParagraphStyleDelegate: AnyObject {
     func onParagraphUpdate(_ p: ParagraphStyle)
 }
 
diff --git a/Classes/Protocols/Alternateable.swift b/Classes/Protocols/Alternateable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Alternateable: class {
+public protocol Alternateable: AnyObject {
     @discardableResult
     func alternate() -> Self
     
diff --git a/Classes/Protocols/AnyScene.swift b/Classes/Protocols/AnyScene.swift
@@ -8,7 +8,7 @@
 #if !os(macOS)
 import UIKit
 
-public protocol AnyScene: class {
+public protocol AnyScene: AnyObject {
     var persistentIdentifier: String { get }
     var stateRestorationActivity: NSUserActivity? { get }
     var userInfo: [String : Any]? { get }
diff --git a/Classes/Protocols/ArrowPositionable.swift b/Classes/Protocols/ArrowPositionable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import AppKit
 
-public protocol ArrowPositionable: class {
+public protocol ArrowPositionable: AnyObject {
     @discardableResult
     func arrowPosition(_ value: NSPopUpButton.ArrowPosition) -> Self
     
diff --git a/Classes/Protocols/BackgroundColorable.swift b/Classes/Protocols/BackgroundColorable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol BackgroundColorable: class {
+public protocol BackgroundColorable: AnyObject {
     @discardableResult
     func background(_ color: UColor) -> Self
     
diff --git a/Classes/Protocols/BezelStyleable.swift b/Classes/Protocols/BezelStyleable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import Cocoa
 
-public protocol BezelStyleable: class {
+public protocol BezelStyleable: AnyObject {
     @discardableResult
     func style(_ value: NSButton.BezelStyle) -> Self
     
diff --git a/Classes/Protocols/Bezeledable.swift b/Classes/Protocols/Bezeledable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Bezeledable: class {
+public protocol Bezeledable: AnyObject {
     @discardableResult
     func bezeled() -> Self
     
diff --git a/Classes/Protocols/Borderedable.swift b/Classes/Protocols/Borderedable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Borderedable: class {
+public protocol Borderedable: AnyObject {
     @discardableResult
     func bordered() -> Self
     
diff --git a/Classes/Protocols/Cellable.swift b/Classes/Protocols/Cellable.swift
@@ -1,4 +1,4 @@
-public protocol Cellable: class {}
+public protocol Cellable: AnyObject {}
 
 extension Cellable {
     public static var reuseIdentifier: String { String(describing: self) }
diff --git a/Classes/Protocols/Colorable.swift b/Classes/Protocols/Colorable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Colorable: class {
+public protocol Colorable: AnyObject {
     @discardableResult
     func color(_ color: UColor) -> Self
     
diff --git a/Classes/Protocols/Continuousable.swift b/Classes/Protocols/Continuousable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Continuousable: class {
+public protocol Continuousable: AnyObject {
     @discardableResult
     func continuous() -> Self
     
diff --git a/Classes/Protocols/ControlStateable.swift b/Classes/Protocols/ControlStateable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import Cocoa
 
-public protocol ControlStateable: class {
+public protocol ControlStateable: AnyObject {
     @discardableResult
     func state(_ value: NSControl.StateValue) -> Self
     
diff --git a/Classes/Protocols/DeclarativeProtocol.swift b/Classes/Protocols/DeclarativeProtocol.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol DeclarativeProtocol: class {
+public protocol DeclarativeProtocol: AnyObject {
     associatedtype V: BaseView, DeclarativeProtocol = Self
     
     var declarativeView: V { get }
diff --git a/Classes/Protocols/EditableStackView.swift b/Classes/Protocols/EditableStackView.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-protocol EditableStackView: class {
+protocol EditableStackView: AnyObject {
     var arrangedSubviews: [BaseView] { get }
     func addArrangedSubview(_ view: BaseView)
     func add(arrangedView: BaseView, at index: Int)
diff --git a/Classes/Protocols/Editableable.swift b/Classes/Protocols/Editableable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Editableable: class {
+public protocol Editableable: AnyObject {
     @discardableResult
     func editable() -> Self
     
diff --git a/Classes/Protocols/Enableable.swift b/Classes/Protocols/Enableable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Enableable: class {
+public protocol Enableable: AnyObject {
     @discardableResult
     func enabled() -> Self
     
diff --git a/Classes/Protocols/FirstResponderRefusable.swift b/Classes/Protocols/FirstResponderRefusable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol FirstResponderRefusable: class {
+public protocol FirstResponderRefusable: AnyObject {
     @discardableResult
     func refuseFirstResponder() -> Self
     
diff --git a/Classes/Protocols/FocusRingTypeable.swift b/Classes/Protocols/FocusRingTypeable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import AppKit
 
-public protocol FocusRingTypeable: class {
+public protocol FocusRingTypeable: AnyObject {
     @discardableResult
     func focusRingType(_ value: NSFocusRingType) -> Self
     
diff --git a/Classes/Protocols/Fontable.swift b/Classes/Protocols/Fontable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Fontable: class {
+public protocol Fontable: AnyObject {
     @discardableResult
     func font(v: UFont?) -> Self
     
diff --git a/Classes/Protocols/GestureDelegatorable.swift b/Classes/Protocols/GestureDelegatorable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol GestureDelegatorable: class {}
+public protocol GestureDelegatorable: AnyObject {}
 
 protocol _GestureDelegatorable: GestureDelegatorable {
     var _delegator: _GestureDelegator { get set }
diff --git a/Classes/Protocols/GestureRecognizerable.swift b/Classes/Protocols/GestureRecognizerable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol GestureRecognizerable: class {
+public protocol GestureRecognizerable: AnyObject {
     @discardableResult
     func delegate(_ v: UGestureRecognizerDelegate) -> Self
 }
diff --git a/Classes/Protocols/GestureTrackable.swift b/Classes/Protocols/GestureTrackable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol GestureTrackable: class {
+public protocol GestureTrackable: AnyObject {
     @discardableResult
     func trackState(_ action: @escaping (UGestureRecognizer.State) -> Void) -> Self
     
diff --git a/Classes/Protocols/KeyMaskable.swift b/Classes/Protocols/KeyMaskable.swift
@@ -8,7 +8,7 @@
 #if os(macOS)
 import Cocoa
 
-public protocol KeyMaskable: class {
+public protocol KeyMaskable: AnyObject {
     @discardableResult
     func keyMask(_ mask: NSEvent.ModifierFlags) -> Self
     
diff --git a/Classes/Protocols/Keyable.swift b/Classes/Protocols/Keyable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import Cocoa
 
-public protocol Keyable: class {
+public protocol Keyable: AnyObject {
     @discardableResult
     func key(_ text: String) -> Self
     
diff --git a/Classes/Protocols/Messageable.swift b/Classes/Protocols/Messageable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Messageable: class {
+public protocol Messageable: AnyObject {
     #if !os(macOS)
     @discardableResult
     func messageChangeTransition(_ value: UIView.AnimationOptions) -> Self
diff --git a/Classes/Protocols/MixedStateAllowable.swift b/Classes/Protocols/MixedStateAllowable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol MixedStateAllowable: class {
+public protocol MixedStateAllowable: AnyObject {
     @discardableResult
     func allowMixedState() -> Self
     
diff --git a/Classes/Protocols/MultiClickIgnorable.swift b/Classes/Protocols/MultiClickIgnorable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol MultiClickIgnorable: class {
+public protocol MultiClickIgnorable: AnyObject {
     @discardableResult
     func ignoreMultiClick() -> Self
     
diff --git a/Classes/Protocols/NavigationControllerable.swift b/Classes/Protocols/NavigationControllerable.swift
@@ -1,3 +1,3 @@
-public protocol NavigationControllerable: class {
+public protocol NavigationControllerable: AnyObject {
     var isSwipeBackEnabled: Bool { get set }
 }
diff --git a/Classes/Protocols/Placeholderable.swift b/Classes/Protocols/Placeholderable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Placeholderable: class {
+public protocol Placeholderable: AnyObject {
     #if !os(macOS)
     @discardableResult
     func placeholderChangeTransition(_ value: UIView.AnimationOptions) -> Self
diff --git a/Classes/Protocols/PullsDownable.swift b/Classes/Protocols/PullsDownable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol PullsDownable: class {
+public protocol PullsDownable: AnyObject {
     @discardableResult
     func pullsDown() -> Self
     
diff --git a/Classes/Protocols/Refreshable.swift b/Classes/Protocols/Refreshable.swift
@@ -1,4 +1,4 @@
-public protocol Refreshable: class {
+public protocol Refreshable: AnyObject {
     func refresh()
 }
 
diff --git a/Classes/Protocols/Secureable.swift b/Classes/Protocols/Secureable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Secureable: class {
+public protocol Secureable: AnyObject {
     @discardableResult
     func secure() -> Self
     
diff --git a/Classes/Protocols/Soundable.swift b/Classes/Protocols/Soundable.swift
@@ -1,7 +1,7 @@
 #if os(macOS)
 import AppKit
 
-public protocol Soundable: class {
+public protocol Soundable: AnyObject {
     @discardableResult
     func sound(_ value: NSSound?) -> Self
     
diff --git a/Classes/Protocols/Taggable.swift b/Classes/Protocols/Taggable.swift
@@ -11,7 +11,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Taggable: class {
+public protocol Taggable: AnyObject {
     var tag: Int { get set }
     
     @discardableResult
diff --git a/Classes/Protocols/TextAdjustsFontSizeable.swift b/Classes/Protocols/TextAdjustsFontSizeable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol TextAdjustsFontSizeable: class {
+public protocol TextAdjustsFontSizeable: AnyObject {
     @discardableResult
     func adjustsFontSizeToFitWidth() -> Self
     
diff --git a/Classes/Protocols/TextAttributesEditingAllowable.swift b/Classes/Protocols/TextAttributesEditingAllowable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol TextAttributesEditingAllowable: class {
+public protocol TextAttributesEditingAllowable: AnyObject {
     @discardableResult
     func allowEditingTextAttributes() -> Self
     
diff --git a/Classes/Protocols/Textable.swift b/Classes/Protocols/Textable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Textable: class {
+public protocol Textable: AnyObject {
     #if !os(macOS)
     @discardableResult
     func textChangeTransition(_ value: UIView.AnimationOptions) -> Self
diff --git a/Classes/Protocols/Tintable.swift b/Classes/Protocols/Tintable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Tintable: class {
+public protocol Tintable: AnyObject {
     @discardableResult
     func tint(_ color: UColor) -> Self
     
diff --git a/Classes/Protocols/Titleable.swift b/Classes/Protocols/Titleable.swift
@@ -4,7 +4,7 @@ import AppKit
 import UIKit
 #endif
 
-public protocol Titleable: class {
+public protocol Titleable: AnyObject {
     #if !os(macOS)
     @discardableResult
     func titleChangeTransition(_ value: UIView.AnimationOptions) -> Self
diff --git a/Classes/Structs/AppBuilder.swift b/Classes/Structs/AppBuilder.swift
@@ -25,7 +25,7 @@ struct _AppContent: AppBuilderContent {
     let appBuilderContent: AppBuilderItem
 }
 
-@_functionBuilder public struct AppBuilder {
+@resultBuilder public struct AppBuilder {
     public typealias Block = () -> AppBuilderContent
 
     public static func buildBlock() -> AppBuilderContent {
diff --git a/Classes/Structs/BodyBuilder.swift b/Classes/Structs/BodyBuilder.swift
@@ -7,7 +7,7 @@ import UIKit
 @available(*, deprecated, renamed: "BodyBuilder")
 public typealias ViewBuilder = BodyBuilder
 
-@_functionBuilder public struct BodyBuilder {
+@resultBuilder public struct BodyBuilder {
     public typealias Result = BodyBuilderItemable
     public typealias SingleView = () -> Result
     
diff --git a/Classes/Structs/ExpressableState.swift b/Classes/Structs/ExpressableState.swift
diff --git a/Classes/Structs/GesturesBuilder.swift b/Classes/Structs/GesturesBuilder.swift
diff --git a/Classes/Structs/PreviewBuilder.swift b/Classes/Structs/PreviewBuilder.swift
diff --git a/Classes/Structs/ShortcutBuilder.swift b/Classes/Structs/ShortcutBuilder.swift
diff --git a/Classes/Structs/StateStringBuilder.swift b/Classes/Structs/StateStringBuilder.swift
diff --git a/README.md b/README.md
diff --git a/UIKit-Plus.podspec b/UIKit-Plus.podspec

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ struct _MenuContent: MenuBuilderContent {`
`129`	`129`	`let menuBuilderContent: MenuBuilderItem`
`130`	`130`	`}`
`131`	`131`
`132`		`-@_functionBuilder public struct MenuBuilder {`
	`132`	`+@resultBuilder public struct MenuBuilder {`
`133`	`133`	`public typealias Block = () -> MenuBuilderContent`
`134`	`134`
`135`	`135`	`public static func buildBlock() -> MenuBuilderContent {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import AppKit`
`11`	`11`	`import UIKit`
`12`	`12`	`#endif`
`13`	`13`
`14`		`-protocol ParagraphStyleDelegate: class {`
	`14`	`+protocol ParagraphStyleDelegate: AnyObject {`
`15`	`15`	`func onParagraphUpdate(_ p: ParagraphStyle)`
`16`	`16`	`}`
`17`	`17`