Merge pull request #6 from leovido/feat/tca-upgrade

feat: TCA upgrade to latest version
leovido · Aug 14, 2024 · 8967b70 · 8967b70 · YoungDeveloper78 · Sep 21, 2024
2 parents 0da9d11 + cc3203b
commit 8967b70
Show file tree

Hide file tree

Showing 55 changed files with 2,030 additions and 1,781 deletions.
diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/AppFeature.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/AppFeature.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/BalanceFeature.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/BalanceFeature.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,32 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      systemAttachmentLifetime = "keepNever"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BalanceFeature"
+            BuildableName = "BalanceFeature"
+            BlueprintName = "BalanceFeature"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BalanceTests"
+               BuildableName = "BalanceTests"
+               BlueprintName = "BalanceTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/BalanceTests.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/BalanceTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -38,6 +38,11 @@
                BlueprintName = "BalanceTests"
                ReferencedContainer = "container:">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "BalanceUITests">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
    </TestAction>

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/Common.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/Common.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/LoginFeature.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/LoginFeature.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,31 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "LoginFeature"
+            BuildableName = "LoginFeature"
+            BlueprintName = "LoginFeature"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "LoginTests"
+               BuildableName = "LoginTests"
+               BlueprintName = "LoginTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/SpendFeature.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/SpendFeature.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/TransactionFeature.xcscheme b/MuchBetterDependencies/.swiftpm/xcode/xcshareddata/xcschemes/TransactionFeature.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MuchBetterDependencies/Package.swift b/MuchBetterDependencies/Package.swift
@@ -1,12 +1,12 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
   name: "MuchBetterDependencies",
   platforms: [
-    .iOS(.v15),
+		.iOS(.v17)
   ],
   products: [
     .library(
@@ -40,10 +40,9 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/pointfreeco/swift-composable-architecture",
-             from: "0.28.1"),
-    .package(name: "SnapshotTesting",
-             url: "https://github.com/pointfreeco/swift-snapshot-testing.git",
-             from: "1.9.0"),
+             from: "1.12.1"),
+    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git",
+             from: "1.17.4"),
   ],
   targets: [
     .target(
@@ -61,7 +60,7 @@ let package = Package(
       name: "AppTests",
       dependencies: [
         "AppFeature",
-        "SnapshotTesting",
+				.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
         "BalanceFeature",
         "LoginFeature",
         "SpendFeature",
@@ -74,15 +73,18 @@ let package = Package(
     .target(
       name: "BalanceFeature",
       dependencies: [
-        "Client",
         "Common",
+				"Client",
+				.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
       ]
     ),
     .testTarget(
       name: "BalanceTests",
       dependencies: [
         "BalanceFeature",
-        "SnapshotTesting",
+				"Common",
+				.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
+
       ],
       exclude: [
         "__Snapshots__",
@@ -108,14 +110,14 @@ let package = Package(
       name: "LoginFeature",
       dependencies: [
         "Client",
-        .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+				.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
       ]
     ),
     .testTarget(
       name: "LoginTests",
       dependencies: [
         "LoginFeature",
-        "SnapshotTesting",
+				.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
       ],
       exclude: [
         "__Snapshots__",
@@ -132,7 +134,7 @@ let package = Package(
       name: "SpendTests",
       dependencies: [
         "SpendFeature",
-        "SnapshotTesting",
+				.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
       ],
       exclude: [
         "__Snapshots__",
@@ -149,7 +151,7 @@ let package = Package(
       name: "TransactionTests",
       dependencies: [
         "TransactionFeature",
-        "SnapshotTesting",
+				.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
       ],
       exclude: [
         "__Snapshots__",

diff --git a/MuchBetterDependencies/Sources/AppFeature/AppClient.swift b/MuchBetterDependencies/Sources/AppFeature/AppClient.swift
@@ -0,0 +1,27 @@
+import ComposableArchitecture
+
+@DependencyClient
+public struct AppClient {
+	public var login: @Sendable () async throws -> String
+
+	public init(login: @Sendable @escaping () -> String) {
+		self.login = login
+	}
+}
+
+extension DependencyValues {
+	public var appClient: AppClient {
+		get { self[AppClient.self] }
+		set { self[AppClient.self] = newValue}
+	}
+}
+
+extension AppClient: DependencyKey {
+	static public let previewValue: AppClient = .init {
+		return "preview"
+	}
+
+	static public var testValue: AppClient = .init {
+		return "test"
+	}
+}