Use async/await for URL session (#5814)

realm · Sep 29, 2024 · ab699f9 · ab699f9
1 parent 1ec3fdc
commit ab699f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/Source/SwiftLintFramework/LintOrAnalyzeCommand.swift b/Source/SwiftLintFramework/LintOrAnalyzeCommand.swift
@@ -144,7 +144,7 @@ package struct LintOrAnalyzeCommand {
             try postProcessViolations(files: files, builder: builder)
         }
         if options.checkForUpdates || builder.configuration.checkForUpdates {
-            UpdateChecker.checkForUpdates()
+            await UpdateChecker.checkForUpdates()
         }
     }
 

diff --git a/Source/SwiftLintFramework/UpdateChecker.swift b/Source/SwiftLintFramework/UpdateChecker.swift
@@ -16,9 +16,9 @@ import FoundationNetworking
 #endif
 
 package enum UpdateChecker {
-    package static func checkForUpdates() {
+    package static func checkForUpdates() async {
         guard let url = URL(string: "https://api.github.com/repos/realm/SwiftLint/releases/latest"),
-              let data = sendRequest(to: url),
+              let data = try? await sendRequest(to: url),
               let latestVersionNumber = parseVersionNumber(data) else {
             print("Could not check latest SwiftLint version")
             return
@@ -39,20 +39,10 @@ package enum UpdateChecker {
         return jsonObject["tag_name"] as? String
     }
 
-    private static func sendRequest(to url: URL) -> Data? {
+    private static func sendRequest(to url: URL) async throws -> Data {
         var request = URLRequest(url: url)
         request.setValue("SwiftLint", forHTTPHeaderField: "User-Agent")
         request.setValue("application/vnd.github.v3+json", forHTTPHeaderField: "Accept")
-        let semaphore = DispatchSemaphore(value: 0)
-        var result: Data?
-
-        let task = URLSession.shared.dataTask(with: request) { data, _, _ in
-            result = data
-            semaphore.signal()
-        }
-        task.resume()
-
-        semaphore.wait()
-        return result
+        return try await URLSession.shared.data(for: request).0
     }
 }
diff --git a/Source/swiftlint/Commands/Version.swift b/Source/swiftlint/Commands/Version.swift
@@ -20,7 +20,7 @@ extension SwiftLint {
                 print(Self.value)
             }
             if checkForUpdates {
-                UpdateChecker.checkForUpdates()
+                await UpdateChecker.checkForUpdates()
             }
             ExitHelper.successfullyExit()
         }

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,8 +8,6 @@ jobs:
   strategy:
     maxParallel: 10
     matrix:
-      'Swift 5.10.1':
-        image: swift:5.10.1-noble
       'Swift 6':
         image: swift:6.0-noble
   container: $[ variables['image'] ]