Upgrade to latest pointfreeco/main v0.36.0

0.36.0 release update

Author: artemkrachulov

.github/workflows/ci.yml

@@ -7,37 +7,31 @@ on:
   pull_request:
     branches:
       - '*'
+  workflow_dispatch:
 
 jobs:
   library:
-    runs-on: macos-11.0
+    runs-on: macos-12
     strategy:
       matrix:
-        xcode:
-          - '12.4'
-          - '12.5.1'
-          - '13.2.1'
+        xcode: [13.2.1, 13.3]
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Run tests
         run: make test-library
       - name: Compile documentation
-        if: ${{ matrix.xcode == '13.2' }}
+        if: ${{ matrix.xcode == '13.3' }}
         run: make test-docs
       - name: Run benchmark
         run: make benchmark
 
   examples:
-    runs-on: macos-11.0
-    strategy:
-      matrix:
-        xcode:
-          - '13.2.1'
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+        run: sudo xcode-select -s /Applications/Xcode_13.3.app
       - name: Run tests
         run: make test-examples

.github/workflows/documentation.yml

@@ -1,29 +1,104 @@
+# Build and deploy DocC to GitHub pages. Based off of @karwa's work here:
+# https://github.com/karwa/swift-url/blob/main/.github/workflows/docs.yml
 name: Documentation
+
 on:
   release:
     types:
       - published
+  push:
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
+    runs-on: macos-12
     steps:
-      - uses: actions/checkout@v2
-      - name: Generate Documentation
-        uses: SwiftDocOrg/swift-doc@master
+      - name: Checkout Package
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Checkout swift-docc
+        uses: actions/checkout@v2
+        with:
+          repository: apple/swift-docc
+          ref: main
+          path: swift-docc
+      - name: Cache DocC
+        id: cache-docc
+        uses: actions/cache@v2
+        with:
+          key: swift-url-docc-build
+          path: swift-docc/.build
+      - name: Build swift-docc
+        if: ${{ !steps.cache-docc.outputs.cache-hit }}
+        run: |
+          cd swift-docc; swift build --product docc -c release; cd ..
+
+      - name: Checkout swift-docc-render
+        uses: actions/checkout@v2
         with:
-          base-url: /swift-composable-architecture/
-          format: html
-          inputs: Sources/ComposableArchitecture
-          module-name: ComposableArchitecture
-          output: Documentation
-      - name: Update Permissions
-        run: 'sudo chown --recursive $USER Documentation'
-      - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@releases/v3
+          repository: apple/swift-docc-render
+          ref: main
+          path: swift-docc-render
+      - name: Build swift-docc-render
+        run: |
+          cd swift-docc-render; npm install && npm run build; cd ..
+
+      - name: Checkout gh-pages Branch
+        uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+          path: docs-out
+
+      - name: Build documentation
+        run: >
+          rm -rf docs-out/.git;
+          rm -rf docs-out/main;
+
+          for tag in $(echo "main"; git tag);
+          do
+            echo "⏳ Generating documentation for "$tag" release.";
+
+            if [ -d "docs-out/$tag" ] 
+            then 
+                echo "✅ Documentation for "$tag" already exists.";
+            else 
+                git checkout "$tag";
+                mkdir -p Sources/ComposableArchitecture/Documentation.docc;
+                export DOCC_HTML_DIR="$(pwd)/swift-docc-render/dist";
+
+                rm -rf .build/symbol-graphs;
+                mkdir -p .build/symbol-graphs;
+                swift build \
+                  --target ComposableArchitecture \
+                  -Xswiftc \
+                  -emit-symbol-graph \
+                  -Xswiftc \
+                  -emit-symbol-graph-dir \
+                  -Xswiftc \
+                  .build/symbol-graphs \
+                  && swift-docc/.build/release/docc convert Sources/ComposableArchitecture/Documentation.docc \
+                    --fallback-display-name ComposableArchitecture \
+                    --fallback-bundle-identifier co.pointfree.ComposableArchitecture \
+                    --fallback-bundle-version 0.0.0 \
+                    --additional-symbol-graph-dir \
+                    .build/symbol-graphs \
+                    --transform-for-static-hosting \
+                    --hosting-base-path /swift-composable-architecture/"$tag" \
+                    --output-path docs-out/"$tag" \
+                    && echo "✅ Documentation generated for "$tag" release." \
+                    || echo "⚠️ Documentation skipped for "$tag".";
+            fi;
+          done
+
+      - name: Fix permissions
+        run: 'sudo chown -R $USER docs-out'
+      - name: Publish documentation to GitHub Pages
+        uses: JamesIves/[email protected]
         with:
