Skip to content

Commit 567a607

Browse files
committed
Merge upstream main branch
1 parent 7f867ac commit 567a607

26 files changed

+1044
-1564
lines changed

Examples/Examples.xcodeproj/project.pbxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,6 @@
11761176
isa = XCSwiftPackageProductDependency;
11771177
productName = SwiftUINavigation;
11781178
};
1179-
>>>>>>> origin/appkit-navigation-bindings
11801179
/* End XCSwiftPackageProductDependency section */
11811180
};
11821181
rootObject = CA47378C272F08EF0012CAC3 /* Project object */;

Sources/AppKitNavigation/AppKitAnimation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
return try result!._rethrowGet()
5353

5454
case let .swiftUI(animation):
55+
var result: Swift.Result<Result, Error>?
5556
#if swift(>=6)
56-
var result: Swift.Result<Result, Error>?
5757
if #available(macOS 15, *) {
5858
NSAnimationContext.animate(animation) {
5959
result = Swift.Result(catching: body)

Sources/AppKitNavigation/Bindings/NSTargetAction.swift

Lines changed: 0 additions & 143 deletions
This file was deleted.

Sources/AppKitNavigation/Bindings/NSTargetActionProxy.swift

Lines changed: 0 additions & 88 deletions
This file was deleted.

Sources/AppKitNavigation/Bindings/NSToolbarItem.swift

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22

33
import AppKit
44

5-
extension NSToolbarItem: NSTargetActionProtocol {
6-
public var appkitNavigationTarget: AnyObject? {
7-
set { target = newValue }
8-
get { target }
9-
}
10-
11-
public var appkitNavigationAction: Selector? {
12-
set { action = newValue }
13-
get { action }
14-
}
15-
}
5+
extension NSToolbarItem: @retroactive Sendable {}
6+
extension NSToolbarItem: TargetActionProtocol {}
167

178
#endif

0 commit comments

Comments
 (0)