From 06f8c2312e5f6c0c7cb5933bbb5040365bc3bcb7 Mon Sep 17 00:00:00 2001 From: Janez Troha Date: Wed, 28 Jun 2023 12:52:29 +0200 Subject: [PATCH] Update packages --- .github/workflows/test.yml | 20 +++++++------- Pareto Security.xcodeproj/project.pbxproj | 26 +++++++------------ Pareto/Defaults.swift | 10 +++---- Pareto/Info.plist | 2 +- .../Views/Settings/GeneralSettingsView.swift | 6 ++--- 5 files changed, 26 insertions(+), 38 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c8025c2..5ea2c33 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: # name: Unit and UI Tests # runs-on: apple-silicon # needs: lint - # timeout-minutes: 30 + # timeout-minutes: 60 # concurrency: # group: ${{ github.workflow }}-${{ github.ref }}-test # cancel-in-progress: true @@ -231,8 +231,8 @@ jobs: restore-keys: | ${{ runner.os }}-${{ env.cache-name }}- - name: Build - # run: set -o pipefail && make archive-debug 2>&1 | mint run xcbeautify - run: make archive-debug + run: set -o pipefail && make archive-debug 2>&1 | mint run xcbeautify + # run: make archive-debug - name: Compress app for storage run: ditto -V -c -k --keepParent Export/Pareto\ Security.app ParetoSecurity.app.zip - name: Upload App to Artifacts @@ -249,14 +249,13 @@ jobs: test-profile-default: strategy: matrix: - os: [macos-11, macos-13] + os: [macos-12, macos-13] runs-on: ${{ matrix.os }} name: Profile - Default - timeout-minutes: 3 + timeout-minutes: 6 needs: build concurrency: group: ${{ github.workflow }}-${{ github.ref }}-test-profile-default - cancel-in-progress: true steps: - name: Repository checkout uses: actions/checkout@v3 @@ -278,14 +277,13 @@ jobs: test-profile-bad: strategy: matrix: - os: [macos-11, macos-13] + os: [macos-12, macos-13] runs-on: ${{ matrix.os }} name: Profile - Bad - timeout-minutes: 3 + timeout-minutes: 6 needs: build concurrency: group: ${{ github.workflow }}-${{ github.ref }}-test-profile-bad - cancel-in-progress: true steps: - name: Repository checkout uses: actions/checkout@v3 @@ -399,8 +397,8 @@ jobs: restore-keys: | ${{ runner.os }}-${{ env.cache-name }}- - name: Build - #run: set -o pipefail && make archive-debug-setapp 2>&1 | mint run xcbeautify - run: make archive-debug-setapp + run: set -o pipefail && make archive-debug-setapp 2>&1 | mint run xcbeautify + #run: make archive-debug-setapp - name: Compress app for storage run: ditto -V -c -k --keepParent SetAppExport/Pareto\ Security.app ParetoSecuritySetApp.app.zip diff --git a/Pareto Security.xcodeproj/project.pbxproj b/Pareto Security.xcodeproj/project.pbxproj index 794b902..f06c7cc 100644 --- a/Pareto Security.xcodeproj/project.pbxproj +++ b/Pareto Security.xcodeproj/project.pbxproj @@ -185,7 +185,6 @@ 4F84531226D638C0007C3B04 /* NSBackgroundActivityScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F84531126D638C0007C3B04 /* NSBackgroundActivityScheduler.swift */; }; 4F84A94426CBBA6900A1579D /* SettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F84A94326CBBA6900A1579D /* SettingsTests.swift */; }; 4F84A94926CBE21300A1579D /* PasswordtoUnlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F84A94826CBE21300A1579D /* PasswordtoUnlock.swift */; }; - 4F84A94C26CBE4AE00A1579D /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = 4F84A94B26CBE4AE00A1579D /* ViewInspector */; }; 4F84EC9229DC3A030047C79C /* PermissionsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F84EC9129DC3A030047C79C /* PermissionsSettingsView.swift */; }; 4F84EC9329DC3A030047C79C /* PermissionsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F84EC9129DC3A030047C79C /* PermissionsSettingsView.swift */; }; 4F868DCF26A591E6005B876E /* Firewall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F868DCE26A591E6005B876E /* Firewall.swift */; }; @@ -427,7 +426,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4F84A94C26CBE4AE00A1579D /* ViewInspector in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -794,7 +792,6 @@ ); name = ParetoSecurityTests; packageProductDependencies = ( - 4F84A94B26CBE4AE00A1579D /* ViewInspector */, ); productName = ParetoSecurityTests; productReference = 4FC81A4926C41DC8006EABA8 /* ParetoSecurityTests.xctest */; @@ -866,7 +863,6 @@ mainGroup = 4FEBA2E5269CD48F009B2469; packageReferences = ( 4F103010269F1C65008C1E86 /* XCRemoteSwiftPackageReference "LaunchAtLogin" */, - 4F84A94A26CBE4AE00A1579D /* XCRemoteSwiftPackageReference "ViewInspector" */, 4F6A0E1126CE608C003B00A3 /* XCRemoteSwiftPackageReference "Defaults" */, 4F14487526D8EB2E00A5BA34 /* XCRemoteSwiftPackageReference "Version" */, 4F14487826D8EB7A00A5BA34 /* XCRemoteSwiftPackageReference "Path.swift" */, @@ -878,6 +874,7 @@ 4F6EF890275FEE6C00752559 /* XCRemoteSwiftPackageReference "Regex" */, 4FAF5BC02895583A004E9615 /* XCRemoteSwiftPackageReference "Setapp-framework" */, 4F3EF0A328AEA05F00D83F4E /* XCRemoteSwiftPackageReference "Yams" */, + 4FC0F2EC2A4C47FD004E7359 /* XCRemoteSwiftPackageReference "ViewInspector" */, ); productRefGroup = 4FEBA2EF269CD48F009B2469 /* Products */; projectDirPath = ""; @@ -1823,14 +1820,6 @@ minimumVersion = 7.0.0; }; }; - 4F84A94A26CBE4AE00A1579D /* XCRemoteSwiftPackageReference "ViewInspector" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/nalexn/ViewInspector"; - requirement = { - branch = master; - kind = branch; - }; - }; 4F923CEB2756918E00070551 /* XCRemoteSwiftPackageReference "Cache" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/hyperoslo/Cache"; @@ -1847,6 +1836,14 @@ minimumVersion = 3.0.0; }; }; + 4FC0F2EC2A4C47FD004E7359 /* XCRemoteSwiftPackageReference "ViewInspector" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/nalexn/ViewInspector"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.9.7; + }; + }; 4FF515BF26F7B362008D135E /* XCRemoteSwiftPackageReference "Alamofire" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Alamofire/Alamofire"; @@ -1953,11 +1950,6 @@ package = 4F7739F2271EB3AD008B1584 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; productName = Sentry; }; - 4F84A94B26CBE4AE00A1579D /* ViewInspector */ = { - isa = XCSwiftPackageProductDependency; - package = 4F84A94A26CBE4AE00A1579D /* XCRemoteSwiftPackageReference "ViewInspector" */; - productName = ViewInspector; - }; 4F923CEC2756918E00070551 /* Cache */ = { isa = XCSwiftPackageProductDependency; package = 4F923CEB2756918E00070551 /* XCRemoteSwiftPackageReference "Cache" */; diff --git a/Pareto/Defaults.swift b/Pareto/Defaults.swift index 564ac42..132558a 100644 --- a/Pareto/Defaults.swift +++ b/Pareto/Defaults.swift @@ -91,20 +91,18 @@ public extension Defaults { static func OKColor() -> NSColor { if Defaults[.alternativeColor] { - let light = NSColor.init(red: 0, green: 64, blue: 221, alpha: 1) - let dark = NSColor.init(red: 64, green: 156, blue: 255, alpha: 1) + let light = NSColor.init(red: 255, green: 179, blue: 64, alpha: 1) + let dark = NSColor.init(red: 255, green: 179, blue: 64, alpha: 1) let isDark = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") == "Dark" - return isDark ? dark : light } return NSColor.systemGreen } static func FailColor() -> NSColor { if Defaults[.alternativeColor] { - let light = NSColor.init(red: 173, green: 58, blue: 0, alpha: 1) - let dark = NSColor.init(red: 255, green: 179, blue: 64, alpha: 1) + let light = NSColor.init(red: 64, green: 156, blue: 255, alpha: 1) + let dark = NSColor.init(red: 64, green: 156, blue: 255, alpha: 1) let isDark = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") == "Dark" - return isDark ? dark : light } return NSColor.systemOrange diff --git a/Pareto/Info.plist b/Pareto/Info.plist index 9617316..a84f99e 100644 --- a/Pareto/Info.plist +++ b/Pareto/Info.plist @@ -26,7 +26,7 @@ CFBundleVersion - 5245 + 5278 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Pareto/Views/Settings/GeneralSettingsView.swift b/Pareto/Views/Settings/GeneralSettingsView.swift index b594476..581d8f3 100644 --- a/Pareto/Views/Settings/GeneralSettingsView.swift +++ b/Pareto/Views/Settings/GeneralSettingsView.swift @@ -22,7 +22,7 @@ struct GeneralSettingsView: View { @Default(.myChecksURL) var myChecksURL @Default(.sendCrashReports) var sendCrashReports @Default(.hideWhenNoFailures) var hideWhenNoFailures - + @Default(.alternativeColor) var alternativeColor @ObservedObject fileprivate var checker = PermissionsChecker() var body: some View { @@ -62,7 +62,7 @@ struct GeneralSettingsView: View { Section( footer: Text("Improve default colors for accessibility.").font(.footnote) ){ VStack(alignment: .leading) { - Toggle("Use alternative color scheme", isOn: $hideWhenNoFailures) + Toggle("Use alternative color scheme", isOn: $alternativeColor) } } if showBeta { @@ -111,7 +111,7 @@ struct GeneralSettingsView: View { #endif } } - }.frame(maxWidth: 380, minHeight: 180).padding(25) + }.frame(maxWidth: 380, minHeight: 210).padding(25) } func selectFolder() {