From 202212f4173723ade4cdfd1010e2294837a4df57 Mon Sep 17 00:00:00 2001 From: Matt Kiazyk Date: Tue, 26 Jan 2021 22:45:43 -0600 Subject: [PATCH 1/4] Updates PreferencesView To use built in Settings Scene --- Xcodes.xcodeproj/project.pbxproj | 4 ++ .../Preferences/AdvancedPreferencePane.swift | 4 -- .../Preferences/GeneralPreferencePane.swift | 6 +-- .../Preferences/PreferencesView.swift | 31 +++++++++++++ .../Preferences/UpdatesPreferencePane.swift | 4 -- Xcodes/XcodesApp.swift | 45 +++---------------- 6 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 Xcodes/Frontend/Preferences/PreferencesView.swift diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index 9d54250..e016f2f 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -100,6 +100,7 @@ CAFE4AB425B7D3AF0064FE51 /* AdvancedPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4AB325B7D3AF0064FE51 /* AdvancedPreferencePane.swift */; }; CAFE4ABC25B7D54B0064FE51 /* UpdatesPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */; }; CAFFFED8259CDA5000903F81 /* XcodeListViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */; }; + E8977EA325C11E1500835F80 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8977EA225C11E1500835F80 /* PreferencesView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -260,6 +261,7 @@ CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdatesPreferencePane.swift; sourceTree = ""; }; CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeListViewRow.swift; sourceTree = ""; }; CAFFFEEE259CEAC400903F81 /* RingProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RingProgressViewStyle.swift; sourceTree = ""; }; + E8977EA225C11E1500835F80 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -542,6 +544,7 @@ CAFE4AB325B7D3AF0064FE51 /* AdvancedPreferencePane.swift */, CAFE4AAB25B7D2C70064FE51 /* GeneralPreferencePane.swift */, CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */, + E8977EA225C11E1500835F80 /* PreferencesView.swift */, ); path = Preferences; sourceTree = ""; @@ -794,6 +797,7 @@ CAE424B4259A764700B8B246 /* AppState+Install.swift in Sources */, CAE42487259A68A300B8B246 /* XcodeListCategory.swift in Sources */, CAA858C425A2BE4E00ACF8C0 /* Downloader.swift in Sources */, + E8977EA325C11E1500835F80 /* PreferencesView.swift in Sources */, CA9FF87B2595293E00E47BAF /* DataSource.swift in Sources */, CABFA9C92592EEEA00380FEE /* URLRequest+Apple.swift in Sources */, CABFAA432593104F00380FEE /* AboutView.swift in Sources */, diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index 42a162e..1b1d90d 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -2,10 +2,6 @@ import AppleAPI import Preferences import SwiftUI -extension Preferences.PaneIdentifier { - static let advanced = Self("advanced") -} - struct AdvancedPreferencePane: View { @EnvironmentObject var appState: AppState @AppStorage("dataSource") var dataSource: DataSource = .xcodeReleases diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift index ac74ee7..2bb7e81 100644 --- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift @@ -2,13 +2,9 @@ import AppleAPI import Preferences import SwiftUI -extension Preferences.PaneIdentifier { - static let general = Self("general") -} - struct GeneralPreferencePane: View { @EnvironmentObject var appState: AppState - + var body: some View { Preferences.Container(contentWidth: 400.0) { Preferences.Section(title: "Apple ID") { diff --git a/Xcodes/Frontend/Preferences/PreferencesView.swift b/Xcodes/Frontend/Preferences/PreferencesView.swift new file mode 100644 index 0000000..8e896aa --- /dev/null +++ b/Xcodes/Frontend/Preferences/PreferencesView.swift @@ -0,0 +1,31 @@ +import SwiftUI + +struct PreferencesView: View { + private enum Tabs: Hashable { + case general, updates, advanced + } + @EnvironmentObject var appState: AppState + + var body: some View { + TabView { + GeneralPreferencePane() + .environmentObject(appState) + .tabItem { + Label("General", systemImage: "gearshape") + } + .tag(Tabs.general) + UpdatesPreferencePane() + .tabItem { + Label("Updates", systemImage: "arrow.triangle.2.circlepath.circle") + } + .tag(Tabs.updates) + AdvancedPreferencePane() + .environmentObject(appState) + .tabItem { + Label("Advanced", systemImage: "gearshape.2") + } + .tag(Tabs.advanced) + } + .padding(20) + } +} diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift index 58a6c87..4a29e6e 100644 --- a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift @@ -3,10 +3,6 @@ import Preferences import Sparkle import SwiftUI -extension Preferences.PaneIdentifier { - static let updates = Self("updates") -} - struct UpdatesPreferencePane: View { @StateObject var updater = ObservableUpdater() diff --git a/Xcodes/XcodesApp.swift b/Xcodes/XcodesApp.swift index 4a8ab64..188fbe9 100644 --- a/Xcodes/XcodesApp.swift +++ b/Xcodes/XcodesApp.swift @@ -36,13 +36,7 @@ struct XcodesApp: App { appDelegate.checkForUpdates() } } - CommandGroup(replacing: .appSettings) { - Button("Preferences...") { - showPreferencesWindow() - } - .keyboardShortcut(KeyEquivalent(","), modifiers: .command) - } - + CommandGroup(after: CommandGroupPlacement.newItem) { Button("Refresh") { appState.update() @@ -72,37 +66,12 @@ struct XcodesApp: App { } } } - } - - private func showPreferencesWindow() { - PreferencesWindowController( - panes: [ - Preferences.Pane( - identifier: .general, - title: "General", - toolbarIcon: NSImage(systemSymbolName: "gearshape", accessibilityDescription: "General")! - ) { - GeneralPreferencePane() - .environmentObject(appState) - }, - Preferences.Pane( - identifier: .updates, - title: "Updates", - toolbarIcon: NSImage(systemSymbolName: "arrow.triangle.2.circlepath.circle", accessibilityDescription: "Updates")! - ) { - UpdatesPreferencePane() - }, - Preferences.Pane( - identifier: .advanced, - title: "Advanced", - toolbarIcon: NSImage(systemSymbolName: "gearshape.2", accessibilityDescription: "Advanced")! - ) { - AdvancedPreferencePane() - .environmentObject(appState) - }, - ] - ) - .show() + #if os(macOS) + Settings { + PreferencesView() + .environmentObject(appState) + } + #endif } } From a740b3be08f84f638dcf8cffbe1c29d932302061 Mon Sep 17 00:00:00 2001 From: Matt Kiazyk Date: Wed, 27 Jan 2021 21:38:22 -0600 Subject: [PATCH 2/4] Remove Preferences dependency. Adjust Settings UI with groups --- Xcodes.xcodeproj/project.pbxproj | 17 -------- .../xcshareddata/swiftpm/Package.resolved | 9 ---- .../Preferences/AdvancedPreferencePane.swift | 36 ++++++++++++---- .../Preferences/GeneralPreferencePane.swift | 30 ++++++------- .../Preferences/UpdatesPreferencePane.swift | 43 +++++++++---------- Xcodes/XcodesApp.swift | 1 - 6 files changed, 64 insertions(+), 72 deletions(-) diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index e016f2f..88c61ec 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -95,7 +95,6 @@ CAFBDC68259A308B003DCC5A /* InfoPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC67259A308B003DCC5A /* InfoPane.swift */; }; CAFBDC6C259A3098003DCC5A /* View+Conditional.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC6B259A3098003DCC5A /* View+Conditional.swift */; }; CAFE4A9A25B7C7A30064FE51 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = CAFE4A9925B7C7A30064FE51 /* Sparkle */; }; - CAFE4AA325B7CF960064FE51 /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = CAFE4AA225B7CF960064FE51 /* Preferences */; }; CAFE4AAC25B7D2C70064FE51 /* GeneralPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4AAB25B7D2C70064FE51 /* GeneralPreferencePane.swift */; }; CAFE4AB425B7D3AF0064FE51 /* AdvancedPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4AB325B7D3AF0064FE51 /* AdvancedPreferencePane.swift */; }; CAFE4ABC25B7D54B0064FE51 /* UpdatesPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */; }; @@ -277,7 +276,6 @@ buildActionMask = 2147483647; files = ( CAFE4A9A25B7C7A30064FE51 /* Sparkle in Frameworks */, - CAFE4AA325B7CF960064FE51 /* Preferences in Frameworks */, CABFA9E42592F08E00380FEE /* Version in Frameworks */, CABFA9FD2592F13300380FEE /* LegibleError in Frameworks */, CA9FF86D25951C6E00E47BAF /* XCModel in Frameworks */, @@ -596,7 +594,6 @@ CA9FF86C25951C6E00E47BAF /* XCModel */, CAA858CC25A3D8BC00ACF8C0 /* ErrorHandling */, CAFE4A9925B7C7A30064FE51 /* Sparkle */, - CAFE4AA225B7CF960064FE51 /* Preferences */, ); productName = XcodesMac; productReference = CAD2E79E2449574E00113D76 /* Xcodes.app */; @@ -664,7 +661,6 @@ CAA858CB25A3D8BC00ACF8C0 /* XCRemoteSwiftPackageReference "ErrorHandling" */, CAC28186259EE27200B8AB0B /* XCRemoteSwiftPackageReference "CombineExpectations" */, CAFE4A9825B7C7A30064FE51 /* XCRemoteSwiftPackageReference "Sparkle" */, - CAFE4AA125B7CF960064FE51 /* XCRemoteSwiftPackageReference "Preferences" */, ); productRefGroup = CAD2E79F2449574E00113D76 /* Products */; projectDirPath = ""; @@ -1341,14 +1337,6 @@ version = "1.24.0-spm"; }; }; - CAFE4AA125B7CF960064FE51 /* XCRemoteSwiftPackageReference "Preferences" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/sindresorhus/Preferences"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 2.2.0; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1401,11 +1389,6 @@ package = CAFE4A9825B7C7A30064FE51 /* XCRemoteSwiftPackageReference "Sparkle" */; productName = Sparkle; }; - CAFE4AA225B7CF960064FE51 /* Preferences */ = { - isa = XCSwiftPackageProductDependency; - package = CAFE4AA125B7CF960064FE51 /* XCRemoteSwiftPackageReference "Preferences" */; - productName = Preferences; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = CAD2E7962449574E00113D76 /* Project object */; diff --git a/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 525b323..c92db7b 100644 --- a/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -55,15 +55,6 @@ "version": "0.16.3" } }, - { - "package": "Preferences", - "repositoryURL": "https://github.com/sindresorhus/Preferences", - "state": { - "branch": null, - "revision": "4802a493acef50c814e4eb63e9a44e0941ec8883", - "version": "2.2.0" - } - }, { "package": "Sparkle", "repositoryURL": "https://github.com/sparkle-project/Sparkle/", diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index 1b1d90d..95df7ac 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -1,5 +1,4 @@ import AppleAPI -import Preferences import SwiftUI struct AdvancedPreferencePane: View { @@ -8,8 +7,8 @@ struct AdvancedPreferencePane: View { @AppStorage("downloader") var downloader: Downloader = .aria2 var body: some View { - Preferences.Container(contentWidth: 400.0) { - Preferences.Section(title: "Data Source") { + VStack(alignment: .leading, spacing: 20) { + GroupBox(label: Text("DataSource")) { VStack(alignment: .leading) { Picker("Data Source", selection: $dataSource) { ForEach(DataSource.allCases) { dataSource in @@ -21,10 +20,11 @@ struct AdvancedPreferencePane: View { AttributedText(dataSourceFootnote) } - .frame(maxWidth: .infinity, alignment: .leading) + } + .groupBoxStyle(PreferencesGroupBoxStyle()) - Preferences.Section(title: "Downloader") { + GroupBox(label: Text("Downloader")) { VStack(alignment: .leading) { Picker("Downloader", selection: $downloader) { ForEach(Downloader.allCases) { downloader in @@ -36,10 +36,11 @@ struct AdvancedPreferencePane: View { AttributedText(downloaderFootnote) } - .frame(maxWidth: .infinity, alignment: .leading) + } + .groupBoxStyle(PreferencesGroupBoxStyle()) - Preferences.Section(title: "Privileged Helper") { + GroupBox(label: Text("Privileged Helper")) { VStack(alignment: .leading, spacing: 8) { switch appState.helperInstallState { case .unknown: @@ -63,8 +64,10 @@ struct AdvancedPreferencePane: View { Spacer() } } + .groupBoxStyle(PreferencesGroupBoxStyle()) } - .padding(.trailing) + .padding() + .frame(width: 500) } private var dataSourceFootnote: NSAttributedString { @@ -110,3 +113,20 @@ struct AdvancedPreferencePane_Previews: PreviewProvider { } } } + +// A group style for the preferences +struct PreferencesGroupBoxStyle: GroupBoxStyle { + func makeBody(configuration: Configuration) -> some View { + HStack(alignment: .top, spacing: 20) { + HStack { + Spacer() + configuration.label + } + .frame(width: 120) + + VStack(alignment: .leading) { + configuration.content + } + } + } +} diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift index 2bb7e81..a8a1ebe 100644 --- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift @@ -1,36 +1,36 @@ import AppleAPI -import Preferences import SwiftUI struct GeneralPreferencePane: View { @EnvironmentObject var appState: AppState var body: some View { - Preferences.Container(contentWidth: 400.0) { - Preferences.Section(title: "Apple ID") { - VStack(alignment: .leading) { + VStack(alignment: .leading) { + GroupBox(label: Text("Apple ID")) { // If we have saved a username then we will show it here, // even if we don't have a valid session right now, // because we should be able to get a valid session if needed with the password in the keychain // and a 2FA code from the user. // Note that AppState.authenticationState is not necessarily .authenticated in this case, though. if let username = Current.defaults.string(forKey: "username") { - Text(username) - Button("Sign Out", action: appState.signOut) + HStack(alignment:.top, spacing: 10) { + Text(username) + Button("Sign Out", action: appState.signOut) + } + .frame(maxWidth: .infinity, alignment: .leading) } else { Button("Sign In", action: { self.appState.presentingSignInAlert = true }) + .frame(maxWidth: .infinity, alignment: .leading) } - - Spacer() - } - .frame(maxWidth: .infinity, alignment: .leading) - .sheet(isPresented: $appState.presentingSignInAlert) { - SignInCredentialsView(isPresented: $appState.presentingSignInAlert) - .environmentObject(appState) - } + } + .groupBoxStyle(PreferencesGroupBoxStyle()) + .sheet(isPresented: $appState.presentingSignInAlert) { + SignInCredentialsView(isPresented: $appState.presentingSignInAlert) + .environmentObject(appState) } } - .padding(.trailing) + .padding() + .frame(width: 500) } } diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift index 4a29e6e..c557f6c 100644 --- a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift @@ -1,5 +1,4 @@ import AppleAPI -import Preferences import Sparkle import SwiftUI @@ -7,30 +6,30 @@ struct UpdatesPreferencePane: View { @StateObject var updater = ObservableUpdater() var body: some View { - Preferences.Container(contentWidth: 400.0) { - Preferences.Section(title: "Updates") { - VStack(alignment: .leading) { - Toggle( - "Automatically check for app updates", - isOn: $updater.automaticallyChecksForUpdates - ) - - Toggle( - "Include prerelease app versions", - isOn: $updater.includePrereleaseVersions - ) - - Button("Check Now") { - SUUpdater.shared()?.checkForUpdates(nil) - } - - Text("Last checked: \(lastUpdatedString)") - .font(.footnote) + GroupBox(label: Text("Updates")) { + VStack(alignment: .leading) { + Toggle( + "Automatically check for app updates", + isOn: $updater.automaticallyChecksForUpdates + ) + + Toggle( + "Include prerelease app versions", + isOn: $updater.includePrereleaseVersions + ) + + Button("Check Now") { + SUUpdater.shared()?.checkForUpdates(nil) } - .frame(maxWidth: .infinity, alignment: .leading) + + Text("Last checked: \(lastUpdatedString)") + .font(.footnote) } + .frame(maxWidth: .infinity, alignment: .leading) } - .padding(.trailing) + .groupBoxStyle(PreferencesGroupBoxStyle()) + .padding() + .frame(width: 500) } private var lastUpdatedString: String { diff --git a/Xcodes/XcodesApp.swift b/Xcodes/XcodesApp.swift index 188fbe9..76f5186 100644 --- a/Xcodes/XcodesApp.swift +++ b/Xcodes/XcodesApp.swift @@ -1,5 +1,4 @@ import AppKit -import Preferences import Sparkle import SwiftUI From e6ee43a169f3d76871356b29807eeb8e57c96dfd Mon Sep 17 00:00:00 2001 From: Matt Kiazyk Date: Thu, 28 Jan 2021 10:48:56 -0600 Subject: [PATCH 3/4] Preferences UI adjustments --- Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift | 5 ++--- Xcodes/Frontend/Preferences/GeneralPreferencePane.swift | 3 +-- Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index 95df7ac..9606456 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -8,7 +8,7 @@ struct AdvancedPreferencePane: View { var body: some View { VStack(alignment: .leading, spacing: 20) { - GroupBox(label: Text("DataSource")) { + GroupBox(label: Text("Data Source")) { VStack(alignment: .leading) { Picker("Data Source", selection: $dataSource) { ForEach(DataSource.allCases) { dataSource in @@ -66,8 +66,7 @@ struct AdvancedPreferencePane: View { } .groupBoxStyle(PreferencesGroupBoxStyle()) } - .padding() - .frame(width: 500) + .frame(width: 400) } private var dataSourceFootnote: NSAttributedString { diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift index a8a1ebe..a251bfd 100644 --- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift @@ -29,8 +29,7 @@ struct GeneralPreferencePane: View { .environmentObject(appState) } } - .padding() - .frame(width: 500) + .frame(width: 400) } } diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift index c557f6c..48cfccd 100644 --- a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift @@ -28,8 +28,7 @@ struct UpdatesPreferencePane: View { .frame(maxWidth: .infinity, alignment: .leading) } .groupBoxStyle(PreferencesGroupBoxStyle()) - .padding() - .frame(width: 500) + .frame(width: 400) } private var lastUpdatedString: String { From 385f740c423403e6fc749c1d45c1d3bbc95f12cc Mon Sep 17 00:00:00 2001 From: Matt Kiazyk Date: Thu, 28 Jan 2021 10:55:11 -0600 Subject: [PATCH 4/4] Reset spm cache to correctly create license file --- Xcodes/Resources/Licenses.rtf | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Xcodes/Resources/Licenses.rtf b/Xcodes/Resources/Licenses.rtf index 9636214..cc81dc2 100644 --- a/Xcodes/Resources/Licenses.rtf +++ b/Xcodes/Resources/Licenses.rtf @@ -4,22 +4,7 @@ {\*\expandedcolortbl;;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 -\f0\fs34 \cf0 Preferences\ -\ - -\fs26 MIT License\ -\ -Copyright (c) Sindre Sorhus (sindresorhus.com)\ -\ -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\ -\ -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\ -\ -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\ -\ -\ - -\fs34 SwiftSoup\ +\f0\fs34 \cf0 SwiftSoup\ \ \fs26 MIT License\