Modernize some things (#713)

mluisbrown · mluisbrown · commit 071e63fef3c7 · 2021-09-10T16:42:45.000+01:00
* Modernize some things.

* clean up

* wip

* wip

* clean up

* wip

* wip
diff --git a/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj b/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj
@@ -67,7 +67,6 @@
 		DC89C41B24460F95006900B9 /* 00-RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C41A24460F95006900B9 /* 00-RootView.swift */; };
 		DC89C41D24460F96006900B9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC89C41C24460F96006900B9 /* Assets.xcassets */; };
 		DC89C4442446111B006900B9 /* 01-GettingStarted-Counter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C4432446111B006900B9 /* 01-GettingStarted-Counter.swift */; };
-		DC89C44724461431006900B9 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C44624461431006900B9 /* ActivityIndicator.swift */; };
 		DC89C449244618D5006900B9 /* 03-Navigation-LoadThenNavigate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C448244618D5006900B9 /* 03-Navigation-LoadThenNavigate.swift */; };
 		DC89C44D244621A5006900B9 /* 03-Navigation-NavigateAndLoad.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C44C244621A5006900B9 /* 03-Navigation-NavigateAndLoad.swift */; };
 		DC89C45124462DE7006900B9 /* 03-Navigation-Lists-LoadThenNavigate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC89C45024462DE7006900B9 /* 03-Navigation-Lists-LoadThenNavigate.swift */; };
