Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
jobs:
build:
name: Build
runs-on: macos-15
runs-on: macos-26
steps:
- uses: actions/checkout@v5
- uses: swift-actions/setup-swift@v2
- uses: actions/checkout@v6
- uses: swift-actions/setup-swift@v3
with:
swift-version: 5.10.1
swift-version: "6.3.1"
- name: Install Apple Developer ID Application Certificate
env:
APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/draft_new_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: workflow_dispatch
jobs:
build:
name: Draft New Release
runs-on: macos-15
runs-on: macos-26
env:
APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE }}
APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE_PASSWORD }}
Expand All @@ -18,10 +18,10 @@ jobs:
APPLE_DEVELOPER_TEAM_ID: "7K3HVCLV7Z"
KEYCHAIN_FILE: "apple-developer.keychain-db"
steps:
- uses: actions/checkout@v5
- uses: swift-actions/setup-swift@v2
- uses: actions/checkout@v6
- uses: swift-actions/setup-swift@v3
with:
swift-version: 5.10.1
swift-version: "6.3.1"
- name: Install Apple Developer ID Certificates
run: |
APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH="$RUNNER_TEMP/apple-developer-id-application-certificate.p12"
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
xcrun notarytool submit "${{ env.PACKAGE_FILENAME }}" --apple-id "$APPLE_DEVELOPER_APPLE_ID" --password "$APPLE_DEVELOPER_APPLE_ID_PASSWORD" --team-id "$APPLE_DEVELOPER_TEAM_ID" --wait
xcrun stapler staple "${{ env.PACKAGE_FILENAME }}"
- name: Draft New Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
name: ${{ env.APP_VERSION }}
tag_name: v${{ env.APP_VERSION }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:
jobs:
linting:
name: Linting
runs-on: macos-15
runs-on: macos-26
steps:
- uses: actions/checkout@v5
- uses: swift-actions/setup-swift@v2
- uses: actions/checkout@v6
- uses: swift-actions/setup-swift@v3
with:
swift-version: 5.10.1
swift-version: "6.3.1"
- uses: m-takuma/setup-swiftlint@1.0.0
with:
swiftlint-version: 0.61.0
swiftlint-version: "0.63.2"
- name: Print SwiftLint version
run: swiftlint --version
- name: Run SwiftLint
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
jobs:
unit_tests:
name: Unit Tests
runs-on: macos-15
runs-on: macos-26
steps:
- uses: actions/checkout@v5
- uses: swift-actions/setup-swift@v2
- uses: actions/checkout@v6
- uses: swift-actions/setup-swift@v3
with:
swift-version: 5.10.1
swift-version: "6.3.1"
- name: Install Apple Developer ID Application Certificate
env:
APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE }}
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.10.1
6.3.1
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2025 Nindi Gill
Copyright (c) 2021-2026 Nindi Gill

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 7 additions & 7 deletions Mist.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1410;
LastUpgradeCheck = 2600;
LastUpgradeCheck = 2700;
TargetAttributes = {
390451A52856E1D900E0B563 = {
CreatedOnToolsVersion = 14.0;
Expand Down Expand Up @@ -1117,7 +1117,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 0.30;
CURRENT_PROJECT_VERSION = 0.40;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 7K3HVCLV7Z;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1133,7 +1133,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 0.30;
MARKETING_VERSION = 0.40;
PRODUCT_BUNDLE_IDENTIFIER = com.ninxsoft.mist;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -1151,7 +1151,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 0.30;
CURRENT_PROJECT_VERSION = 0.40;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 7K3HVCLV7Z;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1167,7 +1167,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 0.30;
MARKETING_VERSION = 0.40;
PRODUCT_BUNDLE_IDENTIFIER = com.ninxsoft.mist;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -1334,15 +1334,15 @@
repositoryURL = "https://github.com/jpsim/Yams";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.1.0;
minimumVersion = 6.2.2;
};
};
3935F4C3286B546A00760AB0 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.8.0;
minimumVersion = 2.9.4;
};
};
39CF55A8286154A5006FB5D2 /* XCRemoteSwiftPackageReference "Blessed" */ = {
Expand Down
2 changes: 1 addition & 1 deletion Mist.xcodeproj/xcshareddata/xcschemes/Mist.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "2700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "2700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Mist.xcodeproj/xcshareddata/xcschemes/MistTests.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "2700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
18 changes: 9 additions & 9 deletions Mist/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "213",
"green" : "88",
"red" : "0"
"blue" : "137",
"green" : "100",
"red" : "85"
}
},
"idiom" : "mac"
Expand All @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "213",
"green" : "88",
"red" : "0"
"blue" : "137",
"green" : "100",
"red" : "85"
}
},
"idiom" : "mac"
Expand All @@ -41,9 +41,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "245",
"green" : "101",
"red" : "0"
"blue" : "158",
"green" : "115",
"red" : "98"
}
},
"idiom" : "mac"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"images" : [
{
"filename" : "icon_16x16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "icon_16x16@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "icon_32x32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "icon_32x32@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "icon_128x128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "icon_128x128@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "icon_256x256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "icon_256x256@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "icon_512x512.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "icon_512x512@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "App Icon Preview - macOS Golden Gate.png",
"idiom" : "mac"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Application - macOS Golden Gate.png",
"idiom" : "mac"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
12 changes: 12 additions & 0 deletions Mist/Assets.xcassets/macOS Golden Gate.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "macOS Golden Gate.png",
"idiom" : "mac"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Mist/Extensions/AuthorizationError+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Authorized

extension AuthorizationError: Equatable {
extension AuthorizationError: @retroactive Equatable {
public static func == (lhs: AuthorizationError, rhs: AuthorizationError) -> Bool {
lhs.localizedDescription == rhs.localizedDescription
}
Expand Down
6 changes: 2 additions & 4 deletions Mist/Extensions/Dictionary+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extension Dictionary where Key == String {
let signedString: String = "\(signed ? "YES" : "NO")"
let betaString: String = "\(beta ? "YES" : "NO")"

let string: String = [
return [
nameString,
versionString,
buildString,
Expand All @@ -44,7 +44,6 @@ extension Dictionary where Key == String {
signedString,
betaString
].joined(separator: ",") + "\n"
return string
}

/// Provides an installer CSV string representation.
Expand Down Expand Up @@ -72,7 +71,7 @@ extension Dictionary where Key == String {
let compatibleString: String = "\(compatible ? "YES" : "NO")"
let betaString: String = "\(beta ? "YES" : "NO")"

let string: String = [
return [
identifierString,
nameString,
versionString,
Expand All @@ -82,6 +81,5 @@ extension Dictionary where Key == String {
compatibleString,
betaString
].joined(separator: ",") + "\n"
return string
}
}
2 changes: 1 addition & 1 deletion Mist/Extensions/Scene+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extension Scene {
func fixedWindow() -> some Scene {
if #available(macOS 13.0, *) {
// swiftformat:disable:next redundantReturn
return self.windowResizability(.contentSize)
return windowResizability(.contentSize)
} else {
// swiftformat:disable:next redundantReturn
return self
Expand Down
Loading
Loading