Fixes after resolving conflicts.

Author: mluisbrown

Examples/VoiceMemos/VoiceMemos/VoiceMemo.swift

@@ -64,10 +64,10 @@ let voiceMemoReducer = Reducer<VoiceMemo, VoiceMemoAction, VoiceMemoEnvironment>
     switch memo.mode {
     case .notPlaying:
       memo.mode = .playing(progress: 0)
-      let start = environment.mainRunLoop.now
+      let start = environment.mainRunLoop.currentDate
       return .merge(
-        Effect.timer(id: TimerId(), every: 0.5, on: environment.mainRunLoop)
-          .map { .timerUpdated($0.date.timeIntervalSince1970 - start.date.timeIntervalSince1970) },
+        Effect.timer(id: TimerId(), every: .milliseconds(500), on: environment.mainRunLoop)
+          .map { .timerUpdated($0.timeIntervalSince1970 - start.timeIntervalSince1970) },
 
         environment.audioPlayerClient
           .play(PlayerId(), memo.url)

Examples/VoiceMemos/VoiceMemos/VoiceMemos.swift

@@ -64,13 +64,13 @@ let voiceMemosReducer = Reducer<VoiceMemosState, VoiceMemosAction, VoiceMemosEnv
         .appendingPathComponent(environment.uuid().uuidString)
         .appendingPathExtension("m4a")
       state.currentRecording = .init(
-        date: environment.mainRunLoop.now.date,
+        date: environment.mainRunLoop.currentDate,
         url: url
       )
       return .merge(
         environment.audioRecorder.startRecording(RecorderId(), url)
           .catchToEffect(VoiceMemosAction.audioRecorder),
-        Effect.timer(id: RecorderTimerId(), every: 1, tolerance: .zero, on: environment.mainRunLoop)
+        Effect.timer(id: RecorderTimerId(), every: .seconds(1), on: environment.mainRunLoop)
           .map { _ in .currentRecordingTimerUpdated }
       )
     }

Examples/VoiceMemos/VoiceMemosTests/VoiceMemosTests.swift

@@ -6,13 +6,12 @@ import XCTest
 @testable import VoiceMemos
 
 class VoiceMemosTests: XCTestCase {
-  let mainRunLoop = RunLoop.test
+  let mainRunLoop = TestScheduler()
 
   func testRecordMemoHappyPath() {
     let audioRecorderSubject = Signal<
       AudioRecorderClient.Action, AudioRecorderClient.Failure
     >.pipe()
-    let scheduler = TestScheduler()
 
     var environment = VoiceMemosEnvironment.failing
     environment.audioRecorder.currentTime = { _ in Effect(value: 2.5) }
@@ -26,7 +25,7 @@ class VoiceMemosTests: XCTestCase {
         audioRecorderSubject.input.sendCompleted()
       }
     }
-    environment.mainQueue = scheduler
+    environment.mainRunLoop = mainRunLoop
     environment.temporaryDirectory = { URL(fileURLWithPath: "/tmp") }
     environment.uuid = { UUID(uuidString: "DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF")! }
 
@@ -41,7 +40,7 @@ class VoiceMemosTests: XCTestCase {
     store.receive(.recordPermissionResponse(true)) {
       $0.audioRecorderPermission = .allowed
       $0.currentRecording = .init(
-        date: Date(timeIntervalSince1970: 0),
+        date: Date(timeIntervalSinceReferenceDate: 0),
         mode: .recording,
         url: URL(string: "file:///tmp/DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF.m4a")!
       )
@@ -65,7 +64,7 @@ class VoiceMemosTests: XCTestCase {
       $0.currentRecording = nil
       $0.voiceMemos = [
         VoiceMemo(
-          date: Date(timeIntervalSince1970: 0),
+          date: Date(timeIntervalSinceReferenceDate: 0),
           duration: 2.5,
           mode: .notPlaying,
           title: "",
@@ -142,13 +141,12 @@ class VoiceMemosTests: XCTestCase {
   }
 
   func testPlayMemoHappyPath() {
-    let scheduler = TestScheduler()
     var environment = VoiceMemosEnvironment.failing
     environment.audioPlayer.play = { _, _ in
       Effect(value: .didFinishPlaying(successfully: true))
-        .delay(1.1, on: scheduler)
+        .delay(1.1, on: self.mainRunLoop)
     }
-    environment.mainQueue = scheduler
+    environment.mainRunLoop = mainRunLoop
 
     let url = URL(string: "https://www.pointfree.co/functions")!
     let store = TestStore(
@@ -170,15 +168,15 @@ class VoiceMemosTests: XCTestCase {
     store.send(.voiceMemo(id: url, action: .playButtonTapped)) {
       $0.voiceMemos[id: url]?.mode = VoiceMemo.Mode.playing(progress: 0)
     }
-    self.mainRunLoop.advance(by: 0.5)
+    mainRunLoop.advance(by: 0.5)
     store.receive(VoiceMemosAction.voiceMemo(id: url, action: VoiceMemoAction.timerUpdated(0.5))) {
       $0.voiceMemos[id: url]?.mode = .playing(progress: 0.5)
     }
-    self.mainRunLoop.advance(by: 0.5)
+    mainRunLoop.advance(by: 0.5)
     store.receive(VoiceMemosAction.voiceMemo(id: url, action: VoiceMemoAction.timerUpdated(1))) {
       $0.voiceMemos[id: url]?.mode = .playing(progress: 1)
     }
-    scheduler.advance(by: 0.1)
+    mainRunLoop.advance(by: 0.1)
     store.receive(
       .voiceMemo(
         id: url,

Sources/ComposableArchitecture/ViewStore.swift

@@ -95,7 +95,7 @@ public final class ViewStore<State, Action> {
         #if canImport(Combine)
           if #available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *) {
         self.objectWillChange.send()
-        self._state.value = $0
+        self._state = $0
       }
         #endif
         self._state = $0