-          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: Documentation
+          branch: gh-pages
+          folder: docs-out
+          single-commit: true

.spi.yml

@@ -5,9 +5,8 @@ builder:
     scheme: ComposableArchitecture
   - platform: macos-xcodebuild
     scheme: ComposableArchitecture
-  - platform: macos-xcodebuild-arm
-    scheme: ComposableArchitecture
   - platform: tvos
     scheme: ComposableArchitecture
   - platform: watchos
     scheme: ComposableArchitecture_watchOS
+  - documentation_targets: [ComposableArchitecture]

Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj

@@ -49,7 +49,6 @@
 		DC25DC612450F2B000082E81 /* LoadThenNavigate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC25DC602450F2B000082E81 /* LoadThenNavigate.swift */; };
 		DC25DC642450F2DF00082E81 /* ActivityIndicatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC25DC632450F2DF00082E81 /* ActivityIndicatorViewController.swift */; };
 		DC27215625BF84FC00D9C8DB /* 01-GettingStarted-BindingBasicsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC27215525BF84FC00D9C8DB /* 01-GettingStarted-BindingBasicsTests.swift */; };
-		DC2E370D24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC2E370C24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift */; };
 		DC4C6EAC2450DD380066A05D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4C6EAB2450DD380066A05D /* SceneDelegate.swift */; };
 		DC4C6EAE2450DD380066A05D /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4C6EAD2450DD380066A05D /* RootViewController.swift */; };
 		DC4C6EB02450DD380066A05D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC4C6EAF2450DD380066A05D /* Assets.xcassets */; };
@@ -192,7 +191,6 @@
 		DC25DC602450F2B000082E81 /* LoadThenNavigate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadThenNavigate.swift; sourceTree = "<group>"; };
 		DC25DC632450F2DF00082E81 /* ActivityIndicatorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityIndicatorViewController.swift; sourceTree = "<group>"; };
 		DC27215525BF84FC00D9C8DB /* 01-GettingStarted-BindingBasicsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-BindingBasicsTests.swift"; sourceTree = "<group>"; };
-		DC2E370C24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "04-HigherOrderReducers-StrictReducers.swift"; sourceTree = "<group>"; };
 		DC4C6EA72450DD380066A05D /* UIKitCaseStudies.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIKitCaseStudies.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DC4C6EAB2450DD380066A05D /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		DC4C6EAD2450DD380066A05D /* RootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
@@ -419,7 +417,6 @@
 				CA3E4C5A24B4FA0E00447C0B /* 04-HigherOrderReducers-Lifecycle.swift */,
 				DCE63B70245CC0B90080A23D /* 04-HigherOrderReducers-Recursion.swift */,
 				DCC68EE22447C8540037F998 /* 04-HigherOrderReducers-ReusableFavoriting.swift */,
-				DC2E370C24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift */,
 				DCFE195F278DBF0600C14CCF /* CaseStudiesApp.swift */,
 				CA5ECF91267A79F0002067FF /* FactClient.swift */,
 				DC89C41C24460F96006900B9 /* Assets.xcassets */,