@@ -220,7 +219,6 @@
 		DC89C43824460FC7006900B9 /* swift-composable-architecture */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "swift-composable-architecture"; path = ../..; sourceTree = "<group>"; };
 		DC89C43924460FFF006900B9 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		DC89C4432446111B006900B9 /* 01-GettingStarted-Counter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-Counter.swift"; sourceTree = "<group>"; };
-		DC89C44624461431006900B9 /* ActivityIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityIndicator.swift; sourceTree = "<group>"; };
 		DC89C448244618D5006900B9 /* 03-Navigation-LoadThenNavigate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "03-Navigation-LoadThenNavigate.swift"; sourceTree = "<group>"; };
 		DC89C44C244621A5006900B9 /* 03-Navigation-NavigateAndLoad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "03-Navigation-NavigateAndLoad.swift"; sourceTree = "<group>"; };
 		DC89C45024462DE7006900B9 /* 03-Navigation-Lists-LoadThenNavigate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "03-Navigation-Lists-LoadThenNavigate.swift"; sourceTree = "<group>"; };
@@ -454,7 +452,6 @@
 		DC89C44524461416006900B9 /* Internal */ = {
 			isa = PBXGroup;
 			children = (
-				DC89C44624461431006900B9 /* ActivityIndicator.swift */,
 				CA6AC2612451135C00C71CB3 /* CircularProgressView.swift */,
 				DCC68EDE2447BC810037F998 /* TemplateText.swift */,
 				DC9EB4162450CBD2005F413B /* UIViewRepresented.swift */,
@@ -751,7 +748,6 @@
 				DCC68EDF2447BC810037F998 /* TemplateText.swift in Sources */,
 				DCAC2A4F2452352E0094DEF5 /* 04-HigherOrderReducers-ElmLikeSubscriptions.swift in Sources */,
 				CA6AC2672451135C00C71CB3 /* DownloadClient.swift in Sources */,
-				DC89C44724461431006900B9 /* ActivityIndicator.swift in Sources */,
 				CAA9ADC624465C810003A984 /* 02-Effects-Cancellation.swift in Sources */,
 				DC2E370D24573ACB00B94699 /* 04-HigherOrderReducers-StrictReducers.swift in Sources */,
 				CA5ECF92267A79F0002067FF /* FactClient.swift in Sources */,
@@ -962,7 +958,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = UIKitCaseStudiesTests/Info.plist;
+				INFOPLIST_FILE = UIKitCaseStudies/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -982,7 +978,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = UIKitCaseStudiesTests/Info.plist;
+				INFOPLIST_FILE = UIKitCaseStudies/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1152,6 +1148,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = SwiftUICaseStudies/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1171,6 +1168,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = SwiftUICaseStudies/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift
@@ -69,8 +69,7 @@ let effectsBasicsReducer = Reducer<
     // value back to the reducer's `numberFactResponse` action.
     return environment.fact.fetch(state.count)
       .observe(on: environment.mainQueue)
-      .catchToEffect()
-      .map(EffectsBasicsAction.numberFactResponse)
+      .catchToEffect(EffectsBasicsAction.numberFactResponse)
 
   case let .numberFactResponse(.success(response)):
     state.isNumberFactRequestInFlight = false
@@ -112,7 +111,7 @@ struct EffectsBasicsView: View {
 
           Button("Number fact") { viewStore.send(.numberFactButtonTapped) }
           if viewStore.isNumberFactRequestInFlight {
-            ActivityIndicator()
+            ProgressView()
           }
 
           viewStore.numberFact.map(Text.init)
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift
@@ -59,8 +59,7 @@ let effectsCancellationReducer = Reducer<
 
     return environment.fact.fetch(state.count)
       .observe(on: environment.mainQueue)
-      .catchToEffect()
-      .map(EffectsCancellationAction.triviaResponse)
+      .catchToEffect(EffectsCancellationAction.triviaResponse)
       .cancellable(id: TriviaRequestId())
 
   case let .triviaResponse(.success(response)):
@@ -99,7 +98,7 @@ struct EffectsCancellationView: View {
             HStack {
               Button("Cancel") { viewStore.send(.cancelButtonTapped) }
               Spacer()
-              ActivityIndicator()
+              ProgressView()
             }
           } else {
             Button("Number fact") { viewStore.send(.triviaButtonTapped) }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Refreshable.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Refreshable.swift
@@ -67,8 +67,7 @@ let refreshableReducer = Reducer<
     state.isLoading = true
     return environment.fact.fetch(state.count)
       .delay(2, on: environment.mainQueue.animation())
-      .catchToEffect()
-      .map(RefreshableAction.factResponse)
+      .catchToEffect(RefreshableAction.factResponse)
       .cancellable(id: CancelId())
   }
 }
@@ -100,7 +99,7 @@ let refreshableReducer = Reducer<
           }
         }
         .refreshable {
-        await viewStore.send(.refresh, while: \.isLoading)
+          await viewStore.send(.refresh, while: \.isLoading)
         }
       }
     }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift
@@ -46,8 +46,7 @@ let webSocketReducer = Reducer<WebSocketState, WebSocketAction, WebSocketEnviron
   var receiveSocketMessageEffect: Effect<WebSocketAction, Never> {
     return environment.webSocket.receive(WebSocketId())
       .observe(on: environment.mainQueue)
-      .catchToEffect()
-      .map(WebSocketAction.receivedSocketMessage)
+      .catchToEffect(WebSocketAction.receivedSocketMessage)
       .cancellable(id: WebSocketId())
   }
   var sendPingEffect: Effect<WebSocketAction, Never> {
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Effects-SystemEnvironment.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Effects-SystemEnvironment.swift
@@ -123,7 +123,7 @@ struct MultipleDependenciesView: View {
             Spacer()
 
             if viewStore.isFetchInFlight {
-              ActivityIndicator()
+              ProgressView()
             }
           }
         }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-LoadThenNavigate.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-LoadThenNavigate.swift
@@ -111,7 +111,7 @@ struct LoadThenNavigateListView: View {
                 Text("Load optional counter that starts from \(row.count)")
                 if row.isActivityIndicatorVisible {
                   Spacer()
-                  ActivityIndicator()
+                  ProgressView()
                 }
               }
             }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-NavigateAndLoad.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-NavigateAndLoad.swift
