Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kean committed Feb 25, 2023
1 parent 9ba73ed commit 2f989e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
Scripts/test.sh -s "Nuke" -d "OS=16.1,name=iPhone 14 Pro"
Scripts/test.sh -s "NukeUI" -d "OS=16.1,name=iPhone 14 Pro"
Scripts/test.sh -s "Nuke Extensions" -d "OS=16.1,name=iPhone 14 Pro"
Scripts/test.sh -s "NukeExtensions" -d "OS=16.1,name=iPhone 14 Pro"
macos-latest:
name: Unit Tests (macOS, Xcode 14.1)
runs-on: macOS-12
Expand All @@ -32,7 +32,7 @@ jobs:
run: |
Scripts/test.sh -s "Nuke" -d "arch=x86_64"
Scripts/test.sh -s "NukeUI" -d "arch=x86_64"
Scripts/test.sh -s "Nuke Extensions" -d "arch=x86_64"
Scripts/test.sh -s "NukeExtensions" -d "arch=x86_64"
tvos-latest:
name: Unit Tests (tvOS 16.1, Xcode 14.1)
runs-on: macOS-12
Expand All @@ -44,7 +44,7 @@ jobs:
run: |
Scripts/test.sh -s "Nuke" -d "OS=16.1,name=Apple TV"
Scripts/test.sh -s "NukeUI" -d "OS=16.1,name=Apple TV"
Scripts/test.sh -s "Nuke Extensions" -d "OS=16.1,name=Apple TV"
Scripts/test.sh -s "NukeExtensions" -d "OS=16.1,name=Apple TV"
# There is a problem with watchOS runners where they often fail to launch on CI
#
# watchos-latest:
Expand All @@ -70,7 +70,7 @@ jobs:
run: |
Scripts/test.sh -s "Nuke" -d "OS=15.5,name=iPhone 13 Pro"
Scripts/test.sh -s "NukeUI" -d "OS=15.5,name=iPhone 13 Pro"
Scripts/test.sh -s "Nuke Extensions" -d "OS=15.5,name=iPhone 13 Pro"
Scripts/test.sh -s "NukeExtensions" -d "OS=15.5,name=iPhone 13 Pro"
ios-xcode-13-2:
name: Unit Tests (iOS 15.4, Xcode 13.3.1)
runs-on: macOS-12
Expand All @@ -82,7 +82,7 @@ jobs:
run: |
Scripts/test.sh -s "Nuke" -d "OS=15.4,name=iPhone 13 Pro"
Scripts/test.sh -s "NukeUI" -d "OS=15.4,name=iPhone 13 Pro"
Scripts/test.sh -s "Nuke Extensions" -d "OS=15.4,name=iPhone 13 Pro"
Scripts/test.sh -s "NukeExtensions" -d "OS=15.4,name=iPhone 13 Pro"
ios-thread-safety:
name: Thread Safety Tests (TSan Enabled)
runs-on: macOS-12
Expand Down
6 changes: 3 additions & 3 deletions Sources/Nuke/Loading/DataLoader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private final class _DataLoader: NSObject, URLSessionDataDelegate {
(delegate as? URLSessionTaskDelegate)?.urlSession?(session, task: task, didFinishCollecting: metrics)
}

func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @Sendable @escaping (URLRequest?) -> Void) {
func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
(delegate as? URLSessionTaskDelegate)?.urlSession?(session, task: task, willPerformHTTPRedirection: response, newRequest: request, completionHandler: completionHandler) ??
completionHandler(request)
}
Expand All @@ -189,12 +189,12 @@ private final class _DataLoader: NSObject, URLSessionDataDelegate {
(delegate as? URLSessionTaskDelegate)?.urlSession?(session, taskIsWaitingForConnectivity: task)
}

func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @Sendable @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
(delegate as? URLSessionTaskDelegate)?.urlSession?(session, task: task, didReceive: challenge, completionHandler: completionHandler) ??
completionHandler(.performDefaultHandling, nil)
}

func urlSession(_ session: URLSession, task: URLSessionTask, willBeginDelayedRequest request: URLRequest, completionHandler: @Sendable @escaping (URLSession.DelayedRequestDisposition, URLRequest?) -> Void) {
func urlSession(_ session: URLSession, task: URLSessionTask, willBeginDelayedRequest request: URLRequest, completionHandler: @escaping (URLSession.DelayedRequestDisposition, URLRequest?) -> Void) {
(delegate as? URLSessionTaskDelegate)?.urlSession?(session, task: task, willBeginDelayedRequest: request, completionHandler: completionHandler) ??
completionHandler(.continueLoading, nil)
}
Expand Down

0 comments on commit 2f989e0

Please sign in to comment.