Merge branch 'main' into dependabot/github_actions/actions/checkout-4

Author: rgoldberg

.github/workflows/build-test.yml

@@ -28,13 +28,10 @@ jobs:
 
     name: Build, Test, and Lint
 
-    # GitHub provided runners (in case we need to switch back)
+    # https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source
     # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
-    # runs-on: macos-latest
-
-    # https://docs.github.com/en/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow
-    # https://github.com/mas-cli/mas/settings/actions/runners
-    runs-on: [self-hosted, macOS]
+    # https://github.com/mas-cli/mas/actions/runners
+    runs-on: macos-14
 
     steps:
     # https://github.com/actions/checkout#usage

Package.swift

@@ -71,7 +71,11 @@ let package = Package(
 )
 
 // https://github.com/apple/swift-format#matching-swift-format-to-your-swift-version-swift-57-and-earlier
-#if compiler(>=5.7)
+#if compiler(>=5.8)
+    package.dependencies += [
+        .package(url: "https://github.com/apple/swift-format", .branch("release/5.9"))
+    ]
+#elseif compiler(>=5.7)
     package.dependencies += [
         .package(url: "https://github.com/apple/swift-format", .branch("release/5.7"))
     ]

Sources/MasKit/AppStore/Downloader.swift

@@ -81,12 +81,12 @@ private func download(_ appID: UInt64, purchase: Bool = false) -> Promise<Void>
     return Promise<SSPurchase> { seal in
         let purchase = SSPurchase(adamId: appID, account: storeAccount, purchase: purchase)
         purchase.perform { purchase, _, error, response in
-            if let error = error {
+            if let error {
                 seal.reject(MASError.purchaseFailed(error: error as NSError?))
                 return
             }
 
-            guard response?.downloads.isEmpty == false, let purchase = purchase else {
+            guard response?.downloads.isEmpty == false, let purchase else {
                 print("No downloads")
                 seal.reject(MASError.noDownloads)
                 return

Sources/MasKit/AppStore/SSPurchase.swift

@@ -41,7 +41,7 @@ extension SSPurchase {
 
         itemIdentifier = adamId
 
-        if let account = account {
+        if let account {
             accountIdentifier = account.dsID
             appleID = account.identifier
         }

Sources/MasKit/Commands/Outdated.swift

@@ -41,7 +41,7 @@ public struct OutdatedCommand: CommandProtocol {
             firstly {
                 storeSearch.lookup(app: installedApp.itemIdentifier.intValue)
             }.done { storeApp in
-                guard let storeApp = storeApp else {
+                guard let storeApp else {
                     if options.verbose {
                         printWarning(
                             """

Sources/MasKit/Commands/Uninstall.swift

@@ -1,5 +1,5 @@
 //
-//  Upgrade.swift
+//  Uninstall.swift
 //  mas-cli
 //
 //  Created by Ben Chatelain on 2018-12-27.

Sources/MasKit/Controllers/MasStoreSearch.swift

@@ -76,7 +76,7 @@ class MasStoreSearch: StoreSearch {
                 return firstly {
                     self.scrapeVersionFromPage(pageUrl)
                 }.done { pageVersion in
-                    if let pageVersion = pageVersion, pageVersion > searchVersion {
+                    if let pageVersion, pageVersion > searchVersion {
                         results[index].version = pageVersion.description
                     }
                 }

Sources/MasKit/Controllers/StoreSearch.swift

@@ -32,7 +32,7 @@ extension StoreSearch {
             URLQueryItem(name: "term", value: appName),
         ]
 
-        if let country = country {
+        if let country {
             components.queryItems!.append(country)
         }
 
@@ -48,9 +48,12 @@ extension StoreSearch {
             return nil
         }
 
-        components.queryItems = [URLQueryItem(name: "id", value: "\(appId)")]
+        components.queryItems = [
+            URLQueryItem(name: "id", value: "\(appId)"),
+            URLQueryItem(name: "entity", value: "desktopSoftware"),
+        ]
 
-        if let country = country {
+        if let country {
             components.queryItems!.append(country)
         }
 

Sources/MasKit/Errors/MASError.swift

@@ -1,5 +1,5 @@
 //
-//  MAError.swift
+//  MASError.swift
 //  mas-cli
 //
 //  Created by Andrew Naylor on 21/08/2015.
@@ -47,7 +47,7 @@ extension MASError: CustomStringConvertible {
                 """
 
         case .signInFailed(let error):
-            if let error = error {
+            if let error {
                 return "Sign in failed: \(error.localizedDescription)"
             } else {
                 return "Sign in failed"
@@ -57,14 +57,14 @@ extension MASError: CustomStringConvertible {
             return "Already signed in"
 
         case .purchaseFailed(let error):
-            if let error = error {
+            if let error {
                 return "Download request failed: \(error.localizedDescription)"
             } else {
                 return "Download request failed"
             }
 
         case .downloadFailed(let error):
-            if let error = error {
+            if let error {
                 return "Download failed: \(error.localizedDescription)"
             } else {
                 return "Download failed"

Sources/MasKit/Formatters/AppInfoFormatter.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// Formats text output for the info command.
-struct AppInfoFormatter {
+enum AppInfoFormatter {
     /// Formats text output with app info.
     ///
     /// - Parameter app: Search result with app data.

Sources/MasKit/Formatters/AppListFormatter.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// Formats text output for the search command.
-struct AppListFormatter {
+enum AppListFormatter {
     static let idColumnMinWidth = 10
     static let nameColumnMinWidth = 50
 

Sources/MasKit/Formatters/SearchResultFormatter.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// Formats text output for the search command.
-struct SearchResultFormatter {
+enum SearchResultFormatter {
     /// Formats text output with search results.
     ///
     /// - Parameter results: Search results with app data

Sources/MasKit/Formatters/Utilities.swift

@@ -43,12 +43,12 @@ let csi = "\u{001B}["
         Swift.print(terminator, terminator: "")
     }
 
-    func print<Target>(
+    func print(
         _ items: Any...,
         separator: String = " ",
         terminator: String = "\n",
-        to output: inout Target
-    ) where Target: TextOutputStream {
+        to output: inout some TextOutputStream
+    ) {
         if let observer = printObserver {
             let output =
                 items

Sources/MasKit/Network/URLSession+NetworkSession.swift

@@ -13,9 +13,9 @@ extension URLSession: NetworkSession {
     public func loadData(from url: URL) -> Promise<Data> {
         Promise { seal in
             dataTask(with: url) { data, _, error in
-                if let data = data {
+                if let data {
                     seal.fulfill(data)
-                } else if let error = error {
+                } else if let error {
                     seal.reject(error)
                 } else {
                     seal.reject(MASError.noData)

Tests/MasKitTests/Network/NetworkSessionMock.swift

@@ -24,7 +24,7 @@ class NetworkSessionMock: NetworkSession {
     ///   - url: unused
     ///   - completionHandler: Closure which is delivered either data or an error.
     func loadData(from _: URL) -> Promise<Data> {
-        guard let data = data else {
+        guard let data else {
             return Promise(error: error ?? MASError.noData)
         }
 

Tests/MasKitTests/Nimble/ResultPredicates.swift

@@ -1,5 +1,5 @@
 //
-//  ResultPreticates.swift
+//  ResultPredicates.swift
 //  MasKitTests
 //
 //  Created by Ben Chatelain on 12/27/18.