@@ -91,7 +91,7 @@ struct NavigateAndLoadListView: View {
                   action: NavigateAndLoadListAction.counter
                 ),
                 then: CounterView.init(store:),
-                else: { ActivityIndicator() }
+                else: ProgressView.init
               ),
               tag: row.id,
               selection: viewStore.binding(
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-LoadThenNavigate.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-LoadThenNavigate.swift
@@ -84,7 +84,7 @@ struct LoadThenNavigateView: View {
               Text("Load optional counter")
               if viewStore.isActivityIndicatorVisible {
                 Spacer()
-                ActivityIndicator()
+                ProgressView()
               }
             }
           }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-NavigateAndLoad.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-NavigateAndLoad.swift
@@ -73,7 +73,7 @@ struct NavigateAndLoadView: View {
                 action: NavigateAndLoadAction.optionalCounter
               ),
               then: CounterView.init(store:),
-              else: { ActivityIndicator() }
+              else: ProgressView.init
             ),
             isActive: viewStore.binding(
               get: \.isNavigationActive,
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Sheet-LoadThenPresent.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Sheet-LoadThenPresent.swift
@@ -72,7 +72,7 @@ struct LoadThenPresentView: View {
               Text("Load optional counter")
               if viewStore.isActivityIndicatorVisible {
                 Spacer()
-                ActivityIndicator()
+                ProgressView()
               }
             }
           }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Sheet-PresentAndLoad.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Sheet-PresentAndLoad.swift
@@ -81,7 +81,7 @@ struct PresentAndLoadView: View {
             action: PresentAndLoadAction.optionalCounter
           ),
           then: CounterView.init(store:),
-          else: { ActivityIndicator() }
+          else: ProgressView.init
         )
       }
       .navigationBarTitle("Present and load")
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift b/Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift
@@ -89,8 +89,7 @@ extension Reducer {
             return environment.downloadClient
               .download(state.id, state.url)
               .throttle(1, on: environment.mainQueue)
-              .catchToEffect()
-              .map(DownloadComponentAction.downloadClient)
+              .catchToEffect(DownloadComponentAction.downloadClient)
 
           case .startingToDownload:
             state.alert = cancelAlert
@@ -156,7 +155,7 @@ struct DownloadComponent<ID: Equatable>: View {
             .accentColor(Color.black)
         } else if viewStore.mode == .startingToDownload {
           ZStack {
-            ActivityIndicator()
+            ProgressView()
 
             Rectangle()
               .frame(width: 6, height: 6)
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ReusableFavoriting.swift b/Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ReusableFavoriting.swift
@@ -74,8 +74,7 @@ extension Reducer {
           return environment.request(state.id, state.isFavorite)
             .observe(on: environment.mainQueue)
             .mapError { FavoriteError(error: $0 as NSError) }
-            .catchToEffect()
-            .map(FavoriteAction.response)
+            .catchToEffect(FavoriteAction.response)
             .cancellable(id: FavoriteCancelId(id: state.id), cancelInFlight: true)
 
         case let .response(.failure(error)):
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/Internal/ActivityIndicator.swift b/Examples/CaseStudies/SwiftUICaseStudies/Internal/ActivityIndicator.swift
diff --git a/Examples/Search/Search.xcodeproj/project.pbxproj b/Examples/Search/Search.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		CA5C0ECA2425661800C1F9AB /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5C0EC92425661800C1F9AB /* ActivityIndicator.swift */; };
 		CA66690B242547B000A639B3 /* WeatherClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA66690A242547B000A639B3 /* WeatherClient.swift */; };
 		CA86E49D24253C2500357AD9 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA86E49C24253C2500357AD9 /* SceneDelegate.swift */; };
 		CA86E49F24253C2500357AD9 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA86E49E24253C2500357AD9 /* SearchView.swift */; };
