diff --git a/MiniSim.xcodeproj/project.pbxproj b/MiniSim.xcodeproj/project.pbxproj index 478d420..4304a54 100644 --- a/MiniSim.xcodeproj/project.pbxproj +++ b/MiniSim.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 762CF1E02981968F00099999 /* String+match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 762CF1DF2981968F00099999 /* String+match.swift */; }; 762CF1E42981DE6100099999 /* Device.swift in Sources */ = {isa = PBXBuildFile; fileRef = 762CF1E32981DE6100099999 /* Device.swift */; }; 7630B25E2984339100D8B57D /* MainMenuActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7630B25D2984339100D8B57D /* MainMenuActions.swift */; }; - 7630B26129853EF400D8B57D /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = 7630B26029853EF400D8B57D /* Preferences */; }; 7630B2662985C44A00D8B57D /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7630B2652985C44A00D8B57D /* Preferences.swift */; }; 7630B2682985C4CF00D8B57D /* About.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7630B2672985C4CF00D8B57D /* About.swift */; }; 7630B26B2986B4D500D8B57D /* KeyboardShortcuts in Frameworks */ = {isa = PBXBuildFile; productRef = 7630B26A2986B4D500D8B57D /* KeyboardShortcuts */; }; @@ -51,6 +50,7 @@ 764BA3E92A5AD418003A78AF /* GetDevicesCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 764BA3E82A5AD418003A78AF /* GetDevicesCommand.swift */; }; 764BA3EB2A5AD43F003A78AF /* LaunchDeviceCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 764BA3EA2A5AD43F003A78AF /* LaunchDeviceCommand.swift */; }; 764BA3ED2A5AD478003A78AF /* GetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 764BA3EC2A5AD478003A78AF /* GetCommands.swift */; }; + 765077C62C46F04A00C7B5F3 /* Settings in Frameworks */ = {isa = PBXBuildFile; productRef = 765077C52C46F04A00C7B5F3 /* Settings */; }; 765ABF382A8BECD900A063CB /* ExecuteCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765ABF372A8BECD900A063CB /* ExecuteCommand.swift */; }; 765C44C82A2A6C9600FCC159 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765C44C72A2A6C9600FCC159 /* MainMenu.xib */; }; 76630F0C29BDD0C000FB64F9 /* Devices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76630F0B29BDD0C000FB64F9 /* Devices.swift */; }; @@ -178,11 +178,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 765077C62C46F04A00C7B5F3 /* Settings in Frameworks */, 768F8EC829954C8A00DFBCDB /* Sparkle in Frameworks */, 76F04A14298A62CF00BF9CA3 /* ShellOut in Frameworks */, 76AC9AF92A0EB50800864A8B /* SymbolPicker in Frameworks */, 7630B2702986C0F200D8B57D /* LaunchAtLogin in Frameworks */, - 7630B26129853EF400D8B57D /* Preferences in Frameworks */, 763EEB132A26896B008428F1 /* CodeEditor in Frameworks */, 7630B26B2986B4D500D8B57D /* KeyboardShortcuts in Frameworks */, ); @@ -299,12 +299,20 @@ path = "AppleScript Commands"; sourceTree = ""; }; + 765077C42C46F04A00C7B5F3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 766BD2272981628A0042261B = { isa = PBXGroup; children = ( 766BD2322981628A0042261B /* MiniSim */, 76B70F752B0D359D009D87A4 /* MiniSimTests */, 766BD2312981628A0042261B /* Products */, + 765077C42C46F04A00C7B5F3 /* Frameworks */, ); sourceTree = ""; }; @@ -425,13 +433,13 @@ ); name = MiniSim; packageProductDependencies = ( - 7630B26029853EF400D8B57D /* Preferences */, 7630B26A2986B4D500D8B57D /* KeyboardShortcuts */, 7630B26F2986C0F200D8B57D /* LaunchAtLogin */, 76F04A13298A62CF00BF9CA3 /* ShellOut */, 768F8EC729954C8A00DFBCDB /* Sparkle */, 76AC9AF82A0EB50800864A8B /* SymbolPicker */, 763EEB122A26896B008428F1 /* CodeEditor */, + 765077C52C46F04A00C7B5F3 /* Settings */, ); productName = MiniSim; productReference = 766BD2302981628A0042261B /* MiniSim.app */; @@ -485,7 +493,6 @@ ); mainGroup = 766BD2272981628A0042261B; packageReferences = ( - 7630B25F29853EF400D8B57D /* XCRemoteSwiftPackageReference "Preferences" */, 7630B2692986B4D500D8B57D /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */, 7630B26E2986C0F200D8B57D /* XCRemoteSwiftPackageReference "LaunchAtLogin" */, 76F04A12298A62CF00BF9CA3 /* XCRemoteSwiftPackageReference "ShellOut" */, @@ -493,6 +500,7 @@ 76AC9AF72A0EB50800864A8B /* XCRemoteSwiftPackageReference "SymbolPicker" */, 763EEB112A26896B008428F1 /* XCRemoteSwiftPackageReference "CodeEditor" */, 4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */, + 76A5C3B72C46E4C40064118A /* XCRemoteSwiftPackageReference "Settings" */, ); productRefGroup = 766BD2312981628A0042261B /* Products */; projectDirPath = ""; @@ -927,14 +935,6 @@ minimumVersion = 0.54.0; }; }; - 7630B25F29853EF400D8B57D /* XCRemoteSwiftPackageReference "Preferences" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/sindresorhus/Preferences"; - requirement = { - branch = main; - kind = branch; - }; - }; 7630B2692986B4D500D8B57D /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/sindresorhus/KeyboardShortcuts"; @@ -967,6 +967,14 @@ minimumVersion = 2.0.0; }; }; + 76A5C3B72C46E4C40064118A /* XCRemoteSwiftPackageReference "Settings" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/sindresorhus/Settings"; + requirement = { + branch = main; + kind = branch; + }; + }; 76AC9AF72A0EB50800864A8B /* XCRemoteSwiftPackageReference "SymbolPicker" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/xnth97/SymbolPicker.git"; @@ -991,11 +999,6 @@ package = 4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */; productName = "plugin:SwiftLintPlugin"; }; - 7630B26029853EF400D8B57D /* Preferences */ = { - isa = XCSwiftPackageProductDependency; - package = 7630B25F29853EF400D8B57D /* XCRemoteSwiftPackageReference "Preferences" */; - productName = Preferences; - }; 7630B26A2986B4D500D8B57D /* KeyboardShortcuts */ = { isa = XCSwiftPackageProductDependency; package = 7630B2692986B4D500D8B57D /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */; @@ -1011,6 +1014,11 @@ package = 763EEB112A26896B008428F1 /* XCRemoteSwiftPackageReference "CodeEditor" */; productName = CodeEditor; }; + 765077C52C46F04A00C7B5F3 /* Settings */ = { + isa = XCSwiftPackageProductDependency; + package = 76A5C3B72C46E4C40064118A /* XCRemoteSwiftPackageReference "Settings" */; + productName = Settings; + }; 768F8EC729954C8A00DFBCDB /* Sparkle */ = { isa = XCSwiftPackageProductDependency; package = 768F8EC629954C8A00DFBCDB /* XCRemoteSwiftPackageReference "Sparkle" */; diff --git a/MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3cb74e2..80c2aca 100644 --- a/MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,12 +1,13 @@ { + "originHash" : "0f54c1839af540375e74773a085736f629e4bd164fe1acab202e049e59f9fc7b", "pins" : [ { "identity" : "codeeditor", "kind" : "remoteSourceControl", "location" : "https://github.com/ZeeZide/CodeEditor.git", "state" : { - "revision" : "180bde07b44dea839b32873bd8586ba146fa9106", - "version" : "1.2.2" + "revision" : "f5c076b94f4ceb05abff88ba91d75a8d57143f0c", + "version" : "1.2.6" } }, { @@ -23,17 +24,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", "state" : { - "revision" : "db51c407d3be4a051484a141bf0bff36c43d3b1e", - "version" : "1.8.0" + "revision" : "c9c3df6ab812de32bae61fc0cd1bf6d45170ebf0", + "version" : "1.8.2" } }, { "identity" : "highlightr", "kind" : "remoteSourceControl", - "location" : "https://github.com/raspu/Highlightr", + "location" : "https://github.com/helje5/Highlightr", "state" : { - "revision" : "93199b9e434f04bda956a613af8f571933f9f037", - "version" : "2.1.2" + "revision" : "bd0358056ff1f12ea83833a9fc1b3b5a396a9da0", + "version" : "3.0.2" } }, { @@ -42,7 +43,7 @@ "location" : "https://github.com/sindresorhus/KeyboardShortcuts", "state" : { "branch" : "main", - "revision" : "d7b349f6822e24228141e560aa48a32dca23b22c" + "revision" : "2e5f15581fefb821d4b366e57d817be8bf12aa58" } }, { @@ -51,16 +52,16 @@ "location" : "https://github.com/sindresorhus/LaunchAtLogin", "state" : { "branch" : "main", - "revision" : "7ad6331f9c38953eb1ce8737758e18f7607e984a" + "revision" : "9a894d799269cb591037f9f9cb0961510d4dca81" } }, { - "identity" : "preferences", + "identity" : "settings", "kind" : "remoteSourceControl", - "location" : "https://github.com/sindresorhus/Preferences", + "location" : "https://github.com/sindresorhus/Settings", "state" : { "branch" : "main", - "revision" : "00342137c16b1351408669ca88be60036aa7e343" + "revision" : "879ea83a7bbc6dbebf62bed8c547f090146372a6" } }, { @@ -77,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jpsim/SourceKitten.git", "state" : { - "revision" : "b6dc09ee51dfb0c66e042d2328c017483a1a5d56", - "version" : "0.34.1" + "revision" : "fd4df99170f5e9d7cf9aa8312aa8506e0e7a44e7", + "version" : "0.35.0" } }, { @@ -86,8 +87,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/sparkle-project/Sparkle", "state" : { - "revision" : "9d85a02fe7916caa7531847452c4933d331503a5", - "version" : "2.3.1" + "revision" : "0ef1ee0220239b3776f433314515fd849025673f", + "version" : "2.6.4" } }, { @@ -95,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531", - "version" : "1.2.3" + "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b", + "version" : "1.4.0" } }, { @@ -104,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version" : "509.0.2" + "revision" : "303e5c5c36d6a558407d364878df131c3546fad8", + "version" : "510.0.2" } }, { @@ -113,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/SwiftLint.git", "state" : { - "revision" : "f17a4f9dfb6a6afb0408426354e4180daaf49cee", - "version" : "0.54.0" + "revision" : "b515723b16eba33f15c4677ee65f3fef2ce8c255", + "version" : "0.55.1" } }, { @@ -140,8 +141,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/xnth97/SymbolPicker.git", "state" : { - "revision" : "1e81757fc81fdee86f48d101eab0d0f8e9e0ec3d", - "version" : "1.4.2" + "revision" : "f82b64bcc3d761c9e63aaa10b1912bba72cbf6d8", + "version" : "1.5.3" } }, { @@ -149,10 +150,10 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jpsim/Yams.git", "state" : { - "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3", - "version" : "5.0.6" + "revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d", + "version" : "5.1.3" } } ], - "version" : 2 + "version" : 3 } diff --git a/MiniSim/Extensions/PaneIdentifier.swift b/MiniSim/Extensions/PaneIdentifier.swift index 8985dab..91dee1b 100644 --- a/MiniSim/Extensions/PaneIdentifier.swift +++ b/MiniSim/Extensions/PaneIdentifier.swift @@ -5,7 +5,7 @@ // Created by Oskar Kwaśniewski on 29/01/2023. // -import Preferences +import Settings extension Settings.PaneIdentifier { static let preferences = Self("preferences") diff --git a/MiniSim/MiniSim.swift b/MiniSim/MiniSim.swift index 9092023..152f145 100644 --- a/MiniSim/MiniSim.swift +++ b/MiniSim/MiniSim.swift @@ -6,7 +6,7 @@ // import AppKit -import Preferences +import Settings import SwiftUI import UserNotifications diff --git a/MiniSim/Views/Devices.swift b/MiniSim/Views/Devices.swift index a79645e..2a07853 100644 --- a/MiniSim/Views/Devices.swift +++ b/MiniSim/Views/Devices.swift @@ -5,7 +5,6 @@ // Created by Oskar Kwasniewski on 12/03/2023. // -import Preferences import SwiftUI struct Devices: View { diff --git a/MiniSim/Views/Preferences.swift b/MiniSim/Views/Preferences.swift index e58cd0a..00ed966 100644 --- a/MiniSim/Views/Preferences.swift +++ b/MiniSim/Views/Preferences.swift @@ -7,7 +7,7 @@ import KeyboardShortcuts import LaunchAtLogin -import Preferences +import Settings import ShellOut import SwiftUI struct Preferences: View {