From 701c2a98918003cf5778928934e0da0a7c8da780 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 27 Oct 2020 14:04:12 -0700 Subject: [PATCH 1/6] Created 1.5.6-dev Bumped version to 1.5.6, updated schemes, correct to literal version from previous $(MARKETING_VERSION) recommendations. --- AutoPkgr.xcodeproj/project.pbxproj | 20 ++--- .../xcshareddata/xcschemes/AutoPkgr.xcscheme | 24 ++++++ .../com.lindegroup.AutoPkgr.helper.xcscheme | 78 +++++++++++++++++++ AutoPkgr/Supporting Files/AutoPkgr-Info.plist | 2 +- Privileged Helper/helper-Info.plist | 4 +- 5 files changed, 115 insertions(+), 13 deletions(-) create mode 100644 AutoPkgr.xcodeproj/xcshareddata/xcschemes/com.lindegroup.AutoPkgr.helper.xcscheme diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index dd69611..76b4c67 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -3071,7 +3071,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; SDKROOT = macosx; @@ -3124,7 +3124,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -3146,7 +3146,7 @@ INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3210,7 +3210,7 @@ INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3319,7 +3319,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1435; + CURRENT_PROJECT_VERSION = 1475; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3331,8 +3331,8 @@ INFOPLIST_FILE = "$(SRCROOT)/Privileged Helper/helper-Info.plist"; INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MARKETING_VERSION = 1.5.4; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MARKETING_VERSION = 1.5.6; MTL_ENABLE_DEBUG_INFO = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -3375,7 +3375,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1435; + CURRENT_PROJECT_VERSION = 1475; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3387,8 +3387,8 @@ INFOPLIST_FILE = "$(SRCROOT)/Privileged Helper/helper-Info.plist"; INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MARKETING_VERSION = 1.5.4; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MARKETING_VERSION = 1.5.6; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = ( "$(inherited)", diff --git a/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme b/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme index 5a5923e..43b20ee 100644 --- a/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme +++ b/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme @@ -20,6 +20,20 @@ ReferencedContainer = "container:AutoPkgr.xcodeproj"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist index bbe50d0..d01c8c2 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + 1.5.6 CFBundleSignature ???? CFBundleVersion diff --git a/Privileged Helper/helper-Info.plist b/Privileged Helper/helper-Info.plist index 824bb36..fd06a1d 100644 --- a/Privileged Helper/helper-Info.plist +++ b/Privileged Helper/helper-Info.plist @@ -9,12 +9,12 @@ CFBundleName com.lindegroup.AutoPkgr.helper CFBundleShortVersionString - $(MARKETING_VERSION) + 1.5.6 CFBundleVersion $(CURRENT_PROJECT_VERSION) SMAuthorizedClients - identifier "com.lindegroup.AutoPkgr" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = JVY2ZR6SEF + identifier "com.lindegroup.AutoPkgr" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = JVY2ZR6SEF From 44d835f5b67c18b3519c4c5765b8fc0936fcfee1 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 17 Nov 2020 13:21:58 -0800 Subject: [PATCH 2/6] Restore auto-run Re-added `YES` to /AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m. This restores auto-run of MakeCatalogs versus the user opts into MakeCatalogs via checking the recipe or the override of the recipe. --- AutoPkgr.xcodeproj/project.pbxproj | 3 +++ .../LGRecipeTableViewController.m | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index 76b4c67..9f755b5 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -1443,6 +1443,7 @@ 1AC6956D195B59EE00D2BD81 = { DevelopmentTeam = JVY2ZR6SEF; ProvisioningStyle = Manual; + TestTargetID = 1AC6954C195B59ED00D2BD81; }; BE05CE6619DAF26B0089068B = { CreatedOnToolsVersion = 6.0.1; @@ -3284,6 +3285,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "AutoPkgr/Views-Controllers-XIB/Integration Views/AutoPkgrTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AutoPkgr.app/Contents/MacOS/AutoPkgr"; WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -3309,6 +3311,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "AutoPkgr/Views-Controllers-XIB/Integration Views/AutoPkgrTests-Bridging-Header.h"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AutoPkgr.app/Contents/MacOS/AutoPkgr"; WRAPPER_EXTENSION = xctest; }; name = Release; diff --git a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m index 2229778..8f83e5e 100644 --- a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m +++ b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m @@ -279,7 +279,7 @@ - (void)runRecipesFromMenu:(NSMenuItem *)item LGAutoPkgRecipe *recipe = _searchedRecipes[idx]; [recipes addObject:recipe.Identifier]; if ([predicate evaluateWithObject:recipe]) { - runMakeCatalogs = NO; + runMakeCatalogs = YES; } }]; From 1e8b62395bcec3bf2d9bbf90ada4d5b9f43184c5 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 17 Nov 2020 13:30:31 -0800 Subject: [PATCH 3/6] Update LGAutoPkgRecipe.m Corrected /AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m. If .munki is present, re-add the MakeCatalogs recipe per previous behavior. Renewed disabling of checkbox for the MakeCatalogs.munki recipe. This is no longer available to check to ensure that the entry does not get permanently removed. --- AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m index 7c61a90..2cb6afa 100644 --- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m +++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m @@ -177,9 +177,9 @@ - (void)setEnabled:(BOOL)enabled { /* We automatically handle the enabling of the MakeCatalogs recipe * so don't do anything if that's the one getting enabled. */ - //if ([self.Name isEqualToString:kLGMakeCatalogsRecipeName]) { - //return; - //} + if ([self.Name isEqualToString:kLGMakeCatalogsRecipeName]) { + return; + } /* This is all dispatched to a serial queue so a race condition doesn't raise * when multiple recipes are added or removed in rapid succession. */ @@ -218,6 +218,7 @@ - (void)setEnabled:(BOOL)enabled * now listed. If so re-add the MakeCatalogs recipe. */ [currentList enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { if ([obj rangeOfString:@"munki"].location != NSNotFound) { + [currentList addObject:kLGMakeCatalogsRecipeName]; *stop = YES; } }]; From 00975103c30d0a82d2a1930875aa663b30a6c86d Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 26 Jan 2021 16:46:06 -0800 Subject: [PATCH 4/6] Default branch and pods - Updated default branch to avoid branch name issues. - Updated Sparkle and AutoUpdate to use Universal version. Please note that AutoPkgr is not a Universal app and requires Rosetta on Apple Silicon Macs, due to some legacy dependencies. --- AutoPkgr.xcodeproj/project.pbxproj | 16 ++++++++++----- AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m | 4 ++-- AutoPkgr/Supporting Files/AutoPkgr-Info.plist | 4 ++-- Podfile | 6 +++--- Podfile.lock | 20 ++++++++++--------- Privileged Helper/helper-Info.plist | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index 9f755b5..7b9a4d6 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -333,6 +333,7 @@ 295D7356247336C1008B796A /* LGMicrosoftTeamsNotificationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGMicrosoftTeamsNotificationView.m; sourceTree = ""; }; 295D735A24733742008B796A /* LGMicrosoftTeamsNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGMicrosoftTeamsNotification.m; sourceTree = ""; }; 295D735B24733742008B796A /* LGMicrosoftTeamsNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGMicrosoftTeamsNotification.h; sourceTree = ""; }; + 296D653B2564A5AE00A70759 /* libPods-AutoPkgr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libPods-AutoPkgr.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2974CF9F24E703B400EC0647 /* LGSimpleMDMIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGSimpleMDMIntegration.h; sourceTree = ""; }; 2974CFA024E703B400EC0647 /* LGSimpleMDMIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGSimpleMDMIntegration.m; sourceTree = ""; }; 2974CFA224E704A600EC0647 /* LGSimpleMDMIntegrationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGSimpleMDMIntegrationView.h; sourceTree = ""; }; @@ -758,6 +759,7 @@ 1AC6954F195B59ED00D2BD81 /* Frameworks */ = { isa = PBXGroup; children = ( + 296D653B2564A5AE00A70759 /* libPods-AutoPkgr.a */, BE05CE8519DB35380089068B /* libAHKeychain.a */, BE05CE8619DB35380089068B /* libPods-AutoPkgr-AHLaunchCtl.a */, BE05CE8F19DB37E50089068B /* ServiceManagement.framework */, @@ -1443,7 +1445,6 @@ 1AC6956D195B59EE00D2BD81 = { DevelopmentTeam = JVY2ZR6SEF; ProvisioningStyle = Manual; - TestTargetID = 1AC6954C195B59ED00D2BD81; }; BE05CE6619DAF26B0089068B = { CreatedOnToolsVersion = 6.0.1; @@ -3126,6 +3127,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -3148,6 +3150,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.5.6; + ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3212,6 +3215,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.5.6; + ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3279,13 +3283,13 @@ ); INFOPLIST_FILE = "AutoPkgrTests/Supporting Files/AutoPkgrTests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; PRODUCT_BUNDLE_IDENTIFIER = "com.lindegroup.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "AutoPkgr/Views-Controllers-XIB/Integration Views/AutoPkgrTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AutoPkgr.app/Contents/MacOS/AutoPkgr"; WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -3306,12 +3310,12 @@ GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch"; INFOPLIST_FILE = "AutoPkgrTests/Supporting Files/AutoPkgrTests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; PRODUCT_BUNDLE_IDENTIFIER = "com.lindegroup.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "AutoPkgr/Views-Controllers-XIB/Integration Views/AutoPkgrTests-Bridging-Header.h"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AutoPkgr.app/Contents/MacOS/AutoPkgr"; WRAPPER_EXTENSION = xctest; }; name = Release; @@ -3322,7 +3326,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1475; + CURRENT_PROJECT_VERSION = 1484; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3337,6 +3341,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.5.6; MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -3378,7 +3383,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1475; + CURRENT_PROJECT_VERSION = 1484; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3393,6 +3398,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.5.6; MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m index 76c0174..c0ed9e0 100644 --- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m +++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m @@ -46,7 +46,7 @@ - (instancetype)initWithGitHubDictionary:(NSDictionary *)dictionary if (self = [super init]) { _name = dictionary[@"name"]; _cloneURL = [NSURL URLWithString:dictionary[@"clone_url"]]; - _defaultBranch = dictionary[@"default_branch"] ?: @"master"; + _defaultBranch = dictionary[@"default_branch"]; _homeURL = [NSURL URLWithString:dictionary[@"html_url"]]; _stars = [dictionary[@"stargazers_count"] integerValue]; @@ -114,7 +114,7 @@ - (NSString *)path - (NSString *)defaultBranch { if (!_defaultBranch) { - _defaultBranch = @"master"; + _defaultBranch = @"default_branch"; } return _defaultBranch; } diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist index d01c8c2..c2f0e4b 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -21,11 +21,11 @@ CFBundleSignature ???? CFBundleVersion - 1475 + 1484 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} + 10.13 LSUIElement NSAppTransportSecurity diff --git a/Podfile b/Podfile index 0398be5..313102f 100644 --- a/Podfile +++ b/Podfile @@ -1,12 +1,12 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :osx, "10.9" +platform :osx, "10.13" AutoPkgr = ["AutoPkgr", "AutoPkgrTests"] AutoPkgr.each { |t| target t do pod 'AFNetworking', '~> 2.5.4' - pod 'Sparkle', '~> 1.14.0' + pod 'Sparkle', '~> 1.24.0' pod 'XMLDictionary', '~> 1.4' pod 'mailcore2-osx', '~> 0.5' pod 'GRMustache', '~> 7.3.2' @@ -14,7 +14,7 @@ AutoPkgr.each { |t| pod 'MMMarkdown', '~> 0.5.1' pod 'AHProxySettings', '~> 0.1.1' pod 'AHKeychain', '~> 0.3.0' - pod 'OpenSSL-OSX' + pod 'OpenSSL-Universal' pod 'AHLaunchCtl', :git => 'https://github.com/eahrold/AHLaunchCtl.git' end } diff --git a/Podfile.lock b/Podfile.lock index b0c8eec..e53f433 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,9 +26,11 @@ PODS: - JRSwizzle (1.0) - mailcore2-osx (0.6.4) - MMMarkdown (0.5.5) - - OpenSSL-OSX (1.0.211) + - OpenSSL-Universal (1.0.2.20): + - OpenSSL-Universal/Static (= 1.0.2.20) + - OpenSSL-Universal/Static (1.0.2.20) - RNCryptor (2.2) - - Sparkle (1.14.0) + - Sparkle (1.24.0) - XMLDictionary (1.4.1) DEPENDENCIES: @@ -38,11 +40,11 @@ DEPENDENCIES: - AHLaunchCtl (from `https://github.com/eahrold/AHLaunchCtl.git`) - AHProxySettings (~> 0.1.1) - GRMustache (~> 7.3.2) - - mailcore2-osx (~> 0.5) + - mailcore2-osx (~> 0.6.4) - MMMarkdown (~> 0.5.1) - - OpenSSL-OSX + - OpenSSL-Universal - RNCryptor (~> 2.2) - - Sparkle (~> 1.14.0) + - Sparkle (~> 1.24.0) - XMLDictionary (~> 1.4) SPEC REPOS: @@ -55,7 +57,7 @@ SPEC REPOS: - JRSwizzle - mailcore2-osx - MMMarkdown - - OpenSSL-OSX + - OpenSSL-Universal - RNCryptor - Sparkle - XMLDictionary @@ -79,11 +81,11 @@ SPEC CHECKSUMS: JRSwizzle: dd5ead5d913a0f29e7f558200165849f006bb1e3 mailcore2-osx: 56890045e50f3b09b6530f5bd008eda67e1f6b82 MMMarkdown: 1af97166ce0f6d6e0cb05695665492195d27c3f1 - OpenSSL-OSX: d9226a9b1c4257f41b819da9173a150c6a6fbfd5 + OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd RNCryptor: c68678461a2c7474a55db9a6a98834c22d51f535 - Sparkle: ccd95233b12a3e3d4eeb55ff01dd4c8bb8188b07 + Sparkle: 270cd27377bf04e9c128af06e3a22d0f572d6ee3 XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167 -PODFILE CHECKSUM: ad3ce1802e4cf005faff45f6d018d73534c50749 +PODFILE CHECKSUM: da9cd9d10a60bde0049e4d920b987735e80db544 COCOAPODS: 1.8.4 diff --git a/Privileged Helper/helper-Info.plist b/Privileged Helper/helper-Info.plist index fd06a1d..5243794 100644 --- a/Privileged Helper/helper-Info.plist +++ b/Privileged Helper/helper-Info.plist @@ -14,7 +14,7 @@ $(CURRENT_PROJECT_VERSION) SMAuthorizedClients - identifier "com.lindegroup.AutoPkgr" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = JVY2ZR6SEF + identifier "com.lindegroup.AutoPkgr" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = JVY2ZR6SEF From 14441966c1d455708683bd82effaeadb0921a284 Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Thu, 11 Feb 2021 11:14:04 -0800 Subject: [PATCH 5/6] Updated readme and change log --- CHANGELOG.md | 13 ++++++++++++- README.md | 6 +++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ca45f0..528bc38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. This projec ## [Unreleased](unreleased) +## [1.5.6] - 2021-02-23 + +### Added +- Updated default branch to avoid branch name issues. +- Updated Sparkle and AutoUpdate to use Universal version. Please note that AutoPkgr is not a Universal app and requires Rosetta on Apple Silicon Macs, due to some legacy dependencies. + +### Fixed +- Attention Munki Users: AutoPkgr will once again automatically add the MakeCatalogs.munki recipe to the end of your recipe list and keep it there. You do not have to check the box to include the MakeCatalogs.munki in your schedule. It will be included automatically. Since the introduction of [recipe trust information](https://github.com/autopkg/autopkg/wiki/Autopkg-and-recipe-parent-trust-info) in AutoPkg 1.0, we recommend that you create an override of MakeCatalogs.munki, instead of running the recipe itself. + + ## [1.5.5] - 2020-09-22 ### Added @@ -494,7 +504,8 @@ All notable changes to this project will be documented in this file. This projec - Initial public release of AutoPkgr. -[unreleased]: https://github.com/lindegroup/autopkgr/compare/v1.5.5...HEAD +[unreleased]: https://github.com/lindegroup/autopkgr/compare/v1.5.6...HEAD +[1.5.6]: https://github.com/lindegroup/autopkgr/compare/v1.5.5...v1.5.6 [1.5.5]: https://github.com/lindegroup/autopkgr/compare/v1.5.4...v1.5.5 [1.5.4]: https://github.com/lindegroup/autopkgr/compare/v1.5.3...v1.5.4 [1.5.3]: https://github.com/lindegroup/autopkgr/compare/v1.5.2...v1.5.3 diff --git a/README.md b/README.md index bce6709..941638d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ AutoPkgr makes these tasks a piece of cake: - Installation of Git, which AutoPkg uses. - Discovery of and subscription to the repositories and recipes you need. - Automatic scheduled checks of the recipes you choose. -- Email, Slack, or HipChat notifications when new software is packaged. +- Email, Slack, Teams, Google Chat, or HipChat notifications when new software is packaged. - Ability to easily create and edit AutoPkg recipe overrides. - Easy access to common folders that AutoPkg admins need. - Basic integration of AutoPkg with popular software distribution frameworks like [Munki](https://www.munki.org/munki/), [Jamf Pro](https://www.jamf.com/products/jamf-pro/), [HEAT LANrev](https://heatsoftware.com/software-solutions/unified-endpoint-management/lanrev/), [FileWave](https://www.filewave.com/), and [MacPatch](https://macpatch.github.io/). @@ -101,7 +101,7 @@ Download the [latest release](https://github.com/lindegroup/autopkgr/releases/la ![Notifications](doc-images/config_tab4.png) -1. Configure email, Slack, or HipChat notifications as desired. +1. Configure email, Slack, Teams, Google Chat, or HipChat notifications as desired. That's it! AutoPkgr will now check for the latest app updates you specified, and when an update is available you'll receive a notification. @@ -202,7 +202,7 @@ Since the introduction of [recipe trust information](https://github.com/autopkg/ ![MakeCatalogs Override](doc-images/makecatalogs_override.png) -1. That's it! You only need to create that override once. Make sure to check the box to include the MakeCatalogs.munki in your schedule. It will no longer be included automatically. +1. That's it! You only need to create that override once. AutoPkgr will automatically add the MakeCatalogs.munki recipe to the end of your recipe list and keep it there. You do not have to check the box to include the MakeCatalogs.munki in your schedule. It will be included automatically. ### Integration with Jamf Pro From 0ee5c5eaebae1612e16dfe47035792aff114128f Mon Sep 17 00:00:00 2001 From: Shawn Honsberger Date: Tue, 16 Feb 2021 11:58:15 -0800 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 528bc38..3d95efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,13 @@ All notable changes to this project will be documented in this file. This projec ## [1.5.6] - 2021-02-23 -### Added -- Updated default branch to avoid branch name issues. +### Changed + - Updated Sparkle and AutoUpdate to use Universal version. Please note that AutoPkgr is not a Universal app and requires Rosetta on Apple Silicon Macs, due to some legacy dependencies. ### Fixed - Attention Munki Users: AutoPkgr will once again automatically add the MakeCatalogs.munki recipe to the end of your recipe list and keep it there. You do not have to check the box to include the MakeCatalogs.munki in your schedule. It will be included automatically. Since the introduction of [recipe trust information](https://github.com/autopkg/autopkg/wiki/Autopkg-and-recipe-parent-trust-info) in AutoPkg 1.0, we recommend that you create an override of MakeCatalogs.munki, instead of running the recipe itself. +- Updated default branch invocation to avoid branch name issues when working with repos. ## [1.5.5] - 2020-09-22