Swift Language Support: Drop <5.9 (pointfreeco#166)

* Swift Language Support: Drop <5.9

* wip

Author: stephencelis

.github/workflows/ci.yml

@@ -15,12 +15,11 @@ concurrency:
 
 jobs:
   library:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
         xcode:
-          - '15.0'
-          - '14.3.1'
+          - '15.4'
 
     steps:
       - uses: actions/checkout@v4
@@ -42,8 +41,8 @@ jobs:
     steps:
       - uses: compnerd/gha-setup-swift@main
         with:
-          branch: swift-5.9.1-release
-          tag: 5.9.1-RELEASE
+          branch: swift-5.10-release
+          tag: 5.10-RELEASE
       - uses: actions/checkout@v4
       - name: Build
         run: swift build -c ${{ matrix.config }}

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.7.1
+// swift-tools-version: 5.9
 
 import PackageDescription
 
@@ -49,3 +49,10 @@ let package = Package(
     ),
   ]
 )
+
+for target in package.targets {
+  target.swiftSettings = target.swiftSettings ?? []
+  target.swiftSettings!.append(contentsOf: [
+    .enableExperimentalFeature("StrictConcurrency")
+  ])
+}

Package.swift

@@ -12,12 +12,11 @@
       message:
         "Use the 'fullScreenCover(item:)' (or 'fullScreenCover(item:id:)') overload that passes a binding"
     )
