Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# .swiftformat
# mas
#
# SwiftFormat 0.56.1
# SwiftFormat 0.56.2
#

# Disabled rules
Expand Down
4 changes: 2 additions & 2 deletions Scripts/format
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

print_header '🧹 Formatting mas' "$(Scripts/version)"

for formatter in markdownlint-cli2 swiftformat swiftlint yamllint; do
for formatter in markdownlint-cli2 swiftformat swiftlint; do
if ! whence "${formatter}" >/dev/null; then
printf $'error: %s is not installed. Run \'Scripts/bootstrap\' or \'brew install %s\'.\n' "${formatter}" "${formatter}" >&2
exit 1
Expand All @@ -24,7 +24,7 @@ for source in Package.swift Sources Tests; do
script -q /dev/null swiftformat --strict "${source}" |
(grep -vxE '(?:\^D\x08{2})?Running SwiftFormat\.{3}\r|Reading (?:config|swift-version) file at .*|\x1b\[32mSwiftFormat completed in \d+(?:\.\d+)?s\.\x1b\[0m\r|0/\d+ files formatted\.\r' || true)
printf -- $'--> 🦅 %s swiftlint\n' "${source}"
swiftlint --fix --quiet "${source}"
swiftlint --fix --quiet --reporter relative-path "${source}"
done

printf -- $'--> 〽️ Markdown\n'
Expand Down
2 changes: 1 addition & 1 deletion Scripts/lint
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ for source in Package.swift Sources Tests; do
(grep -vxE '(?:\^D\x08{2})?Running SwiftFormat\.{3}\r|\(lint mode - no files will be changed\.\)\r|Reading (?:config|swift-version) file at .*|\x1b\[32mSwiftFormat completed in \d+(?:\.\d+)?s\.\x1b\[0m\r|0/\d+ files require formatting\.\r|Source input did not pass lint check\.\r' || true)
((exit_code |= ${?}))
printf -- $'--> 🦅 %s swiftlint\n' "${source}"
swiftlint --strict --quiet "${source}"
swiftlint --strict --quiet --reporter relative-path "${source}"
((exit_code |= ${?}))
done

Expand Down
6 changes: 3 additions & 3 deletions Sources/mas/AppStore/PurchaseDownloadObserver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ private extension SSDownloadPhase {
}

extension PurchaseDownloadObserver {
func observeDownloadQueue(_ downloadQueue: CKDownloadQueue = .shared()) async throws {
let observerID = downloadQueue.add(self)
func observeDownloadQueue(_ queue: CKDownloadQueue = .shared()) async throws {
let observerID = queue.add(self)
defer {
downloadQueue.remove(observerID)
queue.remove(observerID)
}

try await withCheckedThrowingContinuation { continuation in
Expand Down