ReducerProtocol (#1283)

* Add previewValue to DependencyKey, and fixed build errors on Xcode 13. * wip * wip * wip * wip * wip * wip * wip * wip * wip * Add Xcode 14 to CI (#1266) * Add Xcode 14 to CI * Update ci.yml * wip * wip * Update Makefile * Update Makefile * wip * runtime warning when no live dependency available for live app * bring back live * wip * soft deprecate Reducer * fusion test * ternary clean up * wip * add some todos * typealias Reducer inside AnyReducer * Add `now` convenience property to date dependency (#1286) * Remove type alias * LiveDependencyKey: DependencyKey -> DependencyKey: TestDependencyKey (#1288) * LiveDependencyKey: DependencyKey -> DependencyKey: TestDependencyKey * wip * wip * wip * wip * wip * fix * wip * fix navigate case studies * wip * fixes and docs * more migration * wip * wip * thread deps through ifLet and forEach examples. * update * clean up * wip * wip * Update MigratingToReducerProtocols.md * wip * wip * docs * docs * fix some docs * Fix for CombineReducers compiler bug * wip * wip * wip * wip * todos for docs * Don't warn for overridden test dependencies (#1324) * Don't warn while setting test dependencies * wip * fix conflict * wip * Docs and deprecations * add binding info * wip * Add URL session * wip * wip * wip * wip * wip * wip * wip * wip * Don't run debug reducer in tests * wip * updated reducer debugging * Update UUID.swift (#1374) * wip * optional * added Self as default associatedtype value for TestDependencyKey.value (#1395) * added Self as default associatedtype value for TestDependencyKey.value * Update Tests/ComposableArchitectureTests/DependencyKeyTests.swift Co-authored-by: Brandon Williams <135203+mbrandonw@users.noreply.github.com> * Update example to set badge to the unread count (#1391) * Add store.finish(). * Fix warnings introduced in Xcode 14.1 (#1388) * Fix warnings introduced in Xcode 14.1 * wip * Conform dependency values to DependencyKey where convenient * fix * Fail if testValue is invoked without providing implementation (#1399) * Update example to set badge to the unread count (#1391) * Add store.finish(). * Fix the CaseStudies (UIKit) (#1392) * Fix warnings introduced in Xcode 14.1 (#1388) * Fix warnings introduced in Xcode 14.1 * wip * Fail when accessing testValue when one hasn't been provided. * wip * wip * wip * test Co-authored-by: Mark Adams <hyperspacemark@users.noreply.github.com> Co-authored-by: Maciek Czarnik <Czajnikowski@users.noreply.github.com> Co-authored-by: Stephen Celis <stephen@stephencelis.com> * Add DateGenerator.init(_ generate:) * Start running some tests in release config. (#1405) * Start running some tests in release config. * wip * wip * wip * wip * wip * Update Sources/ComposableArchitecture/Store.swift Co-authored-by: Thomas Grapperon <35562418+tgrapperon@users.noreply.github.com> * wip * wip Co-authored-by: Thomas Grapperon <35562418+tgrapperon@users.noreply.github.com> * added test that dependencies are transferred to effects * wip * self * clean up * simplify * fix * doc fixes * wip * fix * wip * wip * wip * fix * Run dependencies tests on CI. (#1408) * Run dependencies tests on CI. * wip * update makefile * wtf * more docs * more docs * wip * docs * wip * docs * wip * message tweaks * wip * docs and clean up * wip * wip * wip * wip * wip * wip * wip * wip * typo fix * docs clean up * doc fixes * cancel in progress * cancel in progress * no need to make recope release-only, and make more use of XCTAssert to get better release tests * fix test * Remove ActorIsolated from tests where it's not needed * fix test * wip * wip * Add a benchmark for dependency key writing. * fix test * make benchmark 5.7 compatible * iflet docs * more docs * dependency docs * rearrange * @dependency docs * docs * fix benchmark in 5.6 * doc fix * wip * wip * wip * wip * more docs * clean up * fix * wip * Fixes compilation on watchOS (#1423) Co-authored-by: Gunnar Herzog <gunnar.herzog@kf-interactive.com> * move deprecation * format * wip * Fix openURL * wip * wip * wip * wip * fix * Keep simple * Reducer.debug -> Reducer._printChanges We want to revisit some of these debugging APIs in the future, so let's keep them around, but underscore them to allow for more flexible evolution. * `ReducerProtocol.debug` -> `ReducerProtocol._printChanges` (#1426) * Reducer.debug -> Reducer._printChanges We want to revisit some of these debugging APIs in the future, so let's keep them around, but underscore them to allow for more flexible evolution. * Update DebugTests.swift * OpenURL fix for macCatalyst (#1429) * OpenURL fix for macCatalyst Fixes #1428. * Update Makefile * Correct typo in "Designing dependencies" chapter (#1430) protocol AudioPlayerClient should be a struct * fix * fix * protocol docc * docs * Typos (#1439) * remove unneeded internals * wip * Fix missing parameter in code sample (#1450) * typo fix * more docs for DependencyKeyWritingReducer * wip * wip * update readme * wip * update image * main actor * Added withValue, added docs and tests * public properties * cleaned up overload * changed reducer->feature in a bunch of spots of dependencies docs * add articles to readme * 6 * fix tests for swift 5.6 * tweak * tweak * Update ReducerProtocol.swift * wip * wip * docs update * docs for conforming dependency directly to DependencyKey * typo fix * performance article update * fixes * deprecate another effect timer API * link to migration doc in deprecation messages * make some tests that deal with line numbers less fragile * package.swift clean up * tweak to echos * remove docs at root, not in docs-out * remove todo * update WithViewStore.init deprecation message to explain and link to performance doc * Add back ReducerProtocolOf for 5.7.1 (#1444) * Add back ReducerProtocolOf for 5.7.1 * wip * Move scheme tests to matrix * streamline * try this * store.finish * wip * dependencies -> transformDependency * wip * wip * Compat * fix * preserve deps for combine publishers * Remove dump calls (#1460) * Fix compiler errors for library evolution. (#1443) * Fix compiler errors for library evolution. * wip * wip * work around ambiguous init * Revert "work around ambiguous init" This reverts commit 002a199. * fix ambiguity errors * remove _Observe for now * wip * wip * wip * longer timeout * more waiting * wip Co-authored-by: Stephen Celis <stephen@stephencelis.com> Co-authored-by: Ken Grigsby <kgrigsby@mac.com> Co-authored-by: Petr Sima <ptea.sima@gmail.com> Co-authored-by: Mark Adams <hyperspacemark@users.noreply.github.com> Co-authored-by: Maciek Czarnik <Czajnikowski@users.noreply.github.com> Co-authored-by: Thomas Grapperon <35562418+tgrapperon@users.noreply.github.com> Co-authored-by: Gunnar Herzog <github@trispo.de> Co-authored-by: Gunnar Herzog <gunnar.herzog@kf-interactive.com> Co-authored-by: Guttorm Aase <guttormaase@gmail.com> Co-authored-by: Julien Sagot <contact@juliensagot.fr> Co-authored-by: Jaanus Siim <jaanussiim+github@gmail.com>
pointfreeco · Oct 10, 2022 · b8294b8 · b8294b8
1 parent 9740b96
commit b8294b8
Show file tree

Hide file tree

Showing 268 changed files with 15,409 additions and 8,332 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,21 +10,43 @@ on:
       - '*'
   workflow_dispatch:
 
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   library:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [13.2.1, 13.4.1]
+        xcode: ['13.4.1', '14.0']
+        config: ['debug', 'release']
+        scheme: ['Dependencies', 'ComposableArchitecture']
     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.4.1' }}
-        run: make test-docs
+      - name: Run ${{ matrix.scheme }} ${{ matrix.config }} tests
+        run: CONFIG=${{ matrix.config }} SCHEME=${{ matrix.scheme }} make test-library
+
+  library-evolution:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        xcode: ['13.4.1', '14.0']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Select Xcode ${{ matrix.xcode }}
+        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+      - name: Build for library evolution
+        run: make build-for-library-evolution
+
+  benchmarks:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v2
+      - name: Select Xcode ${{ matrix.xcode }}
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run benchmark
         run: make benchmark
 
@@ -33,6 +55,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run tests
         run: make test-examples
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -9,8 +9,13 @@ on:
   push:
     branches:
       - main
+      - protocol-beta
   workflow_dispatch:
 
+concurrency:
+  group: docs-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: macos-12
@@ -64,42 +69,45 @@ jobs:
           rm -rf docs-out/.git;
           rm -rf docs-out/main;
           rm -rf docs-out/protocol-beta;
-          git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | tail -n +6 | xargs -I {} rm -rf docs-out/{};
+          git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | tail -n +6 | xargs -I {} rm -rf {};
 
           for tag in $(echo "main"; echo "protocol-beta"; git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | head -6);
           do
-            echo "⏳ Generating documentation for "$tag" release.";
-
             if [ -d "docs-out/$tag" ] 
             then 
-                echo "✅ Documentation for "$tag" already exists.";
+              echo "✅ Documentation for "$tag" already exists.";
             else 
+              echo "⏳ Generating documentation for "$target" @ "$tag" release.";
+
+              for target in ComposableArchitecture Dependencies;
+              do 
                 git checkout .;
                 git checkout "$tag";
-                mkdir -p Sources/ComposableArchitecture/Documentation.docc;
+                mkdir -p Sources/"$target"/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 \
+                  --target "$target" \
                   -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 \
+                  && swift-docc/.build/release/docc convert Sources/"$target"/Documentation.docc \
+                    --fallback-display-name "$target" \
                     --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".";
+                    && echo "✅ Documentation generated for "$target" @ "$tag" release." \
+                    || echo "⚠️ Documentation skipped for "$target" @ "$tag".";
+              done;
             fi;
           done
 

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: format-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   swift_format:
     name: swift-format

diff --git a/ComposableArchitecture.xcworkspace/contents.xcworkspacedata b/ComposableArchitecture.xcworkspace/contents.xcworkspacedata
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme b/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme
@@ -39,6 +39,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DependenciesTests"
+               BuildableName = "DependenciesTests"
+               BlueprintName = "DependenciesTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/Dependencies.xcscheme b/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/Dependencies.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Dependencies"
+               BuildableName = "Dependencies"
+               BlueprintName = "Dependencies"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DependenciesTests"
+               BuildableName = "DependenciesTests"
+               BlueprintName = "DependenciesTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Dependencies"
+            BuildableName = "Dependencies"
+            BlueprintName = "Dependencies"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj b/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		CA0C0C4724B89BEC00CBDD8A /* 04-HigherOrderReducers-LifecycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA0C0C4624B89BEC00CBDD8A /* 04-HigherOrderReducers-LifecycleTests.swift */; };
 		CA0C51FB245389CC00A04EAB /* 04-HigherOrderReducers-ReusableOfflineDownloadsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA0C51FA245389CC00A04EAB /* 04-HigherOrderReducers-ReusableOfflineDownloadsTests.swift */; };
 		CA25E5D224463AD700DA666A /* 01-GettingStarted-Bindings-Basics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA25E5D124463AD700DA666A /* 01-GettingStarted-Bindings-Basics.swift */; };
