1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 12:00:09 +02:00

🔧 Bump build, reorganize files

This commit is contained in:
2021-11-28 15:11:00 +01:00
parent 493b5945f9
commit e1a97672b5
3 changed files with 7 additions and 7 deletions

View File

@ -179,8 +179,8 @@
54B20EDF263AA22C00D3250E /* PHP */ = { 54B20EDF263AA22C00D3250E /* PHP */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C4F2E4392752F7D00020E974 /* PhpInstallation.swift */,
C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */, C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */,
C4F2E4392752F7D00020E974 /* PhpInstallation.swift */,
C4ACA38E25C754C100060C66 /* PhpExtension.swift */, C4ACA38E25C754C100060C66 /* PhpExtension.swift */,
); );
path = PHP; path = PHP;
@ -274,6 +274,7 @@
C476FF9722B0DD830098105B /* Alert.swift */, C476FF9722B0DD830098105B /* Alert.swift */,
C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */, C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
C474B00524C0E98C00066A22 /* LocalNotification.swift */, C474B00524C0E98C00066A22 /* LocalNotification.swift */,
C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */,
C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */, C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */,
); );
path = Helpers; path = Helpers;
@ -286,7 +287,6 @@
C4811D2322D70A4700B5F6B3 /* App.swift */, C4811D2322D70A4700B5F6B3 /* App.swift */,
C4D8016522B1584700C6DA1B /* Startup.swift */, C4D8016522B1584700C6DA1B /* Startup.swift */,
C41C1B4C22B0215A00E7CF16 /* Actions.swift */, C41C1B4C22B0215A00E7CF16 /* Actions.swift */,
C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */,
); );
path = Core; path = Core;
sourceTree = "<group>"; sourceTree = "<group>";
@ -659,7 +659,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 70; CURRENT_PROJECT_VERSION = 80;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;
@ -683,7 +683,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 70; CURRENT_PROJECT_VERSION = 80;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;

View File

@ -12,7 +12,6 @@ class HomebrewDiagnostics {
enum Errors: String { enum Errors: String {
case aliasConflict = "alias_conflict" case aliasConflict = "alias_conflict"
case installationMismatch = "installation_mismatch"
} }
static let shared = HomebrewDiagnostics() static let shared = HomebrewDiagnostics()
@ -63,7 +62,8 @@ class HomebrewDiagnostics {
return bothInstalled 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 return false
} }
} }

View File

@ -13,7 +13,7 @@ struct HomebrewPackage: Decodable {
let full_name: String let full_name: String
let aliases: [String] let aliases: [String]
let installed: [HomebrewInstalled] let installed: [HomebrewInstalled]
let linked_keg: String let linked_keg: String?
public var version: String { public var version: String {
return aliases.first!.replacingOccurrences(of: "php@", with: "") return aliases.first!.replacingOccurrences(of: "php@", with: "")