Merge pull request #15 from trading-point/michael/sync-with-upstream

Sync with latest upstream changes

Author: mluisbrown

.github/workflows/ci.yml

@@ -16,23 +16,10 @@ jobs:
         xcode:
           - 11.4
           - 11.5
+          - 11.6
     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-swift
-
-  examples:
-    runs-on: macOS-latest
-    strategy:
-      matrix:
-        xcode:
-          - 11.4
-          - 11.5
-    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-workspace
+        run: make test

.github/workflows/documentation.yml

@@ -0,0 +1,27 @@
+name: Documentation
+on:
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Generate Documentation
+        uses: SwiftDocOrg/swift-doc@master
+        with:
+          base-url: /reactiveswift-composable-architecture/
+          format: html
+          inputs: Sources/ComposableArchitecture
+          module-name: ComposableArchitecture
+          output: Documentation
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: Documentation

Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@ struct RootState {
   var effectsCancellation = EffectsCancellationState()
   var effectsTimers = TimersState()
   var episodes = EpisodesState(episodes: .mocks)
+  var lifecycle = LifecycleDemoState()
   var loadThenNavigate = LoadThenNavigateState()
   var loadThenNavigateList = LoadThenNavigateListState()
   var loadThenPresent = LoadThenPresentState()
@@ -40,6 +41,7 @@ enum RootAction {
   case effectsBasics(EffectsBasicsAction)
   case effectsCancellation(EffectsCancellationAction)
   case episodes(EpisodesAction)
+  case lifecycle(LifecycleDemoAction)
   case loadThenNavigate(LoadThenNavigateAction)
   case loadThenNavigateList(LoadThenNavigateListAction)
   case loadThenPresent(LoadThenPresentAction)
@@ -149,6 +151,12 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
       action: /RootAction.episodes,
       environment: { .init(favorite: $0.favorite, mainQueue: $0.mainQueue) }
     ),
+  lifecycleDemoReducer
+    .pullback(
+      state: \.lifecycle,
+      action: /RootAction.lifecycle,
+      environment: { .init(mainQueue: $0.mainQueue )}
+    ),
   loadThenNavigateReducer
     .pullback(
       state: \.loadThenNavigate,

Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift

@@ -226,6 +226,16 @@ struct RootView: View {
               )
             )
 
+            NavigationLink(
+              "Lifecycle",
+              destination: LifecycleDemoView(
+                store: self.store.scope(
+                  state: { $0.lifecycle },
+                  action: RootAction.lifecycle
+                )
+              )
+            )
+
             NavigationLink(
               "Strict reducers",
               destination: DieRollView(

Examples/CaseStudies/SwiftUICaseStudies/00-RootView.swift

@@ -17,6 +17,24 @@ private let readMe = """
   toggle at the bottom of the screen.
   """
 
+extension Effect where Error == Never {
+  public static func keyFrames(
+    values: [(output: Value, duration: TimeInterval)],
+    scheduler: DateScheduler
+  ) -> Effect {
+    .concatenate(
+      values
+      .enumerated()
+      .map { index, animationState in
+        index == 0
+        ? Effect(value: animationState.output)
+          : Effect(value: animationState.output)
+        .delay(values[index - 1].duration, on: scheduler)
+      }
+    )
+  }
+}
+
 struct AnimationsState: Equatable {
   var circleCenter = CGPoint.zero
   var circleColor = Color.white
@@ -43,15 +61,10 @@ let animationsReducer = Reducer<AnimationsState, AnimationsAction, AnimationsEnv
     return .none
 
   case .rainbowButtonTapped:
-    return .concatenate(
-      [Color.red, .blue, .green, .orange, .pink, .purple, .yellow, .white]
-        .enumerated()
-        .map { index, color in
-          index == 0
-            ? Effect(value: .setColor(color))
-            : Effect(value: .setColor(color))
-              .delay(1, on: environment.mainQueue)
-        }
+    return .keyFrames(
+        values: [Color.red, .blue, .green, .orange, .pink, .purple, .yellow, .white]
+            .map { (output: .setColor($0), duration: 1) },
+        scheduler: environment.mainQueue
     )
 
   case let .setColor(color):

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

@@ -23,8 +23,9 @@ enum OptionalBasicsAction: Equatable {
 
 struct OptionalBasicsEnvironment {}
 
-let optionalBasicsReducer = counterReducer
-  .optional
+let optionalBasicsReducer =
+  counterReducer
+  .optional()
   .pullback(
     state: \.optionalCounter,
     action: /OptionalBasicsAction.optionalCounter,

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

@@ -42,7 +42,7 @@ let loadThenNavigateListReducer =
     action: .self,
     environment: { $0 }
   )
-  .optional
+  .optional()
   .pullback(
     state: \LoadThenNavigateListState.selection,
     action: /LoadThenNavigateListAction.counter,

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-LoadThenNavigate.swift

@@ -33,10 +33,11 @@ struct NavigateAndLoadListEnvironment {
   var mainQueue: DateScheduler
 }
 
-let navigateAndLoadListReducer = counterReducer
-  .optional
+let navigateAndLoadListReducer =
+  counterReducer
+  .optional()
   .pullback(state: \Identified.value, action: .self, environment: { $0 })
-  .optional
+  .optional()
   .pullback(
     state: \NavigateAndLoadListState.selection,
     action: /NavigateAndLoadListAction.counter,

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-NavigateAndLoad.swift

@@ -27,8 +27,9 @@ struct LoadThenNavigateEnvironment {
   var mainQueue: DateScheduler
 }
 
-let loadThenNavigateReducer = counterReducer
-  .optional
+let loadThenNavigateReducer =
+  counterReducer
+  .optional()
   .pullback(
     state: \.optionalCounter,
     action: /LoadThenNavigateAction.optionalCounter,