mirror
/
Cork
mirror of https://github.com/buresdv/Cork
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #433 from Brandawg93/main 

Fix self compilation of Xcode 16 beta
This commit is contained in:
David Bureš 2025-03-29 18:01:50 +01:00 committed by GitHub
parent d36570d2d7 93386c2385
commit caa3db37b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cork/CorkApp.swift
View File

@ -166,18 +166,18 @@ struct CorkApp: App
AppConstants.shared.logger.log("Scheduled event fired at \(Date(), privacy: .auto)") AppConstants.shared.logger.log("Scheduled event fired at \(Date(), privacy: .auto)")
Task Task
{ { @MainActor in
var updateResult: TerminalOutput = await shell(AppConstants.shared.brewExecutablePath, ["update"]) var updateResult: TerminalOutput = await shell(AppConstants.shared.brewExecutablePath, ["update"])
AppConstants.shared.logger.debug("Update result:\nStandard output: \(updateResult.standardOutput, privacy: .public)\nStandard error: \(updateResult.standardError, privacy: .public)") AppConstants.shared.logger.debug("Update result:\nStandard output: \(updateResult.standardOutput, privacy: .public)\nStandard error: \(updateResult.standardError, privacy: .public)")
do do
{ {
let temporaryOutdatedPackageTracker: OutdatedPackageTracker = await .init() let temporaryOutdatedPackageTracker: OutdatedPackageTracker = .init()
try await temporaryOutdatedPackageTracker.getOutdatedPackages(brewData: brewData) try await temporaryOutdatedPackageTracker.getOutdatedPackages(brewData: brewData)
var newOutdatedPackages: Set<OutdatedPackage> = await temporaryOutdatedPackageTracker.outdatedPackages var newOutdatedPackages: Set<OutdatedPackage> = temporaryOutdatedPackageTracker.outdatedPackages
AppConstants.shared.logger.debug("Outdated packages checker output: \(newOutdatedPackages, privacy: .public)") AppConstants.shared.logger.debug("Outdated packages checker output: \(newOutdatedPackages, privacy: .public)")
@ -189,19 +189,19 @@ struct CorkApp: App
newOutdatedPackages = .init() newOutdatedPackages = .init()
} }
if await newOutdatedPackages.count > outdatedPackageTracker.outdatedPackages.count if newOutdatedPackages.count > outdatedPackageTracker.outdatedPackages.count
{ {
AppConstants.shared.logger.log("New updates found") AppConstants.shared.logger.log("New updates found")
/// Set this to `true` so the normal notification doesn't get sent /// Set this to `true` so the normal notification doesn't get sent
await setWhetherToSendStandardUpdatesAvailableNotification(to: false) setWhetherToSendStandardUpdatesAvailableNotification(to: false)
let differentPackages: Set<OutdatedPackage> = await newOutdatedPackages.subtracting(outdatedPackageTracker.displayableOutdatedPackages) let differentPackages: Set<OutdatedPackage> = newOutdatedPackages.subtracting(outdatedPackageTracker.displayableOutdatedPackages)
AppConstants.shared.logger.debug("Changed packages: \(differentPackages, privacy: .auto)") AppConstants.shared.logger.debug("Changed packages: \(differentPackages, privacy: .auto)")
sendNotification(title: String(localized: "notification.new-outdated-packages-found.title"), subtitle: differentPackages.map(\.package.name).formatted(.list(type: .and))) sendNotification(title: String(localized: "notification.new-outdated-packages-found.title"), subtitle: differentPackages.map(\.package.name).formatted(.list(type: .and)))
await outdatedPackageTracker.setOutdatedPackages(to: newOutdatedPackages) outdatedPackageTracker.setOutdatedPackages(to: newOutdatedPackages)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) DispatchQueue.main.asyncAfter(deadline: .now() + 1)
{ {