diff --git a/AutoPkgr.xcodeproj/project.pbxproj b/AutoPkgr.xcodeproj/project.pbxproj index bc5208e7..2b766789 100644 --- a/AutoPkgr.xcodeproj/project.pbxproj +++ b/AutoPkgr.xcodeproj/project.pbxproj @@ -1622,10 +1622,12 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AutoPkgrTests/Pods-AutoPkgrTests-frameworks.sh", "${PODS_ROOT}/Sparkle/Sparkle.framework", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2058,10 +2060,12 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AutoPkgr/Pods-AutoPkgr-frameworks.sh", "${PODS_ROOT}/Sparkle/Sparkle.framework", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -3106,6 +3110,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -3137,6 +3142,7 @@ DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3165,6 +3171,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -3197,6 +3204,7 @@ DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -3218,6 +3226,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2C6986FE5B41226735CC0A32 /* Pods-AutoPkgr.debug.xcconfig */; buildSettings = { + ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; @@ -3225,6 +3234,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_INJECT_BASE_ENTITLEMENTS = YES; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1520; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -3232,7 +3242,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.6; + MARKETING_VERSION = 1.6.1; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; @@ -3261,6 +3271,8 @@ "-framework", "\"Foundation\"", "-framework", + "\"OpenSSL\"", + "-framework", "\"Security\"", "-framework", "\"ServiceManagement\"", @@ -3285,6 +3297,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D1C393755729ADE331CE085C /* Pods-AutoPkgr.release.xcconfig */; buildSettings = { + ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; @@ -3292,15 +3305,17 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_INJECT_BASE_ENTITLEMENTS = YES; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1520; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; + EXCLUDED_ARCHS = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch"; INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.6; + MARKETING_VERSION = 1.6.1; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = ""; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; @@ -3329,6 +3344,8 @@ "-framework", "\"Foundation\"", "-framework", + "\"OpenSSL\"", + "-framework", "\"Security\"", "-framework", "\"ServiceManagement\"", @@ -3371,6 +3388,43 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"ACEView\"", + "-l\"AFNetworking\"", + "-l\"AHKeychain\"", + "-l\"AHLaunchCtl\"", + "-l\"AHProxySettings\"", + "-l\"GRMustache\"", + "-l\"JRSwizzle\"", + "-l\"MMMarkdown\"", + "-l\"MailCore\"", + "-l\"XMLDictionary\"", + "-l\"c++\"", + "-l\"iconv\"", + "-l\"resolv\"", + "-l\"sasl2\"", + "-l\"tidy\"", + "-l\"xml2\"", + "-l\"z\"", + "-framework", + "\"CoreServices\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"OpenSSL\"", + "-framework", + "\"Security\"", + "-framework", + "\"ServiceManagement\"", + "-framework", + "\"Sparkle\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"WebKit\"", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.lindegroup.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3398,6 +3452,43 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"ACEView\"", + "-l\"AFNetworking\"", + "-l\"AHKeychain\"", + "-l\"AHLaunchCtl\"", + "-l\"AHProxySettings\"", + "-l\"GRMustache\"", + "-l\"JRSwizzle\"", + "-l\"MMMarkdown\"", + "-l\"MailCore\"", + "-l\"XMLDictionary\"", + "-l\"c++\"", + "-l\"iconv\"", + "-l\"resolv\"", + "-l\"sasl2\"", + "-l\"tidy\"", + "-l\"xml2\"", + "-l\"z\"", + "-framework", + "\"CoreServices\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"OpenSSL\"", + "-framework", + "\"Security\"", + "-framework", + "\"ServiceManagement\"", + "-framework", + "\"Sparkle\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"WebKit\"", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.lindegroup.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3410,9 +3501,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = F107A65717A3307E0BCA7341 /* Pods-com.lindegroup.AutoPkgr.helper.debug.xcconfig */; buildSettings = { + ARCHS = x86_64; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1501; + CURRENT_PROJECT_VERSION = 1520; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3425,7 +3517,7 @@ INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.6.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( @@ -3467,9 +3559,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 06EB3E6636660212855850C6 /* Pods-com.lindegroup.AutoPkgr.helper.release.xcconfig */; buildSettings = { + ARCHS = x86_64; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "Developer ID Application"; - CURRENT_PROJECT_VERSION = 1501; + CURRENT_PROJECT_VERSION = 1520; DEVELOPMENT_TEAM = JVY2ZR6SEF; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3482,7 +3575,7 @@ INSTALL_PATH = ""; "INSTALL_PATH[sdk=*]" = /Library/PrivilegedHelperTools/; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.6.1; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( diff --git a/AutoPkgr.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/AutoPkgr.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/AutoPkgr.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist index 915a48c7..9647880c 100755 --- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist +++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6 + 1.6.1 CFBundleSignature ???? CFBundleVersion - 1506 + 1509 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion @@ -34,7 +34,7 @@ NSHumanReadableCopyright - Copyright 2014-2022 The Linde Group, Inc. + Copyright 2014-2024 The Linde Group, Inc. NSMainNibFile MainMenu NSPrincipalClass diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJamfUploaderIntegrationView.xib b/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJamfUploaderIntegrationView.xib index 3e308bbd..9ef7dc3e 100644 --- a/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJamfUploaderIntegrationView.xib +++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJamfUploaderIntegrationView.xib @@ -1,8 +1,8 @@ - + - + @@ -12,10 +12,7 @@ - - - @@ -24,11 +21,11 @@ - + - - + + @@ -39,15 +36,15 @@ - + - + - + - + @@ -91,45 +88,45 @@ - - + + @@ -156,8 +153,8 @@ - - + + @@ -167,8 +164,8 @@ - - + + @@ -178,57 +175,29 @@ - - - - - - - - - - - - + + - - + + @@ -238,8 +207,8 @@ - - + + @@ -254,9 +223,7 @@ - - @@ -264,22 +231,14 @@ - - - - - - - - diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGRecipeReposViewController.xib b/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGRecipeReposViewController.xib index 814ce0be..397f1e6c 100644 --- a/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGRecipeReposViewController.xib +++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGRecipeReposViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -27,13 +27,13 @@ - + - + - + @@ -72,7 +72,7 @@ - + @@ -86,11 +86,11 @@ - + - - + + @@ -122,10 +122,10 @@ - + - + @@ -154,7 +154,7 @@ - + @@ -195,12 +195,12 @@ - + - - + + @@ -210,8 +210,8 @@ - - + + @@ -219,28 +219,28 @@ - - + + - - + + @@ -248,13 +248,13 @@ - + - + - + @@ -276,8 +276,8 @@ - + @@ -448,8 +448,8 @@ - - + + @@ -457,7 +457,7 @@ - + - - - @@ -518,11 +515,14 @@ DQ + + + - + @@ -533,8 +533,8 @@ DQ - - + + @@ -546,28 +546,28 @@ DQ