@@ -749,7 +746,6 @@
 				DCAC2A4F2452352E0094DEF5 /* 04-HigherOrderReducers-ElmLikeSubscriptions.swift in Sources */,
 				CA6AC2672451135C00C71CB3 /* DownloadClient.swift in Sources */,
 				CAA9ADC624465C810003A984 /* 02-Effects-Cancellation.swift in Sources */,
-				DC2E370D24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift in Sources */,
 				CA5ECF92267A79F0002067FF /* FactClient.swift in Sources */,
 				DC9EB4172450CBD2005F413B /* UIViewRepresented.swift in Sources */,
 				CA6AC2652451135C00C71CB3 /* CircularProgressView.swift in Sources */,

Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift

@@ -12,7 +12,6 @@ struct RootState {
   #endif
   var clock = ClockState()
   var counter = CounterState()
-  var dieRoll = DieRollState()
   var effectsBasics = EffectsBasicsState()
   var effectsCancellation = EffectsCancellationState()
   var effectsTimers = TimersState()
@@ -48,7 +47,6 @@ enum RootAction {
   #endif
   case clock(ClockAction)
   case counter(CounterAction)
-  case dieRoll(DieRollAction)
   case effectsBasics(EffectsBasicsAction)
   case effectsCancellation(EffectsCancellationAction)
   case episodes(EpisodesAction)
@@ -82,7 +80,7 @@ struct RootEnvironment {
   var favorite: (UUID, Bool) -> Effect<Bool, Error>
   var fetchNumber: () -> Effect<Int, Never>
   var mainQueue: AnySchedulerOf<DispatchQueue>
-  var userDidTakeScreenshot: Effect<Void, Never>
+  var notificationCenter: NotificationCenter
   var uuid: () -> UUID
   var webSocket: WebSocketClient
 
@@ -93,7 +91,7 @@ struct RootEnvironment {
     favorite: favorite(id:isFavorite:),
     fetchNumber: liveFetchNumber,
     mainQueue: .main,
-    userDidTakeScreenshot: liveUserDidTakeScreenshot,
+    notificationCenter: .default,
     uuid: UUID.init,
     webSocket: .live
   )
@@ -154,12 +152,6 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
       action: /RootAction.counter,
       environment: { _ in .init() }
     ),
-  dieRollReducer
-    .pullback(
-      state: \.dieRoll,
-      action: /RootAction.dieRoll,
-      environment: { _ in .init(rollDie: { .random(in: 1...6) }) }
-    ),
   effectsBasicsReducer
     .pullback(
       state: \.effectsBasics,
@@ -220,7 +212,7 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
     .pullback(
       state: \.longLivingEffects,
       action: /RootAction.longLivingEffects,
-      environment: { .init(userDidTakeScreenshot: $0.userDidTakeScreenshot) }
+      environment: { .init(notificationCenter: $0.notificationCenter) }
     ),
   mapAppReducer
     .pullback(
@@ -312,8 +304,3 @@ private func liveFetchNumber() -> Effect<Int, Never> {
     .delay(for: 1, scheduler: DispatchQueue.main)
     .eraseToEffect()
 }
-
-private let liveUserDidTakeScreenshot = NotificationCenter.default
-  .publisher(for: UIApplication.userDidTakeScreenshotNotification)
-  .map { _ in () }
-  .eraseToEffect()

Examples/CaseStudies/SwiftUICaseStudies/00-RootView.swift

@@ -271,16 +271,6 @@ struct RootView: View {
               )
             )
 
-            NavigationLink(
-              "Strict reducers",
-              destination: DieRollView(
-                store: self.store.scope(
-                  state: \.dieRoll,
-                  action: RootAction.dieRoll
-                )
-              )
-            )
-
             NavigationLink(
               "Elm-like subscriptions",
               destination: ClockView(

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift

@@ -20,10 +20,10 @@ private let readMe = """
   """
 
 extension Effect where Failure == Never {
-  public static func keyFrames<S>(
+  public static func keyFrames<S: Scheduler>(
     values: [(output: Output, duration: S.SchedulerTimeType.Stride)],
     scheduler: S
-  ) -> Effect where S: Scheduler {
+  ) -> Self {
     .concatenate(
       values
         .enumerated()

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-FocusState.swift

@@ -75,7 +75,7 @@
   }
 
   extension View {
-    func synchronize<Value: Equatable>(
+    func synchronize<Value>(
       _ first: Binding<Value>,
       _ second: FocusState<Value>.Binding
     ) -> some View {

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift

@@ -39,18 +39,18 @@ let effectsCancellationReducer = Reducer<
   EffectsCancellationState, EffectsCancellationAction, EffectsCancellationEnvironment
 > { state, action, environment in
 
-  struct TriviaRequestId: Hashable {}
+  enum TriviaRequestId {}
 
   switch action {
   case .cancelButtonTapped:
     state.isTriviaRequestInFlight = false
-    return .cancel(id: TriviaRequestId())
+    return .cancel(id: TriviaRequestId.self)
 
   case let .stepperChanged(value):
     state.count = value
     state.currentTrivia = nil
     state.isTriviaRequestInFlight = false
-    return .cancel(id: TriviaRequestId())
+    return .cancel(id: TriviaRequestId.self)
 
   case .triviaButtonTapped:
     state.currentTrivia = nil
@@ -59,7 +59,7 @@ let effectsCancellationReducer = Reducer<
     return environment.fact.fetch(state.count)
       .receive(on: environment.mainQueue)
       .catchToEffect(EffectsCancellationAction.triviaResponse)
-      .cancellable(id: TriviaRequestId())
+      .cancellable(id: TriviaRequestId.self)
 
   case let .triviaResponse(.success(response)):
     state.isTriviaRequestInFlight = false

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-LongLiving.swift

@@ -27,10 +27,7 @@ enum LongLivingEffectsAction {
 }
 
 struct LongLivingEffectsEnvironment {
-  // An effect that emits Void whenever the user takes a screenshot of the device. We use this
-  // instead of `NotificationCenter.default.publisher` directly in the reducer so that we can test
-  // it.
-  var userDidTakeScreenshot: Effect<Void, Never>
+  var notificationCenter: NotificationCenter
 }
 
 // MARK: - Business logic
@@ -39,7 +36,7 @@ let longLivingEffectsReducer = Reducer<
   LongLivingEffectsState, LongLivingEffectsAction, LongLivingEffectsEnvironment
 > { state, action, environment in
 
-  struct UserDidTakeScreenshotNotificationId: Hashable {}
+  enum UserDidTakeScreenshotNotificationId {}
 
   switch action {
   case .userDidTakeScreenshotNotification:
@@ -48,13 +45,14 @@ let longLivingEffectsReducer = Reducer<
 
   case .onAppear:
     // When the view appears, start the effect that emits when screenshots are taken.
-    return environment.userDidTakeScreenshot
-      .map { LongLivingEffectsAction.userDidTakeScreenshotNotification }
-      .cancellable(id: UserDidTakeScreenshotNotificationId())
+    return environment.notificationCenter
+      .publisher(for: UIApplication.userDidTakeScreenshotNotification)
+      .eraseToEffect { _ in LongLivingEffectsAction.userDidTakeScreenshotNotification }
+      .cancellable(id: UserDidTakeScreenshotNotificationId.self)
 
   case .onDisappear:
     // When view disappears, stop the effect.
-    return .cancel(id: UserDidTakeScreenshotNotificationId())
+    return .cancel(id: UserDidTakeScreenshotNotificationId.self)
   }
 }
 
@@ -103,7 +101,7 @@ struct EffectsLongLiving_Previews: PreviewProvider {
         initialState: LongLivingEffectsState(),
         reducer: longLivingEffectsReducer,
         environment: LongLivingEffectsEnvironment(
-          userDidTakeScreenshot: .none
+          notificationCenter: .default
         )
       )
     )