Add preliminary support for macOS 14
|
@ -2,12 +2,12 @@
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "display-p3",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.269",
|
"blue" : "0.149",
|
||||||
"green" : "0.647",
|
"green" : "0.663",
|
||||||
"red" : "0.946"
|
"red" : "0.467"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "mac"
|
"idiom" : "mac"
|
||||||
|
@ -20,12 +20,12 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "display-p3",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.269",
|
"blue" : "0.149",
|
||||||
"green" : "0.647",
|
"green" : "0.663",
|
||||||
"red" : "0.946"
|
"red" : "0.467"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "mac"
|
"idiom" : "mac"
|
||||||
|
@ -38,12 +38,12 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "display-p3",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.269",
|
"blue" : "0.149",
|
||||||
"green" : "0.647",
|
"green" : "0.663",
|
||||||
"red" : "0.946"
|
"red" : "0.467"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "mac"
|
"idiom" : "mac"
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 8.6 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 212 KiB |
12
Mist/Assets.xcassets/macOS Sonoma.imageset/Contents.json
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "macOS Sonoma.png",
|
||||||
|
"idiom" : "mac"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
BIN
Mist/Assets.xcassets/macOS Sonoma.imageset/macOS Sonoma.png
vendored
Normal file
After Width: | Height: | Size: 78 KiB |
|
@ -6,6 +6,7 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
enum CatalogType: String, CaseIterable, Comparable, Decodable {
|
enum CatalogType: String, CaseIterable, Comparable, Decodable {
|
||||||
|
case sonoma = "macOS Sonoma"
|
||||||
case ventura = "macOS Ventura"
|
case ventura = "macOS Ventura"
|
||||||
case monterey = "macOS Monterey"
|
case monterey = "macOS Monterey"
|
||||||
case bigSur = "macOS Big Sur"
|
case bigSur = "macOS Big Sur"
|
||||||
|
@ -20,12 +21,14 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable {
|
||||||
|
|
||||||
private var sortOrder: Int {
|
private var sortOrder: Int {
|
||||||
switch self {
|
switch self {
|
||||||
case .ventura:
|
case .sonoma:
|
||||||
return 0
|
return 0
|
||||||
case .monterey:
|
case .ventura:
|
||||||
return 1
|
return 1
|
||||||
case .bigSur:
|
case .monterey:
|
||||||
return 2
|
return 2
|
||||||
|
case .bigSur:
|
||||||
|
return 3
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +40,20 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable {
|
||||||
func url(for seedType: CatalogSeedType) -> String {
|
func url(for seedType: CatalogSeedType) -> String {
|
||||||
|
|
||||||
switch self {
|
switch self {
|
||||||
|
case .sonoma:
|
||||||
|
switch seedType {
|
||||||
|
case .standard:
|
||||||
|
return "https://swscan.apple.com/content/catalogs/others/index-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
|
||||||
|
case .customer:
|
||||||
|
// swiftlint:disable:next line_length
|
||||||
|
return "https://swscan.apple.com/content/catalogs/others/index-14customerseed-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
|
||||||
|
case .developer:
|
||||||
|
// swiftlint:disable:next line_length
|
||||||
|
return "https://swscan.apple.com/content/catalogs/others/index-14seed-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
|
||||||
|
case .public:
|
||||||
|
// swiftlint:disable:next line_length
|
||||||
|
return "https://swscan.apple.com/content/catalogs/others/index-14beta-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
|
||||||
|
}
|
||||||
case .ventura:
|
case .ventura:
|
||||||
switch seedType {
|
switch seedType {
|
||||||
case .standard:
|
case .standard:
|
||||||
|
|
|
@ -52,7 +52,9 @@ struct Firmware: Decodable, Hashable, Identifiable {
|
||||||
|
|
||||||
var name: String = ""
|
var name: String = ""
|
||||||
|
|
||||||
if version.range(of: "^13", options: .regularExpression) != nil {
|
if version.range(of: "^14", options: .regularExpression) != nil {
|
||||||
|
name = "macOS Sonoma"
|
||||||
|
} else if version.range(of: "^13", options: .regularExpression) != nil {
|
||||||
name = "macOS Ventura"
|
name = "macOS Ventura"
|
||||||
} else if version.range(of: "^12", options: .regularExpression) != nil {
|
} else if version.range(of: "^12", options: .regularExpression) != nil {
|
||||||
name = "macOS Monterey"
|
name = "macOS Monterey"
|
||||||
|
|
|
@ -271,7 +271,9 @@ struct Installer: Decodable, Hashable, Identifiable {
|
||||||
|
|
||||||
var name: String = ""
|
var name: String = ""
|
||||||
|
|
||||||
if version.range(of: "^13", options: .regularExpression) != nil {
|
if version.range(of: "^14", options: .regularExpression) != nil {
|
||||||
|
name = "macOS Sonoma"
|
||||||
|
} else if version.range(of: "^13", options: .regularExpression) != nil {
|
||||||
name = "macOS Ventura"
|
name = "macOS Ventura"
|
||||||
} else if version.range(of: "^12", options: .regularExpression) != nil {
|
} else if version.range(of: "^12", options: .regularExpression) != nil {
|
||||||
name = "macOS Monterey"
|
name = "macOS Monterey"
|
||||||
|
|
|
@ -11,7 +11,7 @@ struct SettingsInstallersCatalogsView: View {
|
||||||
@Binding var catalogs: [Catalog]
|
@Binding var catalogs: [Catalog]
|
||||||
// swiftlint:disable:next line_length
|
// swiftlint:disable:next line_length
|
||||||
private let description: String = "Apple Software Update Catalogs are used to determine available macOS Installers.\n\n- **Standard:** The default catalog that ships with macOS\n- **Customer Seed:** The catalog available as part of the [AppleSeed Program](https://appleseed.apple.com/)\n- **Developer Seed:** The catalog available as part of the [Apple Developer Program](https://developer.apple.com/programs/)\n- **Public Seed:** The catalog available as part of the [Apple Beta Software Program](https://beta.apple.com/)\n\n**Note:** Catalogs from the Seed Programs may contain beta / unreleased versions of macOS. Ensure you are a member of these programs before proceeding."
|
private let description: String = "Apple Software Update Catalogs are used to determine available macOS Installers.\n\n- **Standard:** The default catalog that ships with macOS\n- **Customer Seed:** The catalog available as part of the [AppleSeed Program](https://appleseed.apple.com/)\n- **Developer Seed:** The catalog available as part of the [Apple Developer Program](https://developer.apple.com/programs/)\n- **Public Seed:** The catalog available as part of the [Apple Beta Software Program](https://beta.apple.com/)\n\n**Note:** Catalogs from the Seed Programs may contain beta / unreleased versions of macOS. Ensure you are a member of these programs before proceeding."
|
||||||
private let height: CGFloat = 120
|
private let height: CGFloat = 126
|
||||||
private let width: CGFloat = 150
|
private let width: CGFloat = 150
|
||||||
private let length: CGFloat = 16
|
private let length: CGFloat = 16
|
||||||
|
|
||||||
|
|