Require Swift 5.6 (#1491)

* Restore Swift 5.5 compatibility

As pointed out in #1489, we somehow lost compatibility with Swift 5.5
(Xcode 13.2). While we hope to drop support when we hit 1.0, let's try
to keep compatiblity in the meantime.

* Update DependencyValues.swift

* Update Sources/Dependencies/DependencyValues.swift

Co-authored-by: Brandon Williams <[email protected]>

* Require Swift 5.6

* Update ci.yml

Co-authored-by: Brandon Williams <[email protected]>

Author: stephencelis

.github/workflows/ci.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: ['13.4.1', '14.0']
+        xcode: ['13.4.1', '14.0.1']
         config: ['debug', 'release']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Run ${{ matrix.config }} tests
@@ -32,9 +32,9 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: ['13.4.1', '14.0']
+        xcode: ['13.4.1', '14.0.1']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Build for library evolution
@@ -43,17 +43,17 @@ jobs:
   benchmarks:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+        run: sudo xcode-select -s /Applications/Xcode_14.0.1.app
       - name: Run benchmark
         run: make benchmark
 
   examples:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+        run: sudo xcode-select -s /Applications/Xcode_14.0.1.app
       - name: Run tests
         run: make test-examples

Examples/CaseStudies/tvOSCaseStudies/FocusView.swift

@@ -32,58 +32,56 @@ struct Focus: ReducerProtocol {
   }
 }
 