@@ -50,7 +49,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		CA5C0EC92425661800C1F9AB /* ActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityIndicator.swift; sourceTree = "<group>"; };
 		CA66690A242547B000A639B3 /* WeatherClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherClient.swift; sourceTree = "<group>"; };
 		CA86E49724253C2500357AD9 /* Search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Search.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA86E49C24253C2500357AD9 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -107,7 +105,6 @@
 			children = (
 				CA86E4A824253C2700357AD9 /* Info.plist */,
 				CA86E49E24253C2500357AD9 /* SearchView.swift */,
-				CA5C0EC92425661800C1F9AB /* ActivityIndicator.swift */,
 				CA86E49C24253C2500357AD9 /* SceneDelegate.swift */,
 				CA66690A242547B000A639B3 /* WeatherClient.swift */,
 				CA86E4A024253C2700357AD9 /* Assets.xcassets */,
@@ -231,7 +228,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CA5C0ECA2425661800C1F9AB /* ActivityIndicator.swift in Sources */,
 				CA66690B242547B000A639B3 /* WeatherClient.swift in Sources */,
 				CA86E49D24253C2500357AD9 /* SceneDelegate.swift in Sources */,
 				CA86E49F24253C2500357AD9 /* SearchView.swift in Sources */,
@@ -413,6 +409,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = Search/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -432,6 +429,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = Search/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Examples/Search/Search/ActivityIndicator.swift b/Examples/Search/Search/ActivityIndicator.swift
diff --git a/Examples/Search/Search/SearchView.swift b/Examples/Search/Search/SearchView.swift
@@ -50,8 +50,7 @@ let searchReducer = Reducer<SearchState, SearchAction, SearchEnvironment> {
     return environment.weatherClient
       .weather(location.id)
       .observe(on: environment.mainQueue)
-      .catchToEffect()
-      .map(SearchAction.locationWeatherResponse)
+      .catchToEffect(SearchAction.locationWeatherResponse)
       .cancellable(id: SearchWeatherId(), cancelInFlight: true)
 
   case let .searchQueryChanged(query):
@@ -69,9 +68,8 @@ let searchReducer = Reducer<SearchState, SearchAction, SearchEnvironment> {
 
     return environment.weatherClient
       .searchLocation(query)
-      .catchToEffect()
       .debounce(id: SearchLocationId(), for: 0.3, scheduler: environment.mainQueue)
-      .map(SearchAction.locationsResponse)
+      .catchToEffect(SearchAction.locationsResponse)
 
   case let .locationWeatherResponse(.failure(locationWeather)):
     state.locationWeather = nil
@@ -118,7 +116,7 @@ struct SearchView: View {
                     Text(location.title)
 
                     if viewStore.locationWeatherRequestInFlight?.id == location.id {
-                      ActivityIndicator()
+                      ProgressView()
                     }
                   }
                 }
diff --git a/Examples/SpeechRecognition/SpeechRecognition.xcodeproj/project.pbxproj b/Examples/SpeechRecognition/SpeechRecognition.xcodeproj/project.pbxproj
@@ -427,6 +427,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = SpeechRecognition/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -446,6 +447,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
+				INFOPLIST_FILE = SpeechRecognition/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift b/Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift
@@ -97,15 +97,14 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
       request.shouldReportPartialResults = true
       request.requiresOnDeviceRecognition = false
       return environment.speechClient.recognitionTask(SpeechRecognitionId(), request)
-        .catchToEffect()
-        .map(AppAction.speech)
+        .catchToEffect(AppAction.speech)
 
     @unknown default:
       return .none
     }
   }
 }
