diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index dd696117..7b9a4d6e 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 */, @@ -3071,7 +3073,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 +3126,8 @@ 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; SKIP_INSTALL = YES; @@ -3146,7 +3149,8 @@ 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; + ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3210,7 +3214,8 @@ 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; + ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; OTHER_LDFLAGS = ( @@ -3278,6 +3283,7 @@ ); 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)"; @@ -3304,6 +3310,7 @@ 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)"; @@ -3319,7 +3326,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1435; + CURRENT_PROJECT_VERSION = 1484; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3331,9 +3338,10 @@ 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; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -3375,7 +3383,7 @@ buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1435; + CURRENT_PROJECT_VERSION = 1484; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3387,9 +3395,10 @@ 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; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme b/AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme index 5a5923e1..43b20eec 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/Models/AutoPkg Task/LGAutoPkgRecipe.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m index 7c61a90e..2cb6afaf 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; } }]; diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m index 76c01744..c0ed9e0f 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 bbe50d06..c2f0e4b9 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -17,15 +17,15 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + 1.5.6 CFBundleSignature ???? CFBundleVersion - 1475 + 1484 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} + 10.13 LSUIElement NSAppTransportSecurity 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 2229778d..8f83e5e8 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; } }]; diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ca45f07..3d95efa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. This projec ## [Unreleased](unreleased) +## [1.5.6] - 2021-02-23 + +### 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 ### Added @@ -494,7 +505,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/Podfile b/Podfile index 0398be51..313102f6 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 b0c8eecf..e53f4335 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 824bb361..52437949 100644 --- a/Privileged Helper/helper-Info.plist +++ b/Privileged Helper/helper-Info.plist @@ -9,7 +9,7 @@ CFBundleName com.lindegroup.AutoPkgr.helper CFBundleShortVersionString - $(MARKETING_VERSION) + 1.5.6 CFBundleVersion $(CURRENT_PROJECT_VERSION) SMAuthorizedClients diff --git a/README.md b/README.md index bce67093..941638d8 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