-    public func fullScreenCover<Value, Content>(
+    public func fullScreenCover<Value, Content: View>(
       unwrapping value: Binding<Value?>,
       onDismiss: (() -> Void)? = nil,
       @ViewBuilder content: @escaping (Binding<Value>) -> Content
-    ) -> some View
-    where Content: View {
+    ) -> some View {
       self.fullScreenCover(
         isPresented: Binding(value),
         onDismiss: onDismiss
@@ -106,12 +105,11 @@
       *, deprecated,
       message: "Use the 'sheet(item:)' (or 'sheet(item:id:)') overload that passes a binding"
     )
-    public func sheet<Value, Content>(
+    public func sheet<Value, Content: View>(
       unwrapping value: Binding<Value?>,
       onDismiss: (() -> Void)? = nil,
       @ViewBuilder content: @escaping (Binding<Value>) -> Content
-    ) -> some View
-    where Content: View {
+    ) -> some View {
       self.sheet(isPresented: Binding(value), onDismiss: onDismiss) {
         Binding(unwrapping: value).map(content)
       }
@@ -363,13 +361,12 @@
       message:
         "Chain a '@CasePathable' enum binding into a case directly instead of specifying a case path."
     )
-    public func fullScreenCover<Enum, Case, Content>(
+    public func fullScreenCover<Enum, Case, Content: View>(
       unwrapping enum: Binding<Enum?>,
       case casePath: AnyCasePath<Enum, Case>,
       onDismiss: (() -> Void)? = nil,
       @ViewBuilder content: @escaping (Binding<Case>) -> Content
-    ) -> some View
-    where Content: View {
+    ) -> some View {
       fullScreenCover(
         unwrapping: `enum`.case(casePath), onDismiss: onDismiss, content: content)
     }
@@ -399,13 +396,13 @@
       message:
         "Chain a '@CasePathable' enum binding into a case directly instead of specifying a case path."
     )
-    public func popover<Enum, Case, Content>(
+    public func popover<Enum, Case, Content: View>(
       unwrapping enum: Binding<Enum?>,
       case casePath: AnyCasePath<Enum, Case>,
       attachmentAnchor: PopoverAttachmentAnchor = .rect(.bounds),
       arrowEdge: Edge = .top,
       @ViewBuilder content: @escaping (Binding<Case>) -> Content
-    ) -> some View where Content: View {
+    ) -> some View {
       popover(
         unwrapping: `enum`.case(casePath),
         attachmentAnchor: attachmentAnchor,
@@ -420,13 +417,12 @@
         "Chain a '@CasePathable' enum binding into a case directly instead of specifying a case path."
     )
     @MainActor
-    public func sheet<Enum, Case, Content>(
+    public func sheet<Enum, Case, Content: View>(
       unwrapping enum: Binding<Enum?>,
       case casePath: AnyCasePath<Enum, Case>,
       onDismiss: (() -> Void)? = nil,
       @ViewBuilder content: @escaping (Binding<Case>) -> Content
-    ) -> some View
-    where Content: View {
+    ) -> some View {
       sheet(unwrapping: `enum`.case(casePath), onDismiss: onDismiss, content: content)
     }
   }
@@ -528,8 +524,7 @@
     }
   }
 
-  public struct IfCaseLet<Enum, Case: Sendable, IfContent, ElseContent>: View
-  where IfContent: View, ElseContent: View {
+  public struct IfCaseLet<Enum, Case: Sendable, IfContent: View, ElseContent: View>: View {
     public let `enum`: Binding<Enum>
     public let casePath: AnyCasePath<Enum, Case>
     public let ifContent: (Binding<Case>) -> IfContent
@@ -605,8 +600,7 @@
     }
   }
 
-  public struct IfLet<Value, IfContent, ElseContent>: View
-  where IfContent: View, ElseContent: View {
+  public struct IfLet<Value, IfContent: View, ElseContent: View>: View {
     public let value: Binding<Value?>
     public let ifContent: (Binding<Value>) -> IfContent
     public let elseContent: ElseContent
@@ -770,8 +764,7 @@
     message:
       "Switch over a '@CasePathable' enum and derive bindings from each case using '$enum.case.map { $case in … }', instead."
   )
-  public struct CaseLet<Enum, Case: Sendable, Content>: Sendable, View
-  where Content: View {
+  public struct CaseLet<Enum, Case: Sendable, Content: View>: Sendable, View {
     @EnvironmentObject private var `enum`: BindingObject<Enum>
     public let casePath: AnyCasePath<Enum, Case>
     public let content: (Binding<Case>) -> Content
@@ -1855,7 +1848,7 @@
       action handler: @escaping @Sendable (Value) async -> Void = { (_: Void) async in }
     ) -> some View {
       alert(value) { (value: Value?) in
-        if let value = value {
+        if let value {
           await handler(value)
         }
       }
@@ -1874,7 +1867,7 @@
       action handler: @escaping @Sendable (Value) async -> Void = { (_: Void) async in }
     ) -> some View {
       alert(unwrapping: `enum`, case: casePath) { (value: Value?) async in
-        if let value = value {
+        if let value {
           await handler(value)
         }
       }
@@ -1892,7 +1885,7 @@
       action handler: @escaping @Sendable (Value) async -> Void = { (_: Void) async in }
     ) -> some View {
       confirmationDialog(unwrapping: value) { (value: Value?) in
-        if let value = value {
+        if let value {
           await handler(value)
         }
       }
@@ -1911,7 +1904,7 @@
       action handler: @escaping @Sendable (Value) async -> Void = { (_: Void) async in }
     ) -> some View {
       confirmationDialog(unwrapping: `enum`, case: casePath) { (value: Value?) async in
-        if let value = value {
+        if let value {
           await handler(value)
         }
       }

[email protected]

@@ -188,7 +188,7 @@
       if !self.buttons.isEmpty {
         children.append(("actions", self.buttons))
       }
-      if let message = self.message {
+      if let message {
         children.append(("message", message))
       }
       return Mirror(

Sources/SwiftUINavigation/Internal/Deprecations.swift

@@ -235,7 +235,7 @@
       if !self.buttons.isEmpty {
         children.append(("actions", self.buttons))
       }
-      if let message = self.message {
+      if let message {
         children.append(("message", message))
       }
       return Mirror(

Sources/SwiftUINavigationCore/AlertState.swift

@@ -12,7 +12,7 @@
       let message = message()
       let category = category ?? "Runtime Warning"
       if _XCTIsTesting {
-        if let file = file, let line = line {
+        if let file, let line {
           XCTFail(message, file: file, line: line)
         } else {
           XCTFail(message)