-.debug()
+  .debug(actionFormat: .labelsOnly)
 
 struct AuthorizationStateAlert: Equatable, Identifiable {
   var title: String
diff --git a/Examples/TicTacToe/tic-tac-toe/Sources/LoginCore/LoginCore.swift b/Examples/TicTacToe/tic-tac-toe/Sources/LoginCore/LoginCore.swift
@@ -86,8 +86,7 @@ public let loginReducer = Reducer<LoginState, LoginAction, LoginEnvironment>.com
       return environment.authenticationClient
         .login(LoginRequest(email: state.email, password: state.password))
         .observe(on: environment.mainQueue)
-        .catchToEffect()
-        .map(LoginAction.loginResponse)
+        .catchToEffect(LoginAction.loginResponse)
 
     case .twoFactor:
       return .none
diff --git a/Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorCore/TwoFactorCore.swift b/Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorCore/TwoFactorCore.swift
@@ -57,8 +57,7 @@ public let twoFactorReducer = Reducer<TwoFactorState, TwoFactorAction, TwoFactor
     return environment.authenticationClient
       .twoFactor(TwoFactorRequest(code: state.code, token: state.token))
       .observe(on: environment.mainQueue)
-      .catchToEffect()
-      .map(TwoFactorAction.twoFactorResponse)
+      .catchToEffect(TwoFactorAction.twoFactorResponse)
       .cancellable(id: TwoFactorTearDownToken())
 
   case let .twoFactorResponse(.failure(error)):
diff --git a/Examples/Todos/Todos.xcodeproj/project.pbxproj b/Examples/Todos/Todos.xcodeproj/project.pbxproj
diff --git a/Examples/VoiceMemos/VoiceMemos.xcodeproj/project.pbxproj b/Examples/VoiceMemos/VoiceMemos.xcodeproj/project.pbxproj
diff --git a/Examples/VoiceMemos/VoiceMemos/SceneDelegate.swift b/Examples/VoiceMemos/VoiceMemos/SceneDelegate.swift
diff --git a/Examples/VoiceMemos/VoiceMemos/VoiceMemo.swift b/Examples/VoiceMemos/VoiceMemos/VoiceMemo.swift
diff --git a/Examples/VoiceMemos/VoiceMemos/VoiceMemos.swift b/Examples/VoiceMemos/VoiceMemos/VoiceMemos.swift
diff --git a/Examples/VoiceMemos/VoiceMemosTests/VoiceMemosTests.swift b/Examples/VoiceMemos/VoiceMemosTests/VoiceMemosTests.swift
diff --git a/Sources/ComposableArchitecture/ViewStore.swift b/Sources/ComposableArchitecture/ViewStore.swift

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ let refreshableReducer = Reducer<`
`67`	`67`	`state.isLoading = true`
`68`	`68`	`return environment.fact.fetch(state.count)`
`69`	`69`	`.delay(2, on: environment.mainQueue.animation())`
`70`		`- .catchToEffect()`
`71`		`- .map(RefreshableAction.factResponse)`
	`70`	`+ .catchToEffect(RefreshableAction.factResponse)`
`72`	`71`	`.cancellable(id: CancelId())`
`73`	`72`	`}`
`74`	`73`	`}`
`@@ -100,7 +99,7 @@ let refreshableReducer = Reducer<`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`	`.refreshable {`
`103`		`- await viewStore.send(.refresh, while: \.isLoading)`
	`102`	`+ await viewStore.send(.refresh, while: \.isLoading)`
`104`	`103`	`}`
`105`	`104`	`}`
`106`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ struct MultipleDependenciesView: View {`
`123`	`123`	`Spacer()`
`124`	`124`
`125`	`125`	`if viewStore.isFetchInFlight {`
`126`		`- ActivityIndicator()`
	`126`	`+ ProgressView()`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ struct LoadThenNavigateListView: View {`
`111`	`111`	`Text("Load optional counter that starts from \(row.count)")`
`112`	`112`	`if row.isActivityIndicatorVisible {`
`113`	`113`	`Spacer()`
`114`		`- ActivityIndicator()`
	`114`	`+ ProgressView()`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ struct LoadThenNavigateView: View {`
`84`	`84`	`Text("Load optional counter")`
`85`	`85`	`if viewStore.isActivityIndicatorVisible {`
`86`	`86`	`Spacer()`
`87`		`- ActivityIndicator()`
	`87`	`+ ProgressView()`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`