-#if swift(>=5.3)
-  @available(tvOS 14.0, *)
-  struct FocusView: View {
-    let store: StoreOf<Focus>
+@available(tvOS 14.0, *)
+struct FocusView: View {
+  let store: StoreOf<Focus>
 
-    @Environment(\.resetFocus) var resetFocus
-    @Namespace private var namespace
+  @Environment(\.resetFocus) var resetFocus
+  @Namespace private var namespace
 
-    var body: some View {
-      WithViewStore(self.store, observe: { $0 }) { viewStore in
-        VStack(spacing: 100) {
-          Text(readMe)
-            .font(.headline)
-            .multilineTextAlignment(.leading)
-            .padding()
+  var body: some View {
+    WithViewStore(self.store, observe: { $0 }) { viewStore in
+      VStack(spacing: 100) {
+        Text(readMe)
+          .font(.headline)
+          .multilineTextAlignment(.leading)
+          .padding()
 
-          HStack(spacing: 40) {
-            ForEach(1..<6) { index in
-              Button(numbers[index]) {}
-                .prefersDefaultFocus(viewStore.currentFocus == index, in: self.namespace)
-            }
+        HStack(spacing: 40) {
+          ForEach(1..<6) { index in
+            Button(numbers[index]) {}
+              .prefersDefaultFocus(viewStore.currentFocus == index, in: self.namespace)
           }
-          HStack(spacing: 40) {
-            ForEach(6..<11) { index in
-              Button(numbers[index]) {}
-                .prefersDefaultFocus(viewStore.currentFocus == index, in: self.namespace)
-            }
-          }
-
-          Button("Focus Random") { viewStore.send(.randomButtonClicked) }
         }
-        .onChange(of: viewStore.currentFocus) { _ in
-          // Update the view's focus when the state tells us the focus changed.
-          self.resetFocus(in: self.namespace)
+        HStack(spacing: 40) {
+          ForEach(6..<11) { index in
+            Button(numbers[index]) {}
+              .prefersDefaultFocus(viewStore.currentFocus == index, in: self.namespace)
+          }
         }
-        .focusScope(self.namespace)
+
+        Button("Focus Random") { viewStore.send(.randomButtonClicked) }
       }
+      .onChange(of: viewStore.currentFocus) { _ in
+        // Update the view's focus when the state tells us the focus changed.
+        self.resetFocus(in: self.namespace)
+      }
+      .focusScope(self.namespace)
     }
   }
+}
 
-  @available(tvOS 14.0, *)
-  struct FocusView_Previews: PreviewProvider {
-    static var previews: some View {
-      FocusView(
-        store: Store(
-          initialState: Focus.State(),
-          reducer: Focus()
-        )
+@available(tvOS 14.0, *)
+struct FocusView_Previews: PreviewProvider {
+  static var previews: some View {
+    FocusView(
+      store: Store(
+        initialState: Focus.State(),
+        reducer: Focus()
       )
-    }
+    )
   }
-#endif
+}
 
 private let numbers = [
   "Zero",

Examples/CaseStudies/tvOSCaseStudies/RootView.swift

@@ -16,18 +16,14 @@ struct RootView: View {
 
   var focusView: AnyView? {
     if #available(tvOS 14.0, *) {
-      #if swift(>=5.3)
-        return AnyView(
-          NavigationLink(
-            "Focus",
-            destination: FocusView(
-              store: self.store.scope(state: \.focus, action: Root.Action.focus)
-            )
+      return AnyView(
+        NavigationLink(
+          "Focus",
+          destination: FocusView(
+            store: self.store.scope(state: \.focus, action: Root.Action.focus)
           )
         )
-      #else
-        return nil
-      #endif
+      )
     } else {
       return nil
     }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.6
 
 import PackageDescription
 
@@ -21,7 +21,8 @@ let package = Package(
     ),
   ],
   dependencies: [
-    .package(name: "Benchmark", url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
+    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
+    .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.7.4"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.8.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.3.0"),
@@ -64,7 +65,7 @@ let package = Package(
       name: "swift-composable-architecture-benchmark",
       dependencies: [
         "ComposableArchitecture",
-        .product(name: "Benchmark", package: "Benchmark"),
+        .product(name: "Benchmark", package: "swift-benchmark"),
       ]
     ),
   ]
@@ -80,10 +81,3 @@ let package = Package(
 //    ])
 //  )
 //}
-
-#if swift(>=5.6)
-  // Add the documentation compiler plugin if possible
-  package.dependencies.append(
-    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
-  )
-#endif

Sources/Dependencies/Dependencies/Calendar.swift

@@ -1,42 +1,40 @@
 import Foundation
 import XCTestDynamicOverlay
 
-#if swift(>=5.6)
-  extension DependencyValues {
-    /// The current calendar that features should use when handling dates.
-    ///
-    /// By default, the calendar returned from `Calendar.autoupdatingCurrent` is supplied. When used
-    /// in a testing context, access will call to `XCTFail` when invoked, unless explicitly
-    /// overridden using ``withValue(_:_:operation:)-705n``:
-    ///
-    /// ```swift
-    /// DependencyValues.withValue(\.calendar, Calendar(identifier: .gregorian)) {
-    ///   // Assertions...
-    /// }
-    /// ```
-    ///
-    /// Or, if you are using the Composable Architecture, you can override dependencies directly
-    /// on the `TestStore`:
-    ///
-    /// ```swift
-    /// let store = TestStore(
-    ///   initialState: MyFeature.State()
-    ///   reducer: MyFeature()
-    /// )
-    ///
-    /// store.dependencies.calendar = Calendar(identifier: .gregorian)
-    /// ```
-    public var calendar: Calendar {
-      get { self[CalendarKey.self] }
-      set { self[CalendarKey.self] = newValue }
-    }
+extension DependencyValues {
+  /// The current calendar that features should use when handling dates.
+  ///
+  /// By default, the calendar returned from `Calendar.autoupdatingCurrent` is supplied. When used
+  /// in a testing context, access will call to `XCTFail` when invoked, unless explicitly
+  /// overridden using ``withValue(_:_:operation:)-705n``:
+  ///
+  /// ```swift
+  /// DependencyValues.withValue(\.calendar, Calendar(identifier: .gregorian)) {
+  ///   // Assertions...
+  /// }
+  /// ```
+  ///
+  /// Or, if you are using the Composable Architecture, you can override dependencies directly
+  /// on the `TestStore`:
+  ///
+  /// ```swift
+  /// let store = TestStore(
+  ///   initialState: MyFeature.State()
+  ///   reducer: MyFeature()
+  /// )
+  ///
+  /// store.dependencies.calendar = Calendar(identifier: .gregorian)
+  /// ```
+  public var calendar: Calendar {
+    get { self[CalendarKey.self] }
+    set { self[CalendarKey.self] = newValue }
+  }
 
-    private enum CalendarKey: DependencyKey {
-      static let liveValue = Calendar.autoupdatingCurrent
-      static var testValue: Calendar {
-        XCTFail(#"Unimplemented: @Dependency(\.calendar)"#)
-        return .autoupdatingCurrent
-      }
+  private enum CalendarKey: DependencyKey {
+    static let liveValue = Calendar.autoupdatingCurrent
+    static var testValue: Calendar {
+      XCTFail(#"Unimplemented: @Dependency(\.calendar)"#)
+      return .autoupdatingCurrent
     }
   }
-#endif
+}