Minor tweaks

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(

Sources/Preferences/Section.swift

@@ -64,11 +64,11 @@ extension Settings {
  - label: A view describing the setting handled by this section.
  - content: A content view.
  */
- public init<Label: View, Content: View>(
+ public init(
  bottomDivider: Bool = false,
  verticalAlignment: VerticalAlignment = .firstTextBaseline,
- label: @escaping () -> Label,
- @ViewBuilder content: @escaping () -> Content
+ label: @escaping () -> some View,
+ @ViewBuilder content: @escaping () -> some View
  ) {
  self.label = label()
  .overlay(LabelOverlay())
@@ -88,11 +88,11 @@ extension Settings {
  - verticalAlignement: The vertical alignment of the section content.
  - content: A content view.
  */
- public init<Content: View>(
+ public init(
  title: String,
  bottomDivider: Bool = false,
  verticalAlignment: VerticalAlignment = .firstTextBaseline,
- @ViewBuilder content: @escaping () -> Content
+ @ViewBuilder content: @escaping () -> some View
  ) {
  let textLabel = {
  Text(title)

Sources/Preferences/SegmentedControlStyleViewController.swift

@@ -114,7 +114,7 @@ final class SegmentedControlStyleViewController: NSViewController, SettingsStyle
  // context menu that pops up at the right edge of the window.
  let toolbarItemGroup = NSToolbarItemGroup(itemIdentifier: toolbarItemIdentifier)
  toolbarItemGroup.view = segmentedControl
- toolbarItemGroup.subitems = panes.enumerated().map { index, settingsPane -> NSToolbarItem in
+ toolbarItemGroup.subitems = panes.enumerated().map { index, settingsPane in
  let item = NSToolbarItem(itemIdentifier: .init("segment-\(settingsPane.preferencePaneTitle)"))
  item.label = settingsPane.preferencePaneTitle
 

Sources/Preferences/SettingsTabViewController.swift

@@ -17,7 +17,7 @@ final class SettingsTabViewController: NSViewController, SettingsStyleController
  var isAnimated = true
 
  var activeViewController: NSViewController? {
- guard let activeTab = activeTab else {
+ guard let activeTab else {
  return nil
  }
 
@@ -119,7 +119,7 @@ final class SettingsTabViewController: NSViewController, SettingsStyleController
  }
 
  private func animateTabTransition(index: Int, animated: Bool) {
- guard let activeTab = activeTab else {
+ guard let activeTab else {
  assertionFailure("animateTabTransition called before a tab was displayed; transition only works from one tab to another")
  immediatelyDisplayTab(index: index)
  return
@@ -189,7 +189,7 @@ final class SettingsTabViewController: NSViewController, SettingsStyleController
  }
 
  private func setWindowFrame(for viewController: NSViewController, animated: Bool = false) {
- guard let window = window else {
+ guard let window else {
  preconditionFailure()
  }
 

Sources/Preferences/SettingsWindowController.swift

@@ -89,7 +89,7 @@ public final class SettingsWindowController: NSWindowController {
  - See `showWindow(_:)` to show the window without the convenience of activating the app.
  */
  public func show(preferencePane paneIdentifier: Settings.PaneIdentifier? = nil) {
- if let paneIdentifier = paneIdentifier {
+ if let paneIdentifier {
  tabViewController.activateTab(paneIdentifier: paneIdentifier, animated: false)
  } else {
  tabViewController.restoreInitialTab()
@@ -102,7 +102,7 @@ public final class SettingsWindowController: NSWindowController {
 
  private func restoreWindowPosition() {
  guard
- let window = window,
+ let window,
  let screenContainingWindow = window.screen
  else {
  return

Sources/Preferences/Utilities.swift

@@ -7,7 +7,7 @@ extension NSImage {
 extension NSView {
  @discardableResult
  func constrainToSuperviewBounds() -> [NSLayoutConstraint] {
- guard let superview = superview else {
+ guard let superview else {
  preconditionFailure("superview has to be set first")
  }