-		CA27C0B7245780CE00CB1E59 /* 02-Effects-SystemEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA27C0B6245780CE00CB1E59 /* 02-Effects-SystemEnvironment.swift */; };
 		CA34170824A4E89500FAF950 /* 01-GettingStarted-AnimationsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA34170724A4E89500FAF950 /* 01-GettingStarted-AnimationsTests.swift */; };
 		CA3E421F26B8337500581ABC /* 01-GettingStarted-FocusState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA3E421E26B8337500581ABC /* 01-GettingStarted-FocusState.swift */; };
 		CA3E4C5B24B4FA0E00447C0B /* 04-HigherOrderReducers-Lifecycle.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA3E4C5A24B4FA0E00447C0B /* 04-HigherOrderReducers-Lifecycle.swift */; };
@@ -38,7 +37,7 @@
 		CAF88E7324B8E26D00539345 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E7224B8E26D00539345 /* AppDelegate.swift */; };
 		CAF88E7524B8E26D00539345 /* RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E7424B8E26D00539345 /* RootView.swift */; };
 		CAF88E7724B8E26E00539345 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAF88E7624B8E26E00539345 /* Assets.xcassets */; };
-		CAF88E8824B8E26E00539345 /* tvOSCaseStudiesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E8724B8E26E00539345 /* tvOSCaseStudiesTests.swift */; };
+		CAF88E8824B8E26E00539345 /* FocusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E8724B8E26E00539345 /* FocusTests.swift */; };
 		CAF88E9124B8E3AF00539345 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = CAF88E9024B8E3AF00539345 /* ComposableArchitecture */; };
 		CAF88E9324B8E3D000539345 /* Core.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E9224B8E3D000539345 /* Core.swift */; };
 		CAF88E9524B8E4D500539345 /* FocusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF88E9424B8E4D500539345 /* FocusView.swift */; };
