Merge pull request #663 from lindegroup/1.5.6-dev

1.5.6 dev
lindegroup · Feb 23, 2021 · b8e1775 · b8e1775
2 parents d6dfcdb + 0ee5c5e
commit b8e1775
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 36 deletions.
diff --git 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 = "<group>"; };
 		295D735A24733742008B796A /* LGMicrosoftTeamsNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGMicrosoftTeamsNotification.m; sourceTree = "<group>"; };
 		295D735B24733742008B796A /* LGMicrosoftTeamsNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGMicrosoftTeamsNotification.h; sourceTree = "<group>"; };
+		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 = "<group>"; };
 		2974CFA024E703B400EC0647 /* LGSimpleMDMIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGSimpleMDMIntegration.m; sourceTree = "<group>"; };
 		2974CFA224E704A600EC0647 /* LGSimpleMDMIntegrationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGSimpleMDMIntegrationView.h; sourceTree = "<group>"; };
@@ -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
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:AutoPkgr.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1AC6956D195B59EE00D2BD81"
+               BuildableName = "AutoPkgrTests.xctest"
+               BlueprintName = "AutoPkgrTests"
+               ReferencedContainer = "container:AutoPkgr.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -28,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1AC6956D195B59EE00D2BD81"
+               BuildableName = "AutoPkgrTests.xctest"
+               BlueprintName = "AutoPkgrTests"
+               ReferencedContainer = "container:AutoPkgr.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/AutoPkgr.xcodeproj/xcshareddata/xcschemes/com.lindegroup.AutoPkgr.helper.xcscheme b/AutoPkgr.xcodeproj/xcshareddata/xcschemes/com.lindegroup.AutoPkgr.helper.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1210"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BE05CE6619DAF26B0089068B"
+               BuildableName = "com.lindegroup.AutoPkgr.helper"
+               BlueprintName = "com.lindegroup.AutoPkgr.helper"
+               ReferencedContainer = "container:AutoPkgr.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BE05CE6619DAF26B0089068B"
+            BuildableName = "com.lindegroup.AutoPkgr.helper"
+            BlueprintName = "com.lindegroup.AutoPkgr.helper"
+            ReferencedContainer = "container:AutoPkgr.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BE05CE6619DAF26B0089068B"
+            BuildableName = "com.lindegroup.AutoPkgr.helper"
+            BlueprintName = "com.lindegroup.AutoPkgr.helper"
+            ReferencedContainer = "container:AutoPkgr.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git 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
@@ -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
@@ -17,15 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>1.5.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1475</string>
+	<string>1484</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<string>10.13</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/...kgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m b/...kgr/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
@@ -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
@@ -1,20 +1,20 @@
 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'
         pod 'ACEView', '~> 0.0.5'
         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
 }