From b3b4cb2c0d461eb48f7ebce664eef76e72ee8f1a Mon Sep 17 00:00:00 2001 From: Elliot Jordan Date: Tue, 21 Jan 2020 00:34:39 -0800 Subject: [PATCH 01/13] RECIPE_OVERRIDE_DIRS is an array of strings, not a string --- AutoPkgr/Utility/LGDefaults.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoPkgr/Utility/LGDefaults.m b/AutoPkgr/Utility/LGDefaults.m index cd96beb1..65de3980 100644 --- a/AutoPkgr/Utility/LGDefaults.m +++ b/AutoPkgr/Utility/LGDefaults.m @@ -231,12 +231,12 @@ - (void)setAutoPkgCacheDir:(NSString *)autoPkgCacheDir } #pragma mark -- (NSString *)autoPkgRecipeOverridesDir +- (NSArray *)autoPkgRecipeOverridesDir { return [self autoPkgDomainObject:@"RECIPE_OVERRIDE_DIRS"]; } -- (void)setAutoPkgRecipeOverridesDir:(NSString *)autoPkgRecipeOverridesDir +- (void)setAutoPkgRecipeOverridesDir:(NSArray *)autoPkgRecipeOverridesDir { [self setAutoPkgDomainObject:autoPkgRecipeOverridesDir forKey:@"RECIPE_OVERRIDE_DIRS"]; } From 824253c0947f4e6b81f9f4c2bc706a049b86fa9e Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 28 Jan 2020 13:33:19 -0800 Subject: [PATCH 02/13] Bumped version to 1.5.3 Bumped version to 1.5.3 --- AutoPkgr/Supporting Files/AutoPkgr-Info.plist | 2 +- Privileged Helper/helper-Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist index b56b7d3f..135951af 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.2 + 1.5.3 CFBundleSignature ???? CFBundleVersion diff --git a/Privileged Helper/helper-Info.plist b/Privileged Helper/helper-Info.plist index 1f622fae..75b63fe2 100644 --- a/Privileged Helper/helper-Info.plist +++ b/Privileged Helper/helper-Info.plist @@ -9,7 +9,7 @@ CFBundleName com.lindegroup.AutoPkgr.helper CFBundleShortVersionString - 1.5.2 + 1.5.3 CFBundleVersion 1415 SMAuthorizedClients From 255ece716c69a2a69e26739a89beeedd931f1ecd Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 25 Feb 2020 15:36:58 -0800 Subject: [PATCH 03/13] Update Podfile.lock --- Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 91b32f6b..b0c8eecf 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -46,7 +46,7 @@ DEPENDENCIES: - XMLDictionary (~> 1.4) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - ACEView - AFNetworking - AHKeychain @@ -86,4 +86,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ad3ce1802e4cf005faff45f6d018d73534c50749 -COCOAPODS: 1.7.1 +COCOAPODS: 1.8.4 From 5258bc0b22a7228b2425ef78f13c739627c14456 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 25 Feb 2020 15:37:28 -0800 Subject: [PATCH 04/13] Update workspace checks --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 AutoPkgr.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 AutoPkgr.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/AutoPkgr.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AutoPkgr.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/AutoPkgr.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/AutoPkgr.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AutoPkgr.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/AutoPkgr.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From d94c9c7bf1fbaec51c851cb4f134d561ee88359d Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 25 Feb 2020 15:44:19 -0800 Subject: [PATCH 05/13] Updated to Xcode recommended settings --- AutoPkgr.xcodeproj/project.pbxproj | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index 896c9a97..8fbe1438 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -1386,7 +1386,7 @@ attributes = { CLASSPREFIX = LG; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1130; ORGANIZATIONNAME = "The Linde Group, Inc."; TargetAttributes = { 1AC6954C195B59ED00D2BD81 = { @@ -1406,7 +1406,7 @@ }; buildConfigurationList = 1AC69548195B59ED00D2BD81 /* Build configuration list for PBXProject "AutoPkgr" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -2381,7 +2381,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PROJECT_DIR}/scripts/helper-tool-codesign-config.py\""; + shellScript = "\"${PROJECT_DIR}/scripts/helper-tool-codesign-config.py\"\n"; }; BECFF2B619CA9854004C2721 /* Run Script: Set build number to commit count */ = { isa = PBXShellScriptBuildPhase; @@ -2961,14 +2961,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -3012,14 +3020,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -3056,6 +3072,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = JVY2ZR6SEF; + ENABLE_HARDENED_RUNTIME = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch"; INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist"; @@ -3117,6 +3134,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = JVY2ZR6SEF; + ENABLE_HARDENED_RUNTIME = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch"; @@ -3232,6 +3250,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; DEVELOPMENT_TEAM = JVY2ZR6SEF; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREFIX_HEADER = "Privileged Helper/Supporting Files/helper-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3272,6 +3291,7 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.lindegroup.AutoPkgr.helper; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -3284,6 +3304,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; DEVELOPMENT_TEAM = JVY2ZR6SEF; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_PREFIX_HEADER = "Privileged Helper/Supporting Files/helper-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3324,6 +3345,7 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.lindegroup.AutoPkgr.helper; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; From 9436fb8fa3f090c26cf6fa98c8870a871d84bbb1 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 25 Feb 2020 15:44:41 -0800 Subject: [PATCH 06/13] Method definition for updateTrustInfo --- AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m index e904ea07..c8730fa0 100644 --- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m +++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m @@ -1024,6 +1024,11 @@ + (void)makeOverride:(NSString *)recipe name:(NSString *)name reply:(void (^)(NS } + (void)updateTrustInfo:(NSString *)recipe reply:(void (^)(NSString *, NSError *))reply +{ + [[self class] updateTrustInfo:recipe name:nil reply:reply]; +} + ++ (void)updateTrustInfo:(NSString *)recipe name:(NSString *)name reply:(void (^)(NSString *, NSError *))reply { LGAutoPkgTask *task = [[LGAutoPkgTask alloc] init]; NSMutableArray *args = [@[ @"update-trust-info", recipe ] mutableCopy]; From 1119e1754387b82cd5f81bfa9696fb252d5130b8 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Wed, 11 Mar 2020 14:46:52 -0700 Subject: [PATCH 07/13] Updates to semantic color e.g. NSColor controlTextColor, systemRedColor, etc. --- AutoPkgr/Utility/AHHelpPopover.m | 8 ++++++-- .../Integration Views/LGAutoPkgIntegrationView.m | 13 ++++++++++--- .../Panels-Popovers/LGRecipeInfoView.m | 9 ++++++--- .../Tab Views/LGIntegrationsViewController.m | 4 ++-- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/AutoPkgr/Utility/AHHelpPopover.m b/AutoPkgr/Utility/AHHelpPopover.m index 083412aa..3dee6958 100644 --- a/AutoPkgr/Utility/AHHelpPopover.m +++ b/AutoPkgr/Utility/AHHelpPopover.m @@ -143,6 +143,7 @@ - (void)openPopover NSDictionary *attributes = @{ NSFontAttributeName : _helpTitleFont, + NSForegroundColorAttributeName : NSColor.controlTextColor, }; NSAttributedString *title = [[NSAttributedString alloc] initWithString:[_helpTitle stringByAppendingString:@"\n\n"] @@ -177,6 +178,7 @@ - (void)openPopover NSTextView *helpTextView = [[NSTextView alloc] initWithFrame:viewFrame]; helpTextView.editable = NO; helpTextView.backgroundColor = [NSColor clearColor]; + helpTextView.textColor = [NSColor controlTextColor]; helpTextView.alignment = _textAlignment; [helpTextView.textStorage setAttributedString:textStorage]; @@ -246,7 +248,9 @@ - (NSAttributedString *)attributedHelpText { if (!_attributedHelpText && _helpText) { _attributedHelpText = [[NSAttributedString alloc] initWithString:_helpText - attributes:@{ NSFontAttributeName : _helpTextFont }]; + attributes:@{ NSFontAttributeName : _helpTextFont, + NSForegroundColorAttributeName : NSColor.controlTextColor, + }]; } return _attributedHelpText; } @@ -353,4 +357,4 @@ - (NSString *)localizedStringValueForIvar:(NSString *)iVar return iVar; } -@end \ No newline at end of file +@end diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/LGAutoPkgIntegrationView.m b/AutoPkgr/Views-Controllers-XIB/Integration Views/LGAutoPkgIntegrationView.m index 68cbe16c..fb475fdc 100644 --- a/AutoPkgr/Views-Controllers-XIB/Integration Views/LGAutoPkgIntegrationView.m +++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/LGAutoPkgIntegrationView.m @@ -99,6 +99,7 @@ - (IBAction)generateAPIToken:(NSButton *)sender { sender.enabled = NO; sender.title = NSLocalizedString(@"Requesting Token", @"The button title when requesting a GitHub API Token"); + [LGAutoPkgTask generateGitHubAPIToken:_apiUsernameTF.stringValue password:_apiPasswordTF.stringValue reply:^(NSError *error) { sender.enabled = YES; if (error) { @@ -139,16 +140,22 @@ - (IBAction)showTokenHelpInfo:(NSButton *)sender NSString *message = NSLocalizedString(@"helpInfoAutoPkgAPIToken", @"message presented to user with info about generating GitHub API token"); - + NSMutableAttributedString *attributedHelpText = [NSString stringWithFormat:message, settingsLink, tokenFile].attributed_mutableCopy; - + + NSColor *color = [NSColor controlTextColor]; + NSString *string = [NSString stringWithFormat:message, settingsLink, tokenFile]; + NSDictionary *attrs = @{ NSForegroundColorAttributeName : color }; + NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:string attributes:attrs]; + attributedHelpText = attrStr; + [attributedHelpText attributed_makeStringALink:settingsLink]; [attributedHelpText attributed_makeString:@"developer.github.com" linkTo:@"https://developer.github.com/v3/oauth/"]; AHHelpPopover *popover = [[AHHelpPopover alloc] initWithSender:_apiInfoHelpBT]; popover.attributedHelpText = attributedHelpText; popover.helpTitle = @"Creating a GitHub API token"; - + sender.enabled = NO; [popover openPopoverWithCompletionHandler:^{ sender.enabled = YES; diff --git a/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/LGRecipeInfoView.m b/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/LGRecipeInfoView.m index 5c89ac70..871f93e3 100644 --- a/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/LGRecipeInfoView.m +++ b/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/LGRecipeInfoView.m @@ -51,11 +51,14 @@ - (void)awakeFromNib /* Since the recipe description can be rather long, we use * we're using a textView with scrolling capabilities */ _descriptionTextView.backgroundColor = [NSColor clearColor]; + _descriptionTextView.textColor = [NSColor controlTextColor]; - NSMutableDictionary *attrs = @{ NSFontAttributeName : [NSFont systemFontOfSize:11.0] }.mutableCopy; + NSMutableDictionary *attrs = @{ NSFontAttributeName : [NSFont systemFontOfSize:11.0], + NSForegroundColorAttributeName : NSColor.controlTextColor, + }.mutableCopy; NSString *description = _recipe.Description; if (!description) { - [attrs setObject:[NSColor grayColor] forKey:NSForegroundColorAttributeName]; + [attrs setObject:[NSColor controlTextColor] forKey:NSForegroundColorAttributeName]; description = @""; } NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:description @@ -68,7 +71,7 @@ - (void)awakeFromNib _parentRecipesTF.safe_stringValue = [_recipe.ParentRecipes componentsJoinedByString:@"\n"]; if (_recipe.isMissingParent) { - _parentRecipesTF.textColor = [NSColor redColor]; + _parentRecipesTF.textColor = [NSColor systemRedColor]; } _minimumVersionTF.safe_stringValue = _recipe.MinimumVersion; diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/LGIntegrationsViewController.m b/AutoPkgr/Views-Controllers-XIB/Tab Views/LGIntegrationsViewController.m index 0e0ed1b3..a5120b6d 100644 --- a/AutoPkgr/Views-Controllers-XIB/Tab Views/LGIntegrationsViewController.m +++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/LGIntegrationsViewController.m @@ -250,13 +250,13 @@ - (IBAction)saveAutoPkgFolderPath:(NSTextField *)sender BOOL isDir; BOOL success = NO; if (path.length && ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir] && isDir)) { - [sender setTextColor:[NSColor blackColor]]; + [sender setTextColor:[NSColor controlTextColor]]; sender.stringValue = path.stringByAbbreviatingWithTildeInPath; success = YES; } else { // possibly present error. - [sender setTextColor:[NSColor redColor]]; + [sender setTextColor:[NSColor systemRedColor]]; } return success; }; From 8bdf9ae7ba8acd530016ab12a1f1be3bff4b8644 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 21 Apr 2020 11:21:01 -0700 Subject: [PATCH 08/13] Updates to semantic color in credits Removed `NSURL` in integration credits, to allow use of semantic color, updated names, removed dates. Also, ensured that autopkgr_slack.png was present in Resources. --- AutoPkgr.xcodeproj/project.pbxproj | 4 ++++ .../Models/Integrations/LGAbsoluteManageIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGFileWaveIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGGitIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGLANrevIntegration.m | 7 +------ AutoPkgr/Models/Integrations/LGMacPatchIntegration.m | 9 ++------- AutoPkgr/Models/Integrations/LGMunkiIntegration.m | 7 +------ .../Integrations/LGVirusTotalAnalyzerIntegration.m | 7 +------ 10 files changed, 14 insertions(+), 55 deletions(-) diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index 8fbe1438..8400d306 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 1AC98427195DF6350071CAB3 /* autopkgr.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC98425195DF6350071CAB3 /* autopkgr.png */; }; 1AC98429195DF6DE0071CAB3 /* autopkgr_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */; }; 21041CE6D520C363DBECB902 /* libPods-com.lindegroup.AutoPkgr.helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62DA66B263080B115E0C6E12 /* libPods-com.lindegroup.AutoPkgr.helper.a */; }; + 291B96B42420162900C446C2 /* autopkgr_slack.png in Resources */ = {isa = PBXBuildFile; fileRef = 291B96B32420162900C446C2 /* autopkgr_slack.png */; }; 5EF53CBDA5C7106F3847E9FD /* libPods-AutoPkgrTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B419CA189BE572FD31F74E0 /* libPods-AutoPkgrTests.a */; }; 6A53625D1988BE59008A949C /* LGTestPort.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A53625C1988BE59008A949C /* LGTestPort.m */; }; 8B1AF8521BED81440013BE37 /* LGFileWaveIntegrationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B1AF8501BED81440013BE37 /* LGFileWaveIntegrationView.m */; }; @@ -309,6 +310,7 @@ 1AC9841E195CEC360071CAB3 /* LGConfigurationWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LGConfigurationWindowController.xib; sourceTree = ""; }; 1AC98425195DF6350071CAB3 /* autopkgr.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr.png; sourceTree = ""; }; 1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr_alt.png; sourceTree = ""; }; + 291B96B32420162900C446C2 /* autopkgr_slack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr_slack.png; sourceTree = ""; }; 2C6986FE5B41226735CC0A32 /* Pods-AutoPkgr.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgr.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgr/Pods-AutoPkgr.debug.xcconfig"; sourceTree = ""; }; 39CF6FA5E75D62254A994C22 /* libPods-AutoPkgr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AutoPkgr.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 45E6F02919946C3F73535515 /* Pods-AutoPkgrTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgrTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgrTests/Pods-AutoPkgrTests.release.xcconfig"; sourceTree = ""; }; @@ -831,6 +833,7 @@ 1A2C7FAC19CC9F8300CFF472 /* scripts */, 8BB217F519709A2C00EF8B93 /* AutoPkgrIcon.png */, 1AC98425195DF6350071CAB3 /* autopkgr.png */, + 291B96B32420162900C446C2 /* autopkgr_slack.png */, 1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */, BED388291A85E2C100DA8970 /* autopkgr_error.png */, ); @@ -1472,6 +1475,7 @@ BE7EF2431B3381A7002037B1 /* LocalizableHelpPopover.strings in Resources */, 8B8654C11CF669A100B0A3FD /* LGVirusTotalAnalyzerIntegrationView.xib in Resources */, BEC2024B1B600FF100F3BC2A /* LocalizableJSSImporter.strings in Resources */, + 291B96B42420162900C446C2 /* autopkgr_slack.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/AutoPkgr/Models/Integrations/LGAbsoluteManageIntegration.m b/AutoPkgr/Models/Integrations/LGAbsoluteManageIntegration.m index fd17234f..05e00d11 100644 --- a/AutoPkgr/Models/Integrations/LGAbsoluteManageIntegration.m +++ b/AutoPkgr/Models/Integrations/LGAbsoluteManageIntegration.m @@ -43,12 +43,7 @@ + (NSString *)shortName } + (NSString *)credits { - return @"Copyright 2016 Thomas Burgin\nhttp://www.apache.org/licenses/LICENSE-2.0"; -} - -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/tburgin/AbsoluteManageExport"]; + return @"Thomas Burgin\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/tburgin/AbsoluteManageExport"; } + (NSString *)gitHubURL diff --git a/AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m b/AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m index 7cd922f9..0fba5d3f 100644 --- a/AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m +++ b/AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m @@ -35,12 +35,7 @@ + (NSString *)name + (NSString *)credits { - return @"Greg Neagle, Tim Sutton, Per Olofsson\nhttp://www.apache.org/licenses/LICENSE-2.0"; -} - -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"http://autopkg.github.io/autopkg/"]; + return @"Greg Neagle, Tim Sutton, Per Olofsson, Nick McSpadden, Elliot Jordan\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/autopkg/autopkg"; } + (NSArray *)components diff --git a/AutoPkgr/Models/Integrations/LGFileWaveIntegration.m b/AutoPkgr/Models/Integrations/LGFileWaveIntegration.m index b2611cef..2d25bc3e 100644 --- a/AutoPkgr/Models/Integrations/LGFileWaveIntegration.m +++ b/AutoPkgr/Models/Integrations/LGFileWaveIntegration.m @@ -33,7 +33,7 @@ + (NSString *)name + (NSString *)credits { - return @"Copyright 2015 FileWave (Europe) GmbH\nhttp://www.apache.org/licenses/LICENSE-2.0"; + return @"FileWave (Europe) GmbH\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/autopkg/filewave"; } + (NSString *)defaultRepository @@ -41,11 +41,6 @@ + (NSString *)defaultRepository return @"https://github.com/autopkg/filewave.git"; } -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/autopkg/filewave"]; -} - + (BOOL)isUninstallable { return YES; diff --git a/AutoPkgr/Models/Integrations/LGGitIntegration.m b/AutoPkgr/Models/Integrations/LGGitIntegration.m index 8cb6ad52..301fe916 100644 --- a/AutoPkgr/Models/Integrations/LGGitIntegration.m +++ b/AutoPkgr/Models/Integrations/LGGitIntegration.m @@ -60,12 +60,7 @@ + (NSString *)name + (NSString *)credits { - return @"The GNU General Public License (GPL-2.0)"; -} - -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://git-scm.com"]; + return @"The GNU General Public License (GPL-2.0)\nhttps://git-scm.com"; } + (NSArray *)components diff --git a/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m b/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m index 93712354..eb019b0a 100644 --- a/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m +++ b/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m @@ -34,14 +34,9 @@ + (NSString *)name return @"JSSImporter"; } -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/jssimporter/JSSImporter"]; -} - + (NSString *)credits { - return @"Copyright 2014, 2019 Shea Craig and Graham Pugh\nhttp://www.apache.org/licenses/LICENSE-2.0"; + return @"Shea Craig, Mosen, Graham Pugh\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/jssimporter/JSSImporter"; } + (NSString *)gitHubURL diff --git a/AutoPkgr/Models/Integrations/LGLANrevIntegration.m b/AutoPkgr/Models/Integrations/LGLANrevIntegration.m index f2145e06..ac3077ae 100644 --- a/AutoPkgr/Models/Integrations/LGLANrevIntegration.m +++ b/AutoPkgr/Models/Integrations/LGLANrevIntegration.m @@ -43,12 +43,7 @@ + (NSString *)shortName } + (NSString *)credits { - return @"Copyright 2016 Jeremy Baker\nhttp://www.apache.org/licenses/LICENSE-2.0"; -} - -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/jbaker10/LANrevImporter"]; + return @"Jeremy Baker\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/jbaker10/LANrevImporter"; } + (NSString *)gitHubURL diff --git a/AutoPkgr/Models/Integrations/LGMacPatchIntegration.m b/AutoPkgr/Models/Integrations/LGMacPatchIntegration.m index a771be2b..e811fc32 100644 --- a/AutoPkgr/Models/Integrations/LGMacPatchIntegration.m +++ b/AutoPkgr/Models/Integrations/LGMacPatchIntegration.m @@ -27,7 +27,7 @@ + (NSString *)name + (NSString *)credits { - return @"LLNL Mac Development\nGNU GENERAL PUBLIC LICENSE Version 2"; + return @"LLNL Mac Development\nThe GNU General Public License (GPL-2.0)\nhttps://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG"; } + (NSArray *)components @@ -40,11 +40,6 @@ + (NSString *)defaultRepository return @"https://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG.git"; } -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG"]; -} - + (BOOL)isUninstallable { return YES; @@ -113,4 +108,4 @@ - (void)setMP_SSL_VERIFY:(BOOL)MP_SSL_VERIFY [self setAutoPkgDomainObject:@(MP_SSL_VERIFY) forKey:NSStringFromSelector(@selector(MP_SSL_VERIFY))]; } -@end \ No newline at end of file +@end diff --git a/AutoPkgr/Models/Integrations/LGMunkiIntegration.m b/AutoPkgr/Models/Integrations/LGMunkiIntegration.m index f1695875..e1e1af5a 100644 --- a/AutoPkgr/Models/Integrations/LGMunkiIntegration.m +++ b/AutoPkgr/Models/Integrations/LGMunkiIntegration.m @@ -40,7 +40,7 @@ + (NSString *)name + (NSString *)credits { - return @"Copyright 2008-2014 Greg Neagle.\nhttp://www.apache.org/licenses/LICENSE-2.0"; + return @"Greg Neagle\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/munki/munki"; } + (NSString *)gitHubURL @@ -48,11 +48,6 @@ + (NSString *)gitHubURL return @"https://api.github.com/repos/munki/munki/releases"; } -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://www.munki.org/"]; -} - + (NSString *)defaultRepository { return @"https://github.com/autopkg/recipes.git"; diff --git a/AutoPkgr/Models/Integrations/LGVirusTotalAnalyzerIntegration.m b/AutoPkgr/Models/Integrations/LGVirusTotalAnalyzerIntegration.m index d9fea5d9..0f01d0f3 100644 --- a/AutoPkgr/Models/Integrations/LGVirusTotalAnalyzerIntegration.m +++ b/AutoPkgr/Models/Integrations/LGVirusTotalAnalyzerIntegration.m @@ -28,7 +28,7 @@ + (NSString *)name + (NSString *)credits { - return @"Copyright 2016 Hannes Juutilainen\nApache License Version 2.0"; + return @"Hannes Juutilainen\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/hjuutilainen/autopkg-virustotalanalyzer"; } + (NSArray *)components @@ -41,11 +41,6 @@ + (NSString *)defaultRepository return @"https://github.com/hjuutilainen/autopkg-virustotalanalyzer.git"; } -+ (NSURL *)homePage -{ - return [NSURL URLWithString:@"https://github.com/hjuutilainen/autopkg-virustotalanalyzer"]; -} - + (BOOL)isUninstallable { return YES; From 092230f8ba017e6b0a0c274bfe590340bfe1057b Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Wed, 22 Apr 2020 16:07:35 -0700 Subject: [PATCH 09/13] Revert to NSString RECIPE_OVERRIDE_DIRS should be a string, not an array of strings. Multiple override dirs are not common at this time. --- AutoPkgr/Utility/LGDefaults.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoPkgr/Utility/LGDefaults.m b/AutoPkgr/Utility/LGDefaults.m index 65de3980..cd96beb1 100644 --- a/AutoPkgr/Utility/LGDefaults.m +++ b/AutoPkgr/Utility/LGDefaults.m @@ -231,12 +231,12 @@ - (void)setAutoPkgCacheDir:(NSString *)autoPkgCacheDir } #pragma mark -- (NSArray *)autoPkgRecipeOverridesDir +- (NSString *)autoPkgRecipeOverridesDir { return [self autoPkgDomainObject:@"RECIPE_OVERRIDE_DIRS"]; } -- (void)setAutoPkgRecipeOverridesDir:(NSArray *)autoPkgRecipeOverridesDir +- (void)setAutoPkgRecipeOverridesDir:(NSString *)autoPkgRecipeOverridesDir { [self setAutoPkgDomainObject:autoPkgRecipeOverridesDir forKey:@"RECIPE_OVERRIDE_DIRS"]; } From 1a989bd2ddcdc7cd447958b3355036b46c502e94 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 28 Apr 2020 16:19:59 -0700 Subject: [PATCH 10/13] Updates to semantic color in notification selections controlTextColor and systemGrayColor. --- .../LGSelectNotificationsWindowController.xib | 33 ++++++++++--------- .../LGSelectNotificationsWindowController.m | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/Base.lproj/LGSelectNotificationsWindowController.xib b/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/Base.lproj/LGSelectNotificationsWindowController.xib index a9d34151..e5338453 100644 --- a/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/Base.lproj/LGSelectNotificationsWindowController.xib +++ b/AutoPkgr/Views-Controllers-XIB/Panels-Popovers/Base.lproj/LGSelectNotificationsWindowController.xib @@ -1,8 +1,9 @@ - - + + - + + @@ -14,17 +15,17 @@ - + - + - + @@ -56,7 +57,7 @@ - + - + @@ -180,7 +181,7 @@ Gw