@@ -156,7 +155,6 @@
 		CA0C0C4624B89BEC00CBDD8A /* 04-HigherOrderReducers-LifecycleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "04-HigherOrderReducers-LifecycleTests.swift"; sourceTree = "<group>"; };
 		CA0C51FA245389CC00A04EAB /* 04-HigherOrderReducers-ReusableOfflineDownloadsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "04-HigherOrderReducers-ReusableOfflineDownloadsTests.swift"; sourceTree = "<group>"; };
 		CA25E5D124463AD700DA666A /* 01-GettingStarted-Bindings-Basics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-Bindings-Basics.swift"; sourceTree = "<group>"; };
-		CA27C0B6245780CE00CB1E59 /* 02-Effects-SystemEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "02-Effects-SystemEnvironment.swift"; sourceTree = "<group>"; };
 		CA34170724A4E89500FAF950 /* 01-GettingStarted-AnimationsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-AnimationsTests.swift"; sourceTree = "<group>"; };
 		CA3E421E26B8337500581ABC /* 01-GettingStarted-FocusState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-FocusState.swift"; sourceTree = "<group>"; };
 		CA3E4C5A24B4FA0E00447C0B /* 04-HigherOrderReducers-Lifecycle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "04-HigherOrderReducers-Lifecycle.swift"; sourceTree = "<group>"; };
@@ -186,7 +184,7 @@
 		CAF88E7624B8E26E00539345 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		CAF88E7E24B8E26E00539345 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CAF88E8324B8E26E00539345 /* tvOSCaseStudiesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = tvOSCaseStudiesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		CAF88E8724B8E26E00539345 /* tvOSCaseStudiesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = tvOSCaseStudiesTests.swift; sourceTree = "<group>"; };
+		CAF88E8724B8E26E00539345 /* FocusTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusTests.swift; sourceTree = "<group>"; };
 		CAF88E9224B8E3D000539345 /* Core.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Core.swift; sourceTree = "<group>"; };
 		CAF88E9424B8E4D500539345 /* FocusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusView.swift; sourceTree = "<group>"; };
 		DC07231624465D1E003A8B65 /* 02-Effects-TimersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "02-Effects-TimersTests.swift"; sourceTree = "<group>"; };
@@ -313,7 +311,7 @@
 		CAF88E8624B8E26E00539345 /* tvOSCaseStudiesTests */ = {
 			isa = PBXGroup;
 			children = (
-				CAF88E8724B8E26E00539345 /* tvOSCaseStudiesTests.swift */,
+				CAF88E8724B8E26E00539345 /* FocusTests.swift */,
 			);
 			path = tvOSCaseStudiesTests;
 			sourceTree = "<group>";
@@ -412,7 +410,6 @@
 				CABC4F3826AEE00C00D5FA2C /* 02-Effects-Refreshable.swift */,
 				DC89C45424465C44006900B9 /* 02-Effects-Timers.swift */,
 				CA410EDF247A15FE00E41798 /* 02-Effects-WebSocket.swift */,
-				CA27C0B6245780CE00CB1E59 /* 02-Effects-SystemEnvironment.swift */,
 				DC89C45024462DE7006900B9 /* 03-Navigation-Lists-LoadThenNavigate.swift */,
 				DC89C45224465451006900B9 /* 03-Navigation-Lists-NavigateAndLoad.swift */,
 				DC89C448244618D5006900B9 /* 03-Navigation-LoadThenNavigate.swift */,
@@ -712,7 +709,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CAF88E8824B8E26E00539345 /* tvOSCaseStudiesTests.swift in Sources */,
+				CAF88E8824B8E26E00539345 /* FocusTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -776,7 +773,6 @@
 				DC89C44D244621A5006900B9 /* 03-Navigation-NavigateAndLoad.swift in Sources */,
 				DC89C4442446111B006900B9 /* 01-GettingStarted-Counter.swift in Sources */,
 				DCE63B71245CC0B90080A23D /* 04-HigherOrderReducers-Recursion.swift in Sources */,
-				CA27C0B7245780CE00CB1E59 /* 02-Effects-SystemEnvironment.swift in Sources */,
 				CAA9ADCA2446605B0003A984 /* 02-Effects-LongLiving.swift in Sources */,
 				DC89C45124462DE7006900B9 /* 03-Navigation-Lists-LoadThenNavigate.swift in Sources */,
 				DC89C45524465C44006900B9 /* 02-Effects-Timers.swift in Sources */,