Merge pull request #19 from SwiftPackageIndex/hang-workaround

Hang workaround
SwiftPackageIndex · Mar 28, 2024 · a335f12 · a335f12
2 parents 4877d48 + c77015f
commit a335f12
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/Sources/DocUploadBundle/DocUploadBundle.swift b/Sources/DocUploadBundle/DocUploadBundle.swift
@@ -14,17 +14,14 @@
 
 import Foundation
 
-#if swift(>=5.6)
-// Swift5.5Tests need to run with Swift 5.5 but swift-dependencies has tools-version 5.6
 import Dependencies
-#endif
 import Zip
 
 
 public struct DocUploadBundle {
 
-#if swift(>=5.6)
- // Swift5.5Tests need to run with Swift 5.5 but swift-dependencies has tools-version 5.6
+ // Workaround for https://github.com/pointfreeco/swift-dependencies/issues/199
+#if DEBUG
  @Dependency(\.uuid) var uuid
 #else
  let uuid = { UUID() }

diff --git a/Sources/DocUploader/Dependencies/HTTPExecutor.swift b/Sources/DocUploader/Dependencies/HTTPExecutor.swift
@@ -36,14 +36,5 @@ extension HTTPExecutor {
 }
 
 extension HTTPExecutor: DependencyKey {
- static var liveValue: HTTPExecutor {
- .live
- }
-}
-
-extension DependencyValues {
- var httpClient: HTTPExecutor {
- get { self[HTTPExecutor.self] }
- set { self[HTTPExecutor.self] = newValue }
- }
+ static var liveValue: HTTPExecutor { .live }
 }
diff --git a/Sources/DocUploader/DocReport.swift b/Sources/DocUploader/DocReport.swift
@@ -22,7 +22,12 @@ import NIOHTTP1
 
 enum DocReport {
 
- @Dependency(\.httpClient) static var httpClient: HTTPExecutor
+ // Workaround for https://github.com/pointfreeco/swift-dependencies/issues/199
+#if DEBUG
+ @Dependency(HTTPExecutor.self) static var httpClient: HTTPExecutor
+#else
+ static let httpClient: HTTPExecutor = .live
+#endif
 
  enum Status: String, Codable {
  case ok

diff --git a/Tests/DocUploaderTests/DocUploaderTests.swift b/Tests/DocUploaderTests/DocUploaderTests.swift
@@ -35,7 +35,7 @@ final class DocUploaderTests: XCTestCase {
  func test_reportResult() async throws {
  var request: HTTPClientRequest?
  try await withDependencies {
- $0.httpClient.execute = { _, req, _ in
+ $0[HTTPExecutor.self].execute = { _, req, _ in
  request = req
  return .init(status: .noContent)
  }