diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index 7b9a4d6..8b75308 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -3149,7 +3149,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.6; + MARKETING_VERSION = 1.5.7; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; @@ -3214,7 +3214,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.6; + MARKETING_VERSION = 1.5.7; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; @@ -3339,7 +3339,7 @@ INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( @@ -3396,7 +3396,7 @@ INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgRepo.m index c0ed9e0..76c0174 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"]; + _defaultBranch = dictionary[@"default_branch"] ?: @"master"; _homeURL = [NSURL URLWithString:dictionary[@"html_url"]]; _stars = [dictionary[@"stargazers_count"] integerValue]; @@ -114,7 +114,7 @@ - (NSString *)path - (NSString *)defaultBranch { if (!_defaultBranch) { - _defaultBranch = @"default_branch"; + _defaultBranch = @"master"; } return _defaultBranch; } diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist index c2f0e4b..b31cd8a 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.6 + 1.5.7 CFBundleSignature ???? CFBundleVersion - 1484 + 1492 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d95efa..cce76aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This projec ## [Unreleased](unreleased) +## [1.5.7] - 2021-03-05 + +### Fixed + +- Corrected default branch invocation to avoid issues when working with integrations and repos. This resolves issue [#665](https://github.com/lindegroup/autopkgr/issues/665) and [#668](https://github.com/lindegroup/autopkgr/issues/668). Thanks to [@apizz](https://github.com/apizz) and [@jaw4uz](https://github.com/jaw4uz) for the reports! +- Issue [#666](https://github.com/lindegroup/autopkgr/issues/666), unrelated to AutoPkgr has been resolved by the release of [AutoPkg 2.3.1](https://github.com/autopkg/autopkg/releases/tag/v2.3.1). Thanks to [@homebysix](https://github.com/homebysix) for [#723](https://github.com/autopkg/autopkg/issues/723) and [#724](https://github.com/autopkg/autopkg/pull/724) for the reports and fixes! + ## [1.5.6] - 2021-02-23 ### Changed @@ -505,7 +512,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.6...HEAD +[unreleased]: https://github.com/lindegroup/autopkgr/compare/v1.5.7...HEAD +[1.5.7]: https://github.com/lindegroup/autopkgr/compare/v1.5.6...v1.5.7 [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 diff --git a/Privileged Helper/helper-Info.plist b/Privileged Helper/helper-Info.plist index 5243794..288e05b 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.6 + 1.5.7 CFBundleVersion $(CURRENT_PROJECT_VERSION) SMAuthorizedClients