From e1a97672b5cd6cc7df59567055cbf84b3f4e7097 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sun, 28 Nov 2021 15:11:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Bump=20build,=20reorganize=20fil?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 8 ++++---- phpmon/Domain/{Core => Helpers}/HomebrewDiagnostics.swift | 4 ++-- phpmon/Domain/Helpers/HomebrewPackage.swift | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename phpmon/Domain/{Core => Helpers}/HomebrewDiagnostics.swift (95%) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index d2a4259..97615de 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -179,8 +179,8 @@ 54B20EDF263AA22C00D3250E /* PHP */ = { isa = PBXGroup; children = ( - C4F2E4392752F7D00020E974 /* PhpInstallation.swift */, C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */, + C4F2E4392752F7D00020E974 /* PhpInstallation.swift */, C4ACA38E25C754C100060C66 /* PhpExtension.swift */, ); path = PHP; @@ -274,6 +274,7 @@ C476FF9722B0DD830098105B /* Alert.swift */, C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */, C474B00524C0E98C00066A22 /* LocalNotification.swift */, + C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */, C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */, ); path = Helpers; @@ -286,7 +287,6 @@ C4811D2322D70A4700B5F6B3 /* App.swift */, C4D8016522B1584700C6DA1B /* Startup.swift */, C41C1B4C22B0215A00E7CF16 /* Actions.swift */, - C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */, ); path = Core; sourceTree = ""; @@ -659,7 +659,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 70; + CURRENT_PROJECT_VERSION = 80; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -683,7 +683,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 70; + CURRENT_PROJECT_VERSION = 80; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; diff --git a/phpmon/Domain/Core/HomebrewDiagnostics.swift b/phpmon/Domain/Helpers/HomebrewDiagnostics.swift similarity index 95% rename from phpmon/Domain/Core/HomebrewDiagnostics.swift rename to phpmon/Domain/Helpers/HomebrewDiagnostics.swift index f762180..7c14556 100644 --- a/phpmon/Domain/Core/HomebrewDiagnostics.swift +++ b/phpmon/Domain/Helpers/HomebrewDiagnostics.swift @@ -12,7 +12,6 @@ class HomebrewDiagnostics { enum Errors: String { case aliasConflict = "alias_conflict" - case installationMismatch = "installation_mismatch" } static let shared = HomebrewDiagnostics() @@ -63,7 +62,8 @@ class HomebrewDiagnostics { return bothInstalled } - print("All seems to be OK. No conflicts.") + print("All seems to be OK. No conflicts, both are PHP \(tapPhp.version).") + return false } } diff --git a/phpmon/Domain/Helpers/HomebrewPackage.swift b/phpmon/Domain/Helpers/HomebrewPackage.swift index 29e5c29..3b2ea9b 100644 --- a/phpmon/Domain/Helpers/HomebrewPackage.swift +++ b/phpmon/Domain/Helpers/HomebrewPackage.swift @@ -13,7 +13,7 @@ struct HomebrewPackage: Decodable { let full_name: String let aliases: [String] let installed: [HomebrewInstalled] - let linked_keg: String + let linked_keg: String? public var version: String { return aliases.first!.replacingOccurrences(of: "php@", with: "")