diff --git a/ModuleKit/Supporting Files/Assets.xcassets/Contents.json b/Kit/Supporting Files/Assets.xcassets/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/Contents.json rename to Kit/Supporting Files/Assets.xcassets/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/Contents.json b/Kit/Supporting Files/Assets.xcassets/chart.imageset/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/Contents.json rename to Kit/Supporting Files/Assets.xcassets/chart.imageset/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_1x.png b/Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_1x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_1x.png rename to Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_1x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_2x.png b/Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_2x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_2x.png rename to Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_2x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_3x.png b/Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_3x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_3x.png rename to Kit/Supporting Files/Assets.xcassets/chart.imageset/baseline_insert_chart_outlined_white_24pt_3x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/close.imageset/Contents.json b/Kit/Supporting Files/Assets.xcassets/close.imageset/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/close.imageset/Contents.json rename to Kit/Supporting Files/Assets.xcassets/close.imageset/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_1x.png b/Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_1x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_1x.png rename to Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_1x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_2x.png b/Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_2x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_2x.png rename to Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_2x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_3x.png b/Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_3x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_3x.png rename to Kit/Supporting Files/Assets.xcassets/close.imageset/baseline_cancel_white_24pt_3x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/Contents.json b/Kit/Supporting Files/Assets.xcassets/refresh.imageset/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/Contents.json rename to Kit/Supporting Files/Assets.xcassets/refresh.imageset/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_1x.png b/Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_1x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_1x.png rename to Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_1x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_2x.png b/Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_2x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_2x.png rename to Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_2x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_3x.png b/Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_3x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_3x.png rename to Kit/Supporting Files/Assets.xcassets/refresh.imageset/outline_refresh_black_18pt_3x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/Contents.json b/Kit/Supporting Files/Assets.xcassets/settings.imageset/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/Contents.json rename to Kit/Supporting Files/Assets.xcassets/settings.imageset/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_1x.png b/Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_1x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_1x.png rename to Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_1x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_2x.png b/Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_2x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_2x.png rename to Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_2x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_3x.png b/Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_3x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_3x.png rename to Kit/Supporting Files/Assets.xcassets/settings.imageset/baseline_settings_black_24pt_3x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/Contents.json b/Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/Contents.json similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/Contents.json rename to Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/Contents.json diff --git a/ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_1x.png b/Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_1x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_1x.png rename to Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_1x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_2x.png b/Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_2x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_2x.png rename to Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_2x.png diff --git a/ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_3x.png b/Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_3x.png similarity index 100% rename from ModuleKit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_3x.png rename to Kit/Supporting Files/Assets.xcassets/widget_settings.imageset/baseline_settings_white_18pt_3x.png diff --git a/ModuleKit/Supporting Files/Info.plist b/Kit/Supporting Files/Info.plist similarity index 92% rename from ModuleKit/Supporting Files/Info.plist rename to Kit/Supporting Files/Info.plist index 20202aa7..85e3d697 100644 --- a/ModuleKit/Supporting Files/Info.plist +++ b/Kit/Supporting Files/Info.plist @@ -19,6 +19,6 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. + Copyright © 2021 Serhiy Mytrovtsiy. All rights reserved. diff --git a/ModuleKit/Widgets/BarChart.swift b/Kit/Widgets/BarChart.swift similarity index 99% rename from ModuleKit/Widgets/BarChart.swift rename to Kit/Widgets/BarChart.swift index c7862d57..0d3658a5 100644 --- a/ModuleKit/Widgets/BarChart.swift +++ b/Kit/Widgets/BarChart.swift @@ -1,6 +1,6 @@ // // BarChart.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 26/04/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class BarChart: WidgetWrapper { private var labelState: Bool = false diff --git a/ModuleKit/Widgets/Battery.swift b/Kit/Widgets/Battery.swift similarity index 99% rename from ModuleKit/Widgets/Battery.swift rename to Kit/Widgets/Battery.swift index c069d7de..d13b706b 100644 --- a/ModuleKit/Widgets/Battery.swift +++ b/Kit/Widgets/Battery.swift @@ -1,6 +1,6 @@ // // Battery.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 06/06/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class BatterykWidget: WidgetWrapper { private var additional: String = "none" diff --git a/ModuleKit/Widgets/Label.swift b/Kit/Widgets/Label.swift similarity index 98% rename from ModuleKit/Widgets/Label.swift rename to Kit/Widgets/Label.swift index b6b8f6d0..33e65eeb 100644 --- a/ModuleKit/Widgets/Label.swift +++ b/Kit/Widgets/Label.swift @@ -1,6 +1,6 @@ // // Label.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 30/03/2021. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class Label: WidgetWrapper { private var label: String diff --git a/ModuleKit/Widgets/LineChart.swift b/Kit/Widgets/LineChart.swift similarity index 99% rename from ModuleKit/Widgets/LineChart.swift rename to Kit/Widgets/LineChart.swift index 5ef72fba..40cb7220 100644 --- a/ModuleKit/Widgets/LineChart.swift +++ b/Kit/Widgets/LineChart.swift @@ -1,6 +1,6 @@ // // Chart.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 18/04/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class LineChart: WidgetWrapper { private var labelState: Bool = false diff --git a/ModuleKit/Widgets/Memory.swift b/Kit/Widgets/Memory.swift similarity index 99% rename from ModuleKit/Widgets/Memory.swift rename to Kit/Widgets/Memory.swift index 22a86b2e..75ec0181 100644 --- a/ModuleKit/Widgets/Memory.swift +++ b/Kit/Widgets/Memory.swift @@ -1,6 +1,6 @@ // // Memory.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 30/06/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class MemoryWidget: WidgetWrapper { private var orderReversedState: Bool = false diff --git a/ModuleKit/Widgets/Mini.swift b/Kit/Widgets/Mini.swift similarity index 99% rename from ModuleKit/Widgets/Mini.swift rename to Kit/Widgets/Mini.swift index 76618ec2..9e37afbe 100644 --- a/ModuleKit/Widgets/Mini.swift +++ b/Kit/Widgets/Mini.swift @@ -1,6 +1,6 @@ // // Mini.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class Mini: WidgetWrapper { private var labelState: Bool = true diff --git a/ModuleKit/Widgets/NetworkChart.swift b/Kit/Widgets/NetworkChart.swift similarity index 99% rename from ModuleKit/Widgets/NetworkChart.swift rename to Kit/Widgets/NetworkChart.swift index 8d4946f3..e78a7308 100644 --- a/ModuleKit/Widgets/NetworkChart.swift +++ b/Kit/Widgets/NetworkChart.swift @@ -1,6 +1,6 @@ // // NetworkChart.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 19/01/2021. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class NetworkChart: WidgetWrapper { private var boxState: Bool = false diff --git a/ModuleKit/Widgets/PieChart.swift b/Kit/Widgets/PieChart.swift similarity index 99% rename from ModuleKit/Widgets/PieChart.swift rename to Kit/Widgets/PieChart.swift index 193cc1e7..a64684de 100644 --- a/ModuleKit/Widgets/PieChart.swift +++ b/Kit/Widgets/PieChart.swift @@ -1,6 +1,6 @@ // // PieChart.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 30/11/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class PieChart: WidgetWrapper { private var labelState: Bool = false diff --git a/ModuleKit/Widgets/Sensors.swift b/Kit/Widgets/Sensors.swift similarity index 91% rename from ModuleKit/Widgets/Sensors.swift rename to Kit/Widgets/Sensors.swift index 556899de..a0646113 100644 --- a/ModuleKit/Widgets/Sensors.swift +++ b/Kit/Widgets/Sensors.swift @@ -1,6 +1,6 @@ // // Sensors.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 17/06/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class SensorsWidget: WidgetWrapper { private var modeState: String = "automatic" @@ -186,20 +185,20 @@ public class SensorsWidget: WidgetWrapper { public override func settings(width: CGFloat) -> NSView { let view = SettingsContainerView(width: width) - view.addArrangedSubview(selectRow( - frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row), - title: localizedString("Display mode"), - action: #selector(changeMode), - items: SensorsWidgetMode, - selected: self.modeState - )) - - view.addArrangedSubview(toggleTitleRow( - frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row), - title: localizedString("Static width"), - action: #selector(toggleSize), - state: self.fixedSizeState - )) +// view.addArrangedSubview(selectRow( +// frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row), +// title: localizedString("Display mode"), +// action: #selector(changeMode), +// items: SensorsWidgetMode, +// selected: self.modeState +// )) +// +// view.addArrangedSubview(toggleTitleRow( +// frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row), +// title: localizedString("Static width"), +// action: #selector(toggleSize), +// state: self.fixedSizeState +// )) return view } diff --git a/ModuleKit/Widgets/Speed.swift b/Kit/Widgets/Speed.swift similarity index 99% rename from ModuleKit/Widgets/Speed.swift rename to Kit/Widgets/Speed.swift index 4562719c..4c5ded6e 100644 --- a/ModuleKit/Widgets/Speed.swift +++ b/Kit/Widgets/Speed.swift @@ -1,6 +1,6 @@ // // Speed.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 24/05/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public class SpeedWidget: WidgetWrapper { private var icon: String = "dots" diff --git a/StatsKit/constants.swift b/Kit/constants.swift similarity index 99% rename from StatsKit/constants.swift rename to Kit/constants.swift index e8ef1ca3..499bc03a 100644 --- a/StatsKit/constants.swift +++ b/Kit/constants.swift @@ -1,6 +1,6 @@ // // constants.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 15/04/2020. // Using Swift 5.0. diff --git a/StatsKit/extensions.swift b/Kit/extensions.swift similarity index 99% rename from StatsKit/extensions.swift rename to Kit/extensions.swift index 7187d218..5104b6cc 100644 --- a/StatsKit/extensions.swift +++ b/Kit/extensions.swift @@ -1,6 +1,6 @@ // // extensions.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2020. // Using Swift 5.0. diff --git a/StatsKit/helpers.swift b/Kit/helpers.swift similarity index 97% rename from StatsKit/helpers.swift rename to Kit/helpers.swift index d16d65af..433407cf 100644 --- a/StatsKit/helpers.swift +++ b/Kit/helpers.swift @@ -1,6 +1,6 @@ // // helpers.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 29/09/2020. // Using Swift 5.0. @@ -12,6 +12,26 @@ import Cocoa import os.log +import ServiceManagement + +public struct LaunchAtLogin { + private static let id = "\(Bundle.main.bundleIdentifier!).LaunchAtLogin" + + public static var isEnabled: Bool { + get { + guard let jobs = (SMCopyAllJobDictionaries(kSMDomainUserLaunchd).takeRetainedValue() as? [[String: AnyObject]]) else { + return false + } + + let job = jobs.first { $0["Label"] as! String == id } + + return job?["OnDemand"] as? Bool ?? false + } + set { + SMLoginItemSetEnabled(id as CFString, newValue) + } + } +} public protocol KeyValue_p { var key: String { get } diff --git a/ModuleKit/module.swift b/Kit/module/module.swift similarity index 99% rename from ModuleKit/module.swift rename to Kit/module/module.swift index 2e07ac9f..0e36e769 100644 --- a/ModuleKit/module.swift +++ b/Kit/module/module.swift @@ -1,6 +1,6 @@ // // module.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 09/04/2020. // Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. @@ -8,7 +8,6 @@ import Cocoa import os.log -import StatsKit public protocol Module_p { var available: Bool { get } diff --git a/ModuleKit/popup.swift b/Kit/module/popup.swift similarity index 99% rename from ModuleKit/popup.swift rename to Kit/module/popup.swift index 74e409fb..da034720 100644 --- a/ModuleKit/popup.swift +++ b/Kit/module/popup.swift @@ -1,6 +1,6 @@ // // popup.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 11/04/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public protocol Popup_p: NSView { var sizeCallback: ((NSSize) -> Void)? { get set } diff --git a/ModuleKit/reader.swift b/Kit/module/reader.swift similarity index 99% rename from ModuleKit/reader.swift rename to Kit/module/reader.swift index 8ff0c120..34289a88 100644 --- a/ModuleKit/reader.swift +++ b/Kit/module/reader.swift @@ -1,6 +1,6 @@ // // reader.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2020. // Using Swift 5.0. @@ -12,7 +12,6 @@ import Cocoa import Repeat import os.log -import StatsKit public protocol value_t { var widgetValue: Double { get } diff --git a/ModuleKit/settings.swift b/Kit/module/settings.swift similarity index 99% rename from ModuleKit/settings.swift rename to Kit/module/settings.swift index 70af7c40..cfdfc875 100644 --- a/ModuleKit/settings.swift +++ b/Kit/module/settings.swift @@ -1,6 +1,6 @@ // // settings.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 13/04/2020. // Using Swift 5.0. @@ -10,7 +10,6 @@ // import Cocoa -import StatsKit public protocol Settings_p: NSView { var toggleCallback: () -> Void { get set } diff --git a/ModuleKit/widget.swift b/Kit/module/widget.swift similarity index 99% rename from ModuleKit/widget.swift rename to Kit/module/widget.swift index 17c2ac51..376b2ca8 100644 --- a/ModuleKit/widget.swift +++ b/Kit/module/widget.swift @@ -1,6 +1,6 @@ // // widget.swift -// ModuleKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2020. // Using Swift 5.0. @@ -11,7 +11,6 @@ import Cocoa import os.log -import StatsKit public enum widget_t: String { case unknown = "" diff --git a/StatsKit/Charts.swift b/Kit/plugins/Charts.swift similarity index 99% rename from StatsKit/Charts.swift rename to Kit/plugins/Charts.swift index 513b5c50..0155b1e5 100644 --- a/StatsKit/Charts.swift +++ b/Kit/plugins/Charts.swift @@ -1,6 +1,6 @@ // // Chart.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 17/04/2020. // Using Swift 5.0. diff --git a/StatsKit/SMC.swift b/Kit/plugins/SMC.swift similarity index 99% rename from StatsKit/SMC.swift rename to Kit/plugins/SMC.swift index 02ada285..4ee1a9f7 100644 --- a/StatsKit/SMC.swift +++ b/Kit/plugins/SMC.swift @@ -1,6 +1,6 @@ // // SMC.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 05/04/2020. // Using Swift 5.0. diff --git a/StatsKit/store.swift b/Kit/plugins/Store.swift similarity index 99% rename from StatsKit/store.swift rename to Kit/plugins/Store.swift index 1d93dccd..59f9177a 100644 --- a/StatsKit/store.swift +++ b/Kit/plugins/Store.swift @@ -1,6 +1,6 @@ // // store.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2020. // Using Swift 5.0. diff --git a/StatsKit/SystemKit.swift b/Kit/plugins/SystemKit.swift similarity index 99% rename from StatsKit/SystemKit.swift rename to Kit/plugins/SystemKit.swift index 0ad73d2a..e805c3c9 100644 --- a/StatsKit/SystemKit.swift +++ b/Kit/plugins/SystemKit.swift @@ -1,6 +1,6 @@ // // SystemKit.swift -// Stats +// Kit // // Created by Serhiy Mytrovtsiy on 13/04/2020. // Using Swift 5.0. diff --git a/StatsKit/types.swift b/Kit/types.swift similarity index 99% rename from StatsKit/types.swift rename to Kit/types.swift index 3e774ba5..a6f1a103 100644 --- a/StatsKit/types.swift +++ b/Kit/types.swift @@ -1,6 +1,6 @@ // // types.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 10/04/2021. // Using Swift 5.0. diff --git a/StatsKit/updater.sh b/Kit/updater/updater.sh similarity index 100% rename from StatsKit/updater.sh rename to Kit/updater/updater.sh diff --git a/StatsKit/updater.swift b/Kit/updater/updater.swift similarity index 99% rename from StatsKit/updater.swift rename to Kit/updater/updater.swift index a6b11c3d..6f1878bc 100644 --- a/StatsKit/updater.swift +++ b/Kit/updater/updater.swift @@ -1,6 +1,6 @@ // // updater.swift -// StatsKit +// Kit // // Created by Serhiy Mytrovtsiy on 14/04/2020. // Using Swift 5.0. diff --git a/Modules/Battery/main.swift b/Modules/Battery/main.swift index 4b61cd6e..c47b5b30 100644 --- a/Modules/Battery/main.swift +++ b/Modules/Battery/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import IOKit.ps struct Battery_Usage: value_t { diff --git a/Modules/Battery/popup.swift b/Modules/Battery/popup.swift index d8f3d6c9..a8a5f198 100644 --- a/Modules/Battery/popup.swift +++ b/Modules/Battery/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSView, Popup_p { private var title: String diff --git a/Modules/Battery/readers.swift b/Modules/Battery/readers.swift index d31f9842..9d1b69cb 100644 --- a/Modules/Battery/readers.swift +++ b/Modules/Battery/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import os.log internal class UsageReader: Reader { diff --git a/Modules/Battery/settings.swift b/Modules/Battery/settings.swift index c4bbf940..97e68831 100644 --- a/Modules/Battery/settings.swift +++ b/Modules/Battery/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import SystemConfiguration internal class Settings: NSView, Settings_v { diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift index 338deb3f..42cd26e7 100644 --- a/Modules/CPU/main.swift +++ b/Modules/CPU/main.swift @@ -7,8 +7,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit public struct CPU_Load: value_t { var totalUsage: Double = 0 diff --git a/Modules/CPU/popup.swift b/Modules/CPU/popup.swift index fdeb6e78..466cea08 100644 --- a/Modules/CPU/popup.swift +++ b/Modules/CPU/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSView, Popup_p { private var title: String diff --git a/Modules/CPU/readers.swift b/Modules/CPU/readers.swift index 710b6167..c3061486 100644 --- a/Modules/CPU/readers.swift +++ b/Modules/CPU/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import os.log internal class LoadReader: Reader { diff --git a/Modules/CPU/settings.swift b/Modules/CPU/settings.swift index 0ba52688..9882cae4 100644 --- a/Modules/CPU/settings.swift +++ b/Modules/CPU/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSView, Settings_v { private var usagePerCoreState: Bool = false diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift index 851779fe..9b2ef0fe 100644 --- a/Modules/Disk/main.swift +++ b/Modules/Disk/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit public struct stats { var read: Int64 = 0 diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift index 0f7bcf59..a35527b7 100644 --- a/Modules/Disk/popup.swift +++ b/Modules/Disk/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSView, Popup_p { private let diskFullHeight: CGFloat = 62 diff --git a/Modules/Disk/readers.swift b/Modules/Disk/readers.swift index 67d6c3a2..825d2b93 100644 --- a/Modules/Disk/readers.swift +++ b/Modules/Disk/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit import IOKit import Darwin import os.log diff --git a/Modules/Disk/settings.swift b/Modules/Disk/settings.swift index 6d528718..7b84699a 100644 --- a/Modules/Disk/settings.swift +++ b/Modules/Disk/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSView, Settings_v { private var removableState: Bool = false diff --git a/Modules/Fans/main.swift b/Modules/Fans/main.swift index b302be91..16c461b8 100644 --- a/Modules/Fans/main.swift +++ b/Modules/Fans/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit public struct Fan { public let id: Int diff --git a/Modules/Fans/popup.swift b/Modules/Fans/popup.swift index 628ab3f2..c0e4f87a 100644 --- a/Modules/Fans/popup.swift +++ b/Modules/Fans/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSStackView, Popup_p { public var sizeCallback: ((NSSize) -> Void)? = nil diff --git a/Modules/Fans/readers.swift b/Modules/Fans/readers.swift index 95548bb8..994c659d 100644 --- a/Modules/Fans/readers.swift +++ b/Modules/Fans/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit import os.log internal class FansReader: Reader<[Fan]> { diff --git a/Modules/Fans/settings.swift b/Modules/Fans/settings.swift index 32325236..3fc4bd92 100644 --- a/Modules/Fans/settings.swift +++ b/Modules/Fans/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSStackView, Settings_v { private var updateIntervalValue: Int = 1 diff --git a/Modules/GPU/main.swift b/Modules/GPU/main.swift index 5c1fe52d..1a92eed1 100644 --- a/Modules/GPU/main.swift +++ b/Modules/GPU/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit public typealias GPU_type = String public enum GPU_types: GPU_type { diff --git a/Modules/GPU/popup.swift b/Modules/GPU/popup.swift index 99cde9cc..068b1512 100644 --- a/Modules/GPU/popup.swift +++ b/Modules/GPU/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Popup: NSStackView, Popup_p { public var sizeCallback: ((NSSize) -> Void)? = nil diff --git a/Modules/GPU/reader.swift b/Modules/GPU/reader.swift index 3afa9f66..905c9dde 100644 --- a/Modules/GPU/reader.swift +++ b/Modules/GPU/reader.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import os.log public struct device { diff --git a/Modules/GPU/settings.swift b/Modules/GPU/settings.swift index 72016b69..0c80d98c 100644 --- a/Modules/GPU/settings.swift +++ b/Modules/GPU/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSView, Settings_v { private var updateIntervalValue: Int = 1 diff --git a/Modules/Net/main.swift b/Modules/Net/main.swift index c2cd7329..1c406202 100644 --- a/Modules/Net/main.swift +++ b/Modules/Net/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import SystemConfiguration public enum Network_t: String { diff --git a/Modules/Net/popup.swift b/Modules/Net/popup.swift index e3145646..1926b38e 100644 --- a/Modules/Net/popup.swift +++ b/Modules/Net/popup.swift @@ -11,8 +11,7 @@ // swiftlint:disable file_length import Cocoa -import ModuleKit -import StatsKit +import Kit // swiftlint:disable type_body_length internal class Popup: NSStackView, Popup_p { diff --git a/Modules/Net/readers.swift b/Modules/Net/readers.swift index 1ce76ac6..f50a7364 100644 --- a/Modules/Net/readers.swift +++ b/Modules/Net/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import SystemConfiguration import Reachability import os.log diff --git a/Modules/Net/settings.swift b/Modules/Net/settings.swift index f26ae822..17456cff 100644 --- a/Modules/Net/settings.swift +++ b/Modules/Net/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import SystemConfiguration internal class Settings: NSView, Settings_v { diff --git a/Modules/RAM/main.swift b/Modules/RAM/main.swift index 1b87fd2f..3a1470d2 100644 --- a/Modules/RAM/main.swift +++ b/Modules/RAM/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit public struct RAM_Usage: value_t { var total: Double diff --git a/Modules/RAM/popup.swift b/Modules/RAM/popup.swift index dd59f9a6..6db45863 100644 --- a/Modules/RAM/popup.swift +++ b/Modules/RAM/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSView, Popup_p { private var title: String diff --git a/Modules/RAM/readers.swift b/Modules/RAM/readers.swift index 82616e8b..8150cafd 100644 --- a/Modules/RAM/readers.swift +++ b/Modules/RAM/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import os.log internal class UsageReader: Reader { diff --git a/Modules/RAM/settings.swift b/Modules/RAM/settings.swift index 37c5f439..77cb6b07 100644 --- a/Modules/RAM/settings.swift +++ b/Modules/RAM/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSView, Settings_v { private var updateIntervalValue: Int = 1 diff --git a/Modules/Sensors/main.swift b/Modules/Sensors/main.swift index cbcf336a..c90c4e26 100644 --- a/Modules/Sensors/main.swift +++ b/Modules/Sensors/main.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit public class Sensors: Module { private var sensorsReader: SensorsReader diff --git a/Modules/Sensors/popup.swift b/Modules/Sensors/popup.swift index 95a09251..2e70995d 100644 --- a/Modules/Sensors/popup.swift +++ b/Modules/Sensors/popup.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit internal class Popup: NSView, Popup_p { private var list: [String: NSTextField] = [:] diff --git a/Modules/Sensors/readers.swift b/Modules/Sensors/readers.swift index 329bc9b1..d0b30c7c 100644 --- a/Modules/Sensors/readers.swift +++ b/Modules/Sensors/readers.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit import os.log import IOKit.hid diff --git a/Modules/Sensors/settings.swift b/Modules/Sensors/settings.swift index e4f626fe..37ac7d2f 100644 --- a/Modules/Sensors/settings.swift +++ b/Modules/Sensors/settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit internal class Settings: NSView, Settings_v { private var updateIntervalValue: Int = 3 diff --git a/Modules/Sensors/values.swift b/Modules/Sensors/values.swift index 9aae51d1..fa8f5901 100644 --- a/Modules/Sensors/values.swift +++ b/Modules/Sensors/values.swift @@ -9,7 +9,7 @@ // Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. // -import StatsKit +import Kit enum SensorGroup: String { case CPU = "CPU" diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index 3071dd39..ee6609e4 100644 --- a/Stats.xcodeproj/project.pbxproj +++ b/Stats.xcodeproj/project.pbxproj @@ -8,56 +8,67 @@ /* Begin PBXBuildFile section */ 9A045EB72594F8D100ED58F2 /* Dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A045EB62594F8D100ED58F2 /* Dashboard.swift */; }; - 9A0C82E124460F7200FAE3D4 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; - 9A0C82E224460F7200FAE3D4 /* StatsKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9A0C82E624460F9A00FAE3D4 /* extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A654920244074B500E30B74 /* extensions.swift */; }; - 9A0C82E724460F9C00FAE3D4 /* updater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0C82D124460DFF00FAE3D4 /* updater.swift */; }; - 9A0C82E824460F9E00FAE3D4 /* launchAtLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0C82D324460E4400FAE3D4 /* launchAtLogin.swift */; }; - 9A0C82E924460F9F00FAE3D4 /* store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A65492224407EA600E30B74 /* store.swift */; }; - 9A0C82EA24460FB100FAE3D4 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; - 9A0C82EE2446124800FAE3D4 /* SystemKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A7D0CB62444C2C800B09070 /* SystemKit.swift */; }; - 9A1A7ABA24561F0B00A84F7A /* BarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1A7AB924561F0B00A84F7A /* BarChart.swift */; }; - 9A1D5E4B25235C8100B82BFC /* helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1D5E4A25235C8100B82BFC /* helpers.swift */; }; - 9A20E6DA2575555100AC2302 /* PieChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A20E6D92575555100AC2302 /* PieChart.swift */; }; - 9A27D4FD2538A3E5001BB651 /* Repeat in Frameworks */ = {isa = PBXBuildFile; productRef = 9A27D4FC2538A3E5001BB651 /* Repeat */; }; 9A27D5352538A456001BB651 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 9A27D5342538A456001BB651 /* Reachability */; }; 9A2843E52666959B00EC1F6D /* smc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9ADE6FD8265D032100D2FBA8 /* smc */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 9A2846FE2666A9CC00EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2846FF2666A9CC00EC1F6D /* Kit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 9A28475F2666AA2700EC1F6D /* LineChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847552666AA2700EC1F6D /* LineChart.swift */; }; + 9A2847602666AA2700EC1F6D /* NetworkChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847562666AA2700EC1F6D /* NetworkChart.swift */; }; + 9A2847612666AA2700EC1F6D /* PieChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847572666AA2700EC1F6D /* PieChart.swift */; }; + 9A2847622666AA2700EC1F6D /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847582666AA2700EC1F6D /* Label.swift */; }; + 9A2847632666AA2700EC1F6D /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847592666AA2700EC1F6D /* Mini.swift */; }; + 9A2847642666AA2700EC1F6D /* Battery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28475A2666AA2700EC1F6D /* Battery.swift */; }; + 9A2847652666AA2700EC1F6D /* Memory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28475B2666AA2700EC1F6D /* Memory.swift */; }; + 9A2847662666AA2700EC1F6D /* Speed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28475C2666AA2700EC1F6D /* Speed.swift */; }; + 9A2847672666AA2700EC1F6D /* BarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28475D2666AA2700EC1F6D /* BarChart.swift */; }; + 9A2847682666AA2700EC1F6D /* Sensors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28475E2666AA2700EC1F6D /* Sensors.swift */; }; + 9A2847792666AA5000EC1F6D /* module.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847742666AA5000EC1F6D /* module.swift */; }; + 9A28477A2666AA5000EC1F6D /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847752666AA5000EC1F6D /* settings.swift */; }; + 9A28477B2666AA5000EC1F6D /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847762666AA5000EC1F6D /* popup.swift */; }; + 9A28477C2666AA5000EC1F6D /* reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847772666AA5000EC1F6D /* reader.swift */; }; + 9A28477D2666AA5000EC1F6D /* widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847782666AA5000EC1F6D /* widget.swift */; }; + 9A2847AB2666AA7B00EC1F6D /* Repeat in Frameworks */ = {isa = PBXBuildFile; productRef = 9A2847AA2666AA7B00EC1F6D /* Repeat */; }; + 9A2847C22666AA8700EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847C72666AA8C00EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847CC2666AA9100EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847D12666AA9500EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847D62666AA9C00EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847DB2666AAA000EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847E02666AAA400EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2847E52666AAA900EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; }; + 9A2848082666AB3000EC1F6D /* updater.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9A2848012666AB2F00EC1F6D /* updater.sh */; }; + 9A2848092666AB3000EC1F6D /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2848022666AB2F00EC1F6D /* Store.swift */; }; + 9A28480A2666AB3000EC1F6D /* SystemKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2848032666AB2F00EC1F6D /* SystemKit.swift */; }; + 9A28480B2666AB3000EC1F6D /* Charts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2848042666AB2F00EC1F6D /* Charts.swift */; }; + 9A28480C2666AB3000EC1F6D /* SMC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2848052666AB3000EC1F6D /* SMC.swift */; }; + 9A28480E2666AB3000EC1F6D /* updater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2848072666AB3000EC1F6D /* updater.swift */; }; + 9A28481E2666AB3600EC1F6D /* extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481A2666AB3500EC1F6D /* extensions.swift */; }; + 9A28481F2666AB3600EC1F6D /* constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481B2666AB3500EC1F6D /* constants.swift */; }; + 9A2848202666AB3600EC1F6D /* types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481C2666AB3500EC1F6D /* types.swift */; }; + 9A2848212666AB3600EC1F6D /* helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481D2666AB3600EC1F6D /* helpers.swift */; }; + 9A2848892666AC0100EC1F6D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A2848882666AC0100EC1F6D /* Assets.xcassets */; }; 9A34353B243E278D006B19F9 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A34353A243E278D006B19F9 /* main.swift */; }; 9A34353C243E27E8006B19F9 /* LaunchAtLogin.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 9A343527243E26A0006B19F9 /* LaunchAtLogin.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 9A3E17C1247A8F5E00449CD1 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9A3E17D3247A94AF00449CD1 /* Net.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A3E17CC247A94AF00449CD1 /* Net.framework */; }; 9A3E17D4247A94AF00449CD1 /* Net.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A3E17CC247A94AF00449CD1 /* Net.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9A3E17D9247A94B500449CD1 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17D8247A94B500449CD1 /* main.swift */; }; 9A3E17DB247A94BC00449CD1 /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17DA247A94BC00449CD1 /* readers.swift */; }; - 9A3E17DE247A94DC00449CD1 /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9A3E17E2247A94DC00449CD1 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; - 9A3E17E8247AA8E100449CD1 /* Speed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17E7247AA8E100449CD1 /* Speed.swift */; }; 9A3E17EA247B07BF00449CD1 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17E9247B07BF00449CD1 /* popup.swift */; }; - 9A41530C24ABC3AF00A2BDA7 /* Memory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A41530B24ABC3AF00A2BDA7 /* Memory.swift */; }; 9A53EBF924EAFA5200648841 /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A53EBF824EAFA5200648841 /* settings.swift */; }; 9A53EBFB24EB041E00648841 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A53EBFA24EB041E00648841 /* popup.swift */; }; 9A58DE9E24B363D800716A9F /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A58DE9D24B363D800716A9F /* popup.swift */; }; 9A58DEA024B363F300716A9F /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A58DE9F24B363F300716A9F /* settings.swift */; }; 9A58DEA424B3647600716A9F /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A58DEA324B3647600716A9F /* settings.swift */; }; - 9A599701261121F00043560F /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A599700261121F00043560F /* Label.swift */; }; 9A5AF11B2469CE9B00684737 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5AF11A2469CE9B00684737 /* popup.swift */; }; - 9A5F191626220D510085C3CC /* types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5F191526220D510085C3CC /* types.swift */; }; - 9A65295825B78056005E2DE4 /* NetworkChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A65295725B78056005E2DE4 /* NetworkChart.swift */; }; 9A65654A253F20EF0096B607 /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A656549253F20EF0096B607 /* settings.swift */; }; 9A656562253F788A0096B607 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A656561253F788A0096B607 /* popup.swift */; }; 9A6CFC0122A1C9F5001E782D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A6CFC0022A1C9F5001E782D /* Assets.xcassets */; }; - 9A7C61B42440DF810032695D /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A7C61B32440DF810032695D /* Mini.swift */; }; 9A81C74D24499C7000825D92 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C74B24499C7000825D92 /* AppSettings.swift */; }; 9A81C74E24499C7000825D92 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C74C24499C7000825D92 /* Settings.swift */; }; - 9A81C75024499D6600825D92 /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C74F24499D6600825D92 /* settings.swift */; }; 9A81C75D2449A41400825D92 /* RAM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A81C7562449A41400825D92 /* RAM.framework */; }; 9A81C75E2449A41400825D92 /* RAM.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A81C7562449A41400825D92 /* RAM.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9A81C7622449A41E00825D92 /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; 9A81C7692449A43600825D92 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C7672449A43600825D92 /* main.swift */; }; 9A81C76A2449A43600825D92 /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C7682449A43600825D92 /* readers.swift */; }; - 9A81C76B2449AE9400825D92 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; - 9A81C7702449B8D500825D92 /* Charts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A81C76F2449B8D500825D92 /* Charts.swift */; }; - 9A885B1A26513253000E43FE /* constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A885B1926513253000E43FE /* constants.swift */; }; 9A8DE58E253DEFA9006A748F /* Fans.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8DE587253DEFA9006A748F /* Fans.framework */; }; 9A8DE58F253DEFA9006A748F /* Fans.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8DE587253DEFA9006A748F /* Fans.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9A8DE5E4253DF4E2006A748F /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A8DE5E3253DF4E2006A748F /* main.swift */; }; @@ -67,12 +78,7 @@ 9A90E19124EAD2BB00471E9A /* GPU.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A90E18924EAD2BB00471E9A /* GPU.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9A90E19624EAD35F00471E9A /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A90E19524EAD35F00471E9A /* main.swift */; }; 9A90E19824EAD3B000471E9A /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9A90E19724EAD3B000471E9A /* config.plist */; }; - 9A90E19924EAD3E300471E9A /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9A90E19D24EAD3E300471E9A /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9A90E1A324EAD66600471E9A /* reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A90E1A224EAD66600471E9A /* reader.swift */; }; - 9A944D55244920690058F32A /* reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A944D54244920690058F32A /* reader.swift */; }; - 9A944D5B244925720058F32A /* widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A944D5A244925720058F32A /* widget.swift */; }; - 9A944D5D24492A8B0058F32A /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A944D5C24492A8B0058F32A /* popup.swift */; }; 9A953A1424B9D22D0038EF4B /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A953A1324B9D22D0038EF4B /* settings.swift */; }; 9A97CED12537331B00742D8F /* CPU.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A97CECA2537331B00742D8F /* CPU.framework */; }; 9A97CED22537331B00742D8F /* CPU.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A97CECA2537331B00742D8F /* CPU.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -81,34 +87,21 @@ 9A97CEF6253733E400742D8F /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A97CEF5253733E400742D8F /* popup.swift */; }; 9A97CEFB253733F300742D8F /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A97CEFA253733F300742D8F /* settings.swift */; }; 9A97CF002537340400742D8F /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9A97CEFF2537340400742D8F /* config.plist */; }; - 9A97CF072537351600742D8F /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9A97CF0C2537351800742D8F /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9A9B25BB24F7DE2B00C3CCE6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9A9B25BD24F7DE2B00C3CCE6 /* Localizable.strings */; }; - 9A9D728A24471FAE005CF997 /* SMC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D728924471FAE005CF997 /* SMC.swift */; }; 9A9EA9452476D34500E3B883 /* Update.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9EA9442476D34500E3B883 /* Update.swift */; }; - 9AA4A00A2443656D00ECCF07 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9AA4A0092443656D00ECCF07 /* Assets.xcassets */; }; 9AA64260244B274200416A33 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA6425F244B274200416A33 /* popup.swift */; }; - 9AA64264244B94F300416A33 /* LineChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA64263244B94F300416A33 /* LineChart.swift */; }; - 9AABEAE4243FB13500668CB0 /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9AABEAE5243FB13500668CB0 /* ModuleKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9AABEAEA243FB15E00668CB0 /* module.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AABEAE9243FB15E00668CB0 /* module.swift */; }; 9AABEB7A243FD26200668CB0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AABEB79243FD26200668CB0 /* AppDelegate.swift */; }; 9AABEB7E243FDEF100668CB0 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AABEB7D243FDEF100668CB0 /* main.swift */; }; 9AB14B77248CEF3500DC6731 /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AF9EE192464A7B3005D2270 /* config.plist */; }; 9AB14B78248CEF3B00DC6731 /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AF9EE12246492E8005D2270 /* config.plist */; }; 9AB14B79248CEF4100DC6731 /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9A3E17DC247A94C300449CD1 /* config.plist */; }; 9AB14B7A248CEF4900DC6731 /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9ABFF904248BEC0B00C9041A /* config.plist */; }; - 9AB1572E25407F7B00671260 /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9AB1573D25407F7E00671260 /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9AB6D03926447CAA003215A5 /* reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AB6D03826447CAA003215A5 /* reader.m */; }; 9AB7FD7C246B48DB00387FDA /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AB7FD7B246B48DB00387FDA /* settings.swift */; }; 9ABFF8FD248BEBCB00C9041A /* Battery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABFF8F6248BEBCB00C9041A /* Battery.framework */; }; 9ABFF8FE248BEBCB00C9041A /* Battery.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABFF8F6248BEBCB00C9041A /* Battery.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9ABFF903248BEBD700C9041A /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFF902248BEBD700C9041A /* main.swift */; }; - 9ABFF906248BEC2600C9041A /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9ABFF90B248BEC2900C9041A /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9ABFF910248BEE7200C9041A /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFF90F248BEE7200C9041A /* readers.swift */; }; - 9ABFF912248BF39500C9041A /* Battery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFF911248BF39500C9041A /* Battery.swift */; }; 9ABFF914248C30A800C9041A /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFF913248C30A800C9041A /* popup.swift */; }; 9AD33AC624BCD3EE007E8820 /* helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD33AC524BCD3EE007E8820 /* helpers.swift */; }; 9AD64FA224BF86C100419D59 /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD64FA124BF86C100419D59 /* settings.swift */; }; @@ -118,43 +111,79 @@ 9ADE7053265D542C00D2FBA8 /* types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ADE7052265D542C00D2FBA8 /* types.swift */; }; 9AE29ADC249A50350071B02D /* Sensors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AE29AD5249A50350071B02D /* Sensors.framework */; }; 9AE29ADD249A50350071B02D /* Sensors.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AE29AD5249A50350071B02D /* Sensors.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9AE29AE1249A50640071B02D /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; - 9AE29AE5249A50640071B02D /* StatsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; }; 9AE29AF3249A51D70071B02D /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF1249A50CD0071B02D /* main.swift */; }; 9AE29AF6249A52B00071B02D /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AE29AF4249A52870071B02D /* config.plist */; }; 9AE29AFB249A53DC0071B02D /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF9249A53780071B02D /* readers.swift */; }; 9AE29AFC249A53DC0071B02D /* values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF7249A53420071B02D /* values.swift */; }; - 9AE29AFE249A82B70071B02D /* Sensors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AFD249A82B70071B02D /* Sensors.swift */; }; - 9AECEF3B24ACF7BA00DB95D4 /* updater.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9AECEF3A24ACF7BA00DB95D4 /* updater.sh */; }; - 9AECEF3E24ACF9A500DB95D4 /* updater.sh in Copy Files */ = {isa = PBXBuildFile; fileRef = 9AECEF3A24ACF7BA00DB95D4 /* updater.sh */; }; 9AF9EE0924648751005D2270 /* Disk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AF9EE0224648751005D2270 /* Disk.framework */; }; 9AF9EE0A24648751005D2270 /* Disk.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AF9EE0224648751005D2270 /* Disk.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9AF9EE0F2464875F005D2270 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF9EE0E2464875F005D2270 /* main.swift */; }; 9AF9EE1124648ADC005D2270 /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF9EE1024648ADC005D2270 /* readers.swift */; }; - 9AF9EE1424649BAD005D2270 /* ModuleKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 9A0C82DF24460F7200FAE3D4 /* PBXContainerItemProxy */ = { + 9A2846FC2666A9CC00EC1F6D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; }; - 9A0C82EC24460FB100FAE3D4 /* PBXContainerItemProxy */ = { + 9A2847C42666AA8700EC1F6D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; }; - 9A3E17C3247A8F5E00449CD1 /* PBXContainerItemProxy */ = { + 9A2847C92666AA8C00EC1F6D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847CE2666AA9100EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847D32666AA9500EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847D82666AA9C00EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847DD2666AAA000EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847E22666AAA400EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; + }; + 9A2847E72666AAA900EC1F6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A1410ED229E721100D29793 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A2846F62666A9CC00EC1F6D; + remoteInfo = Kit; }; 9A3E17D1247A94AF00449CD1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -163,20 +192,6 @@ remoteGlobalIDString = 9A3E17CB247A94AF00449CD1; remoteInfo = Net; }; - 9A3E17E0247A94DC00449CD1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9A3E17E4247A94DC00449CD1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9A81C75B2449A41400825D92 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -184,20 +199,6 @@ remoteGlobalIDString = 9A81C7552449A41400825D92; remoteInfo = Memory; }; - 9A81C7642449A41E00825D92 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9A81C76D2449AE9400825D92 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9A8DE58C253DEFA9006A748F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -212,20 +213,6 @@ remoteGlobalIDString = 9A90E18824EAD2BB00471E9A; remoteInfo = GPU; }; - 9A90E19B24EAD3E300471E9A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9A90E19F24EAD3E300471E9A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9A97CECF2537331B00742D8F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -233,41 +220,6 @@ remoteGlobalIDString = 9A97CEC92537331B00742D8F; remoteInfo = CPU; }; - 9A97CF092537351600742D8F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9A97CF0E2537351800742D8F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; - 9AABEAE2243FB13500668CB0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9AB1573025407F7B00671260 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9AB1573F25407F7E00671260 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9ABFF8FB248BEBCB00C9041A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -275,20 +227,6 @@ remoteGlobalIDString = 9ABFF8F5248BEBCB00C9041A; remoteInfo = Battery; }; - 9ABFF908248BEC2600C9041A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9ABFF90D248BEC2900C9041A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9AE29ADA249A50350071B02D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -296,20 +234,6 @@ remoteGlobalIDString = 9AE29AD4249A50350071B02D; remoteInfo = Sensors; }; - 9AE29AE3249A50640071B02D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; - 9AE29AE7249A50640071B02D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A0C82D924460F7200FAE3D4; - remoteInfo = StatsKit; - }; 9AF9EE0724648751005D2270 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9A1410ED229E721100D29793 /* Project object */; @@ -317,13 +241,6 @@ remoteGlobalIDString = 9AF9EE0124648751005D2270; remoteInfo = Disk; }; - 9AF9EE1624649BAD005D2270 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A1410ED229E721100D29793 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9AABEADC243FB13500668CB0; - remoteInfo = ModuleKit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -346,11 +263,10 @@ 9AF9EE0A24648751005D2270 /* Disk.framework in Embed Frameworks */, 9A81C75E2449A41400825D92 /* RAM.framework in Embed Frameworks */, 9AE29ADD249A50350071B02D /* Sensors.framework in Embed Frameworks */, + 9A2846FF2666A9CC00EC1F6D /* Kit.framework in Embed Frameworks */, 9ABFF8FE248BEBCB00C9041A /* Battery.framework in Embed Frameworks */, - 9AABEAE5243FB13500668CB0 /* ModuleKit.framework in Embed Frameworks */, 9A3E17D4247A94AF00449CD1 /* Net.framework in Embed Frameworks */, 9A8DE58F253DEFA9006A748F /* Fans.framework in Embed Frameworks */, - 9A0C82E224460F7200FAE3D4 /* StatsKit.framework in Embed Frameworks */, 9A90E19124EAD2BB00471E9A /* GPU.framework in Embed Frameworks */, 9A97CED22537331B00742D8F /* CPU.framework in Embed Frameworks */, ); @@ -374,7 +290,6 @@ dstPath = Scripts; dstSubfolderSpec = 7; files = ( - 9AECEF3E24ACF9A500DB95D4 /* updater.sh in Copy Files */, ); name = "Copy Files"; runOnlyForDeploymentPostprocessing = 0; @@ -393,16 +308,37 @@ 98BF5451254DF04C004E9DF5 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 9A00010025CFF9D6001D02B9 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = ""; }; 9A045EB62594F8D100ED58F2 /* Dashboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dashboard.swift; sourceTree = ""; }; - 9A0C82D124460DFF00FAE3D4 /* updater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = updater.swift; sourceTree = ""; }; - 9A0C82D324460E4400FAE3D4 /* launchAtLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = launchAtLogin.swift; sourceTree = ""; }; - 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = StatsKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9A0C82DD24460F7200FAE3D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A1410F5229E721100D29793 /* Stats.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Stats.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9A141101229E721200D29793 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9A1A7AB924561F0B00A84F7A /* BarChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarChart.swift; sourceTree = ""; }; - 9A1D5E4A25235C8100B82BFC /* helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = helpers.swift; sourceTree = ""; }; - 9A20E6D92575555100AC2302 /* PieChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PieChart.swift; sourceTree = ""; }; 9A27D4A925389EFD001BB651 /* Stats.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Stats.entitlements; sourceTree = ""; }; + 9A2846F72666A9CC00EC1F6D /* Kit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Kit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9A2847552666AA2700EC1F6D /* LineChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChart.swift; sourceTree = ""; }; + 9A2847562666AA2700EC1F6D /* NetworkChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkChart.swift; sourceTree = ""; }; + 9A2847572666AA2700EC1F6D /* PieChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChart.swift; sourceTree = ""; }; + 9A2847582666AA2700EC1F6D /* Label.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = ""; }; + 9A2847592666AA2700EC1F6D /* Mini.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mini.swift; sourceTree = ""; }; + 9A28475A2666AA2700EC1F6D /* Battery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Battery.swift; sourceTree = ""; }; + 9A28475B2666AA2700EC1F6D /* Memory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Memory.swift; sourceTree = ""; }; + 9A28475C2666AA2700EC1F6D /* Speed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Speed.swift; sourceTree = ""; }; + 9A28475D2666AA2700EC1F6D /* BarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChart.swift; sourceTree = ""; }; + 9A28475E2666AA2700EC1F6D /* Sensors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sensors.swift; sourceTree = ""; }; + 9A2847742666AA5000EC1F6D /* module.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = module.swift; sourceTree = ""; }; + 9A2847752666AA5000EC1F6D /* settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; + 9A2847762666AA5000EC1F6D /* popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; + 9A2847772666AA5000EC1F6D /* reader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = reader.swift; sourceTree = ""; }; + 9A2847782666AA5000EC1F6D /* widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = widget.swift; sourceTree = ""; }; + 9A2848012666AB2F00EC1F6D /* updater.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = updater.sh; sourceTree = ""; }; + 9A2848022666AB2F00EC1F6D /* Store.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = ""; }; + 9A2848032666AB2F00EC1F6D /* SystemKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemKit.swift; sourceTree = ""; }; + 9A2848042666AB2F00EC1F6D /* Charts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Charts.swift; sourceTree = ""; }; + 9A2848052666AB3000EC1F6D /* SMC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SMC.swift; sourceTree = ""; }; + 9A2848072666AB3000EC1F6D /* updater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = updater.swift; sourceTree = ""; }; + 9A28481A2666AB3500EC1F6D /* extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = extensions.swift; sourceTree = ""; }; + 9A28481B2666AB3500EC1F6D /* constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = constants.swift; sourceTree = ""; }; + 9A28481C2666AB3500EC1F6D /* types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = types.swift; sourceTree = ""; }; + 9A28481D2666AB3600EC1F6D /* helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = helpers.swift; sourceTree = ""; }; + 9A2848882666AC0100EC1F6D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 9A28493E2666AD2A00EC1F6D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A343527243E26A0006B19F9 /* LaunchAtLogin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LaunchAtLogin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9A343535243E26A0006B19F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A343536243E26A0006B19F9 /* LaunchAtLogin.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLogin.entitlements; sourceTree = ""; }; @@ -413,9 +349,7 @@ 9A3E17D8247A94B500449CD1 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 9A3E17DA247A94BC00449CD1 /* readers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = readers.swift; sourceTree = ""; }; 9A3E17DC247A94C300449CD1 /* config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = config.plist; sourceTree = ""; }; - 9A3E17E7247AA8E100449CD1 /* Speed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Speed.swift; sourceTree = ""; }; 9A3E17E9247B07BF00449CD1 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; - 9A41530B24ABC3AF00A2BDA7 /* Memory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Memory.swift; sourceTree = ""; }; 9A49EC7B261CDF3E0055267E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; 9A520DF624FBF01F00133EC6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; 9A53EBF824EAFA5200648841 /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; @@ -423,27 +357,17 @@ 9A58DE9D24B363D800716A9F /* popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A58DE9F24B363F300716A9F /* settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; 9A58DEA324B3647600716A9F /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; - 9A599700261121F00043560F /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = ""; }; 9A5AF11A2469CE9B00684737 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A5F0503256A9135002FF75F /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = ""; }; - 9A5F191526220D510085C3CC /* types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = types.swift; sourceTree = ""; }; - 9A65295725B78056005E2DE4 /* NetworkChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkChart.swift; sourceTree = ""; }; - 9A654920244074B500E30B74 /* extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = extensions.swift; sourceTree = ""; }; - 9A65492224407EA600E30B74 /* store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = store.swift; sourceTree = ""; }; 9A656549253F20EF0096B607 /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; 9A656561253F788A0096B607 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A6CFC0022A1C9F5001E782D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 9A7C61B32440DF810032695D /* Mini.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mini.swift; sourceTree = ""; }; - 9A7D0CB62444C2C800B09070 /* SystemKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemKit.swift; sourceTree = ""; }; 9A81C74B24499C7000825D92 /* AppSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = ""; }; 9A81C74C24499C7000825D92 /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; - 9A81C74F24499D6600825D92 /* settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; 9A81C7562449A41400825D92 /* RAM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RAM.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9A81C7592449A41400825D92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A81C7672449A43600825D92 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 9A81C7682449A43600825D92 /* readers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = readers.swift; sourceTree = ""; }; - 9A81C76F2449B8D500825D92 /* Charts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Charts.swift; sourceTree = ""; }; - 9A885B1926513253000E43FE /* constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = constants.swift; sourceTree = ""; }; 9A8DE587253DEFA9006A748F /* Fans.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Fans.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9A8DE58A253DEFA9006A748F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A8DE5E3253DF4E2006A748F /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; @@ -454,9 +378,6 @@ 9A90E19524EAD35F00471E9A /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 9A90E19724EAD3B000471E9A /* config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = config.plist; sourceTree = ""; }; 9A90E1A224EAD66600471E9A /* reader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = reader.swift; sourceTree = ""; }; - 9A944D54244920690058F32A /* reader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = reader.swift; sourceTree = ""; }; - 9A944D5A244925720058F32A /* widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = widget.swift; sourceTree = ""; }; - 9A944D5C24492A8B0058F32A /* popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A953A1324B9D22D0038EF4B /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; 9A97CE2A25371B2300742D8F /* IntelPowerGadget.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IntelPowerGadget.framework; path = ../../../Library/Frameworks/IntelPowerGadget.framework; sourceTree = ""; }; 9A97CECA2537331B00742D8F /* CPU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CPU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -469,16 +390,10 @@ 9A998CD722A199920087ADE7 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 9A998CD922A199970087ADE7 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; 9A9B25BC24F7DE2B00C3CCE6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - 9A9D728924471FAE005CF997 /* SMC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMC.swift; sourceTree = ""; }; 9A9EA9442476D34500E3B883 /* Update.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Update.swift; sourceTree = ""; }; - 9AA4A0092443656D00ECCF07 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9AA6425F244B274200416A33 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; - 9AA64263244B94F300416A33 /* LineChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChart.swift; sourceTree = ""; }; 9AAAE83524F953FC00CD92D7 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = ""; }; 9AAAE83624FAA4B700CD92D7 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; - 9AABEADD243FB13500668CB0 /* ModuleKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ModuleKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9AABEAE0243FB13500668CB0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9AABEAE9243FB15E00668CB0 /* module.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = module.swift; sourceTree = ""; }; 9AABEB79243FD26200668CB0 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 9AABEB7D243FDEF100668CB0 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 9AB6D03826447CAA003215A5 /* reader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = reader.m; sourceTree = ""; }; @@ -488,7 +403,6 @@ 9ABFF902248BEBD700C9041A /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 9ABFF904248BEC0B00C9041A /* config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = config.plist; sourceTree = ""; }; 9ABFF90F248BEE7200C9041A /* readers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = readers.swift; sourceTree = ""; }; - 9ABFF911248BF39500C9041A /* Battery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Battery.swift; sourceTree = ""; }; 9ABFF913248C30A800C9041A /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9AD33AC524BCD3EE007E8820 /* helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = helpers.swift; sourceTree = ""; }; 9AD64FA124BF86C100419D59 /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; @@ -503,8 +417,6 @@ 9AE29AF4249A52870071B02D /* config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = config.plist; path = Modules/Sensors/config.plist; sourceTree = SOURCE_ROOT; }; 9AE29AF7249A53420071B02D /* values.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = values.swift; path = Modules/Sensors/values.swift; sourceTree = SOURCE_ROOT; }; 9AE29AF9249A53780071B02D /* readers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = readers.swift; path = Modules/Sensors/readers.swift; sourceTree = SOURCE_ROOT; }; - 9AE29AFD249A82B70071B02D /* Sensors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sensors.swift; sourceTree = ""; }; - 9AECEF3A24ACF7BA00DB95D4 /* updater.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = updater.sh; sourceTree = ""; }; 9AF9EE0224648751005D2270 /* Disk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Disk.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9AF9EE0524648751005D2270 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9AF9EE0E2464875F005D2270 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; @@ -520,23 +432,15 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9A0C82D724460F7200FAE3D4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A1410F2229E721100D29793 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( 9AF9EE0924648751005D2270 /* Disk.framework in Frameworks */, - 9AABEAE4243FB13500668CB0 /* ModuleKit.framework in Frameworks */, 9AE29ADC249A50350071B02D /* Sensors.framework in Frameworks */, 9ABFF8FD248BEBCB00C9041A /* Battery.framework in Frameworks */, + 9A2846FE2666A9CC00EC1F6D /* Kit.framework in Frameworks */, 9A81C75D2449A41400825D92 /* RAM.framework in Frameworks */, - 9A0C82E124460F7200FAE3D4 /* StatsKit.framework in Frameworks */, 9A8DE58E253DEFA9006A748F /* Fans.framework in Frameworks */, 9A3E17D3247A94AF00449CD1 /* Net.framework in Frameworks */, 9A90E19024EAD2BB00471E9A /* GPU.framework in Frameworks */, @@ -544,6 +448,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9A2846F42666A9CC00EC1F6D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9A2847AB2666AA7B00EC1F6D /* Repeat in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A343524243E26A0006B19F9 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -555,9 +467,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9A3E17DE247A94DC00449CD1 /* ModuleKit.framework in Frameworks */, 9A27D5352538A456001BB651 /* Reachability in Frameworks */, - 9A3E17E2247A94DC00449CD1 /* StatsKit.framework in Frameworks */, + 9A2847D62666AA9C00EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -565,8 +476,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9A81C7622449A41E00825D92 /* ModuleKit.framework in Frameworks */, - 9A81C76B2449AE9400825D92 /* StatsKit.framework in Frameworks */, + 9A2847CC2666AA9100EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -574,8 +484,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AB1572E25407F7B00671260 /* ModuleKit.framework in Frameworks */, - 9AB1573D25407F7E00671260 /* StatsKit.framework in Frameworks */, + 9A2847E52666AAA900EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -583,8 +492,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9A90E19924EAD3E300471E9A /* ModuleKit.framework in Frameworks */, - 9A90E19D24EAD3E300471E9A /* StatsKit.framework in Frameworks */, + 9A2847C72666AA8C00EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -592,17 +500,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9A97CF072537351600742D8F /* ModuleKit.framework in Frameworks */, - 9A97CF0C2537351800742D8F /* StatsKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9AABEADA243FB13500668CB0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9A0C82EA24460FB100FAE3D4 /* StatsKit.framework in Frameworks */, - 9A27D4FD2538A3E5001BB651 /* Repeat in Frameworks */, + 9A2847C22666AA8700EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -610,8 +508,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9ABFF906248BEC2600C9041A /* ModuleKit.framework in Frameworks */, - 9ABFF90B248BEC2900C9041A /* StatsKit.framework in Frameworks */, + 9A2847DB2666AAA000EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -627,8 +524,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AE29AE1249A50640071B02D /* ModuleKit.framework in Frameworks */, - 9AE29AE5249A50640071B02D /* StatsKit.framework in Frameworks */, + 9A2847E02666AAA400EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -636,41 +532,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AF9EE1424649BAD005D2270 /* ModuleKit.framework in Frameworks */, - 9A3E17C1247A8F5E00449CD1 /* StatsKit.framework in Frameworks */, + 9A2847D12666AA9500EC1F6D /* Kit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 9A0C82DB24460F7200FAE3D4 /* StatsKit */ = { - isa = PBXGroup; - children = ( - 9A7D0CB62444C2C800B09070 /* SystemKit.swift */, - 9A0C82D124460DFF00FAE3D4 /* updater.swift */, - 9A65492224407EA600E30B74 /* store.swift */, - 9A0C82D324460E4400FAE3D4 /* launchAtLogin.swift */, - 9A654920244074B500E30B74 /* extensions.swift */, - 9A885B1926513253000E43FE /* constants.swift */, - 9A5F191526220D510085C3CC /* types.swift */, - 9A1D5E4A25235C8100B82BFC /* helpers.swift */, - 9A0C82DD24460F7200FAE3D4 /* Info.plist */, - 9A9D728924471FAE005CF997 /* SMC.swift */, - 9A81C76F2449B8D500825D92 /* Charts.swift */, - 9AECEF3A24ACF7BA00DB95D4 /* updater.sh */, - ); - path = StatsKit; - sourceTree = ""; - }; 9A1410EC229E721100D29793 = { isa = PBXGroup; children = ( 9A1410F7229E721100D29793 /* Stats */, 9A343528243E26A0006B19F9 /* LaunchAtLogin */, 9ADE6FD9265D032100D2FBA8 /* SMC */, - 9A0C82DB24460F7200FAE3D4 /* StatsKit */, - 9AABEADE243FB13500668CB0 /* ModuleKit */, + 9A2846F82666A9CC00EC1F6D /* Kit */, 9AB14B75248CEEC600DC6731 /* Modules */, 9A1410F6229E721100D29793 /* Products */, 9A998CD622A199920087ADE7 /* Frameworks */, @@ -682,8 +557,6 @@ children = ( 9A1410F5229E721100D29793 /* Stats.app */, 9A343527243E26A0006B19F9 /* LaunchAtLogin.app */, - 9AABEADD243FB13500668CB0 /* ModuleKit.framework */, - 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */, 9A81C7562449A41400825D92 /* RAM.framework */, 9AF9EE0224648751005D2270 /* Disk.framework */, 9A3E17CC247A94AF00449CD1 /* Net.framework */, @@ -693,6 +566,7 @@ 9A97CECA2537331B00742D8F /* CPU.framework */, 9A8DE587253DEFA9006A748F /* Fans.framework */, 9ADE6FD8265D032100D2FBA8 /* smc */, + 9A2846F72666A9CC00EC1F6D /* Kit.framework */, ); name = Products; sourceTree = ""; @@ -708,6 +582,60 @@ path = Stats; sourceTree = ""; }; + 9A2846F82666A9CC00EC1F6D /* Kit */ = { + isa = PBXGroup; + children = ( + 9A28473E2666AA1500EC1F6D /* Widgets */, + 9A2848642666ABA500EC1F6D /* Supporting Files */, + 9A28498D2666AE3400EC1F6D /* module */, + 9AA81547266A9ACA008C01D0 /* plugins */, + 9AA81548266A9AFE008C01D0 /* updater */, + 9A28481B2666AB3500EC1F6D /* constants.swift */, + 9A28481A2666AB3500EC1F6D /* extensions.swift */, + 9A28481D2666AB3600EC1F6D /* helpers.swift */, + 9A28481C2666AB3500EC1F6D /* types.swift */, + ); + path = Kit; + sourceTree = ""; + }; + 9A28473E2666AA1500EC1F6D /* Widgets */ = { + isa = PBXGroup; + children = ( + 9A2847592666AA2700EC1F6D /* Mini.swift */, + 9A2847582666AA2700EC1F6D /* Label.swift */, + 9A28475D2666AA2700EC1F6D /* BarChart.swift */, + 9A2847552666AA2700EC1F6D /* LineChart.swift */, + 9A2847572666AA2700EC1F6D /* PieChart.swift */, + 9A2847562666AA2700EC1F6D /* NetworkChart.swift */, + 9A28475A2666AA2700EC1F6D /* Battery.swift */, + 9A28475B2666AA2700EC1F6D /* Memory.swift */, + 9A28475E2666AA2700EC1F6D /* Sensors.swift */, + 9A28475C2666AA2700EC1F6D /* Speed.swift */, + ); + path = Widgets; + sourceTree = ""; + }; + 9A2848642666ABA500EC1F6D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 9A2848882666AC0100EC1F6D /* Assets.xcassets */, + 9A28493E2666AD2A00EC1F6D /* Info.plist */, + ); + path = "Supporting Files"; + sourceTree = ""; + }; + 9A28498D2666AE3400EC1F6D /* module */ = { + isa = PBXGroup; + children = ( + 9A2847742666AA5000EC1F6D /* module.swift */, + 9A2847762666AA5000EC1F6D /* popup.swift */, + 9A2847782666AA5000EC1F6D /* widget.swift */, + 9A2847772666AA5000EC1F6D /* reader.swift */, + 9A2847752666AA5000EC1F6D /* settings.swift */, + ); + path = module; + sourceTree = ""; + }; 9A343528243E26A0006B19F9 /* LaunchAtLogin */ = { isa = PBXGroup; children = ( @@ -743,23 +671,6 @@ path = "Supporting Files"; sourceTree = ""; }; - 9A7C61B22440DF770032695D /* Widgets */ = { - isa = PBXGroup; - children = ( - 9A7C61B32440DF810032695D /* Mini.swift */, - 9AA64263244B94F300416A33 /* LineChart.swift */, - 9A1A7AB924561F0B00A84F7A /* BarChart.swift */, - 9A20E6D92575555100AC2302 /* PieChart.swift */, - 9A65295725B78056005E2DE4 /* NetworkChart.swift */, - 9A3E17E7247AA8E100449CD1 /* Speed.swift */, - 9ABFF911248BF39500C9041A /* Battery.swift */, - 9AE29AFD249A82B70071B02D /* Sensors.swift */, - 9A41530B24ABC3AF00A2BDA7 /* Memory.swift */, - 9A599700261121F00043560F /* Label.swift */, - ); - path = Widgets; - sourceTree = ""; - }; 9A81C74A24499C4B00825D92 /* Views */ = { isa = PBXGroup; children = ( @@ -834,27 +745,24 @@ name = Frameworks; sourceTree = ""; }; - 9AA0E9BD244269C400825127 /* Supporting Files */ = { + 9AA81547266A9ACA008C01D0 /* plugins */ = { isa = PBXGroup; children = ( - 9AA4A0092443656D00ECCF07 /* Assets.xcassets */, - 9AABEAE0243FB13500668CB0 /* Info.plist */, + 9A2848052666AB3000EC1F6D /* SMC.swift */, + 9A2848022666AB2F00EC1F6D /* Store.swift */, + 9A2848042666AB2F00EC1F6D /* Charts.swift */, + 9A2848032666AB2F00EC1F6D /* SystemKit.swift */, ); - path = "Supporting Files"; + path = plugins; sourceTree = ""; }; - 9AABEADE243FB13500668CB0 /* ModuleKit */ = { + 9AA81548266A9AFE008C01D0 /* updater */ = { isa = PBXGroup; children = ( - 9A7C61B22440DF770032695D /* Widgets */, - 9AA0E9BD244269C400825127 /* Supporting Files */, - 9AABEAE9243FB15E00668CB0 /* module.swift */, - 9A944D54244920690058F32A /* reader.swift */, - 9A944D5A244925720058F32A /* widget.swift */, - 9A944D5C24492A8B0058F32A /* popup.swift */, - 9A81C74F24499D6600825D92 /* settings.swift */, + 9A2848012666AB2F00EC1F6D /* updater.sh */, + 9A2848072666AB3000EC1F6D /* updater.swift */, ); - path = ModuleKit; + path = updater; sourceTree = ""; }; 9AB14B75248CEEC600DC6731 /* Modules */ = { @@ -927,7 +835,7 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 9A0C82D524460F7200FAE3D4 /* Headers */ = { + 9A2846F22666A9CC00EC1F6D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( @@ -969,13 +877,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9AABEAD8243FB13500668CB0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9ABFF8F1248BEBCB00C9041A /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1000,24 +901,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 9A0C82D924460F7200FAE3D4 /* StatsKit */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9A0C82E324460F7200FAE3D4 /* Build configuration list for PBXNativeTarget "StatsKit" */; - buildPhases = ( - 9A0C82D524460F7200FAE3D4 /* Headers */, - 9A0C82D624460F7200FAE3D4 /* Sources */, - 9A0C82D724460F7200FAE3D4 /* Frameworks */, - 9A0C82D824460F7200FAE3D4 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = StatsKit; - productName = StatsKit; - productReference = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; - productType = "com.apple.product-type.framework"; - }; 9A1410F4229E721100D29793 /* Stats */ = { isa = PBXNativeTarget; buildConfigurationList = 9A141105229E721200D29793 /* Build configuration list for PBXNativeTarget "Stats" */; @@ -1034,8 +917,6 @@ buildRules = ( ); dependencies = ( - 9AABEAE3243FB13500668CB0 /* PBXTargetDependency */, - 9A0C82E024460F7200FAE3D4 /* PBXTargetDependency */, 9A81C75C2449A41400825D92 /* PBXTargetDependency */, 9AF9EE0824648751005D2270 /* PBXTargetDependency */, 9A3E17D2247A94AF00449CD1 /* PBXTargetDependency */, @@ -1044,6 +925,7 @@ 9A90E18F24EAD2BB00471E9A /* PBXTargetDependency */, 9A97CED02537331B00742D8F /* PBXTargetDependency */, 9A8DE58D253DEFA9006A748F /* PBXTargetDependency */, + 9A2846FD2666A9CC00EC1F6D /* PBXTargetDependency */, ); name = Stats; packageProductDependencies = ( @@ -1052,6 +934,27 @@ productReference = 9A1410F5229E721100D29793 /* Stats.app */; productType = "com.apple.product-type.application"; }; + 9A2846F62666A9CC00EC1F6D /* Kit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9A2847002666A9CC00EC1F6D /* Build configuration list for PBXNativeTarget "Kit" */; + buildPhases = ( + 9A2846F22666A9CC00EC1F6D /* Headers */, + 9A2846F32666A9CC00EC1F6D /* Sources */, + 9A2846F42666A9CC00EC1F6D /* Frameworks */, + 9A2846F52666A9CC00EC1F6D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Kit; + packageProductDependencies = ( + 9A2847AA2666AA7B00EC1F6D /* Repeat */, + ); + productName = Kit; + productReference = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; + productType = "com.apple.product-type.framework"; + }; 9A343526243E26A0006B19F9 /* LaunchAtLogin */ = { isa = PBXNativeTarget; buildConfigurationList = 9A343537243E26A0006B19F9 /* Build configuration list for PBXNativeTarget "LaunchAtLogin" */; @@ -1081,8 +984,7 @@ buildRules = ( ); dependencies = ( - 9A3E17E1247A94DC00449CD1 /* PBXTargetDependency */, - 9A3E17E5247A94DC00449CD1 /* PBXTargetDependency */, + 9A2847D92666AA9C00EC1F6D /* PBXTargetDependency */, ); name = Net; packageProductDependencies = ( @@ -1104,8 +1006,7 @@ buildRules = ( ); dependencies = ( - 9A81C7652449A41E00825D92 /* PBXTargetDependency */, - 9A81C76E2449AE9400825D92 /* PBXTargetDependency */, + 9A2847CF2666AA9100EC1F6D /* PBXTargetDependency */, ); name = RAM; productName = Memory; @@ -1124,8 +1025,7 @@ buildRules = ( ); dependencies = ( - 9AB1573125407F7B00671260 /* PBXTargetDependency */, - 9AB1574025407F7E00671260 /* PBXTargetDependency */, + 9A2847E82666AAA900EC1F6D /* PBXTargetDependency */, ); name = Fans; productName = Fans; @@ -1144,8 +1044,7 @@ buildRules = ( ); dependencies = ( - 9A90E19C24EAD3E300471E9A /* PBXTargetDependency */, - 9A90E1A024EAD3E300471E9A /* PBXTargetDependency */, + 9A2847CA2666AA8C00EC1F6D /* PBXTargetDependency */, ); name = GPU; productName = GPU; @@ -1164,36 +1063,13 @@ buildRules = ( ); dependencies = ( - 9A97CF0A2537351600742D8F /* PBXTargetDependency */, - 9A97CF0F2537351800742D8F /* PBXTargetDependency */, + 9A2847C52666AA8700EC1F6D /* PBXTargetDependency */, ); name = CPU; productName = CPU; productReference = 9A97CECA2537331B00742D8F /* CPU.framework */; productType = "com.apple.product-type.framework"; }; - 9AABEADC243FB13500668CB0 /* ModuleKit */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9AABEAE8243FB13500668CB0 /* Build configuration list for PBXNativeTarget "ModuleKit" */; - buildPhases = ( - 9AABEAD8243FB13500668CB0 /* Headers */, - 9AABEAD9243FB13500668CB0 /* Sources */, - 9AABEADA243FB13500668CB0 /* Frameworks */, - 9AABEADB243FB13500668CB0 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 9A0C82ED24460FB100FAE3D4 /* PBXTargetDependency */, - ); - name = ModuleKit; - packageProductDependencies = ( - 9A27D4FC2538A3E5001BB651 /* Repeat */, - ); - productName = ModuleKit; - productReference = 9AABEADD243FB13500668CB0 /* ModuleKit.framework */; - productType = "com.apple.product-type.framework"; - }; 9ABFF8F5248BEBCB00C9041A /* Battery */ = { isa = PBXNativeTarget; buildConfigurationList = 9ABFF901248BEBCB00C9041A /* Build configuration list for PBXNativeTarget "Battery" */; @@ -1206,8 +1082,7 @@ buildRules = ( ); dependencies = ( - 9ABFF909248BEC2600C9041A /* PBXTargetDependency */, - 9ABFF90E248BEC2900C9041A /* PBXTargetDependency */, + 9A2847DE2666AAA000EC1F6D /* PBXTargetDependency */, ); name = Battery; productName = Battery; @@ -1242,8 +1117,7 @@ buildRules = ( ); dependencies = ( - 9AE29AE4249A50640071B02D /* PBXTargetDependency */, - 9AE29AE8249A50640071B02D /* PBXTargetDependency */, + 9A2847E32666AAA400EC1F6D /* PBXTargetDependency */, ); name = Sensors; productName = Sensors; @@ -1262,8 +1136,7 @@ buildRules = ( ); dependencies = ( - 9AF9EE1724649BAD005D2270 /* PBXTargetDependency */, - 9A3E17C4247A8F5E00449CD1 /* PBXTargetDependency */, + 9A2847D42666AA9500EC1F6D /* PBXTargetDependency */, ); name = Disk; productName = Disk; @@ -1283,10 +1156,6 @@ LastUpgradeCheck = 1240; ORGANIZATIONNAME = "Serhiy Mytrovtsiy"; TargetAttributes = { - 9A0C82D924460F7200FAE3D4 = { - CreatedOnToolsVersion = 11.4; - LastSwiftMigration = 1140; - }; 9A1410F4229E721100D29793 = { CreatedOnToolsVersion = 10.2.1; LastSwiftMigration = 1030; @@ -1299,6 +1168,10 @@ }; }; }; + 9A2846F62666A9CC00EC1F6D = { + CreatedOnToolsVersion = 12.4; + LastSwiftMigration = 1240; + }; 9A343526243E26A0006B19F9 = { CreatedOnToolsVersion = 11.4; }; @@ -1322,10 +1195,6 @@ CreatedOnToolsVersion = 12.0.1; LastSwiftMigration = 1200; }; - 9AABEADC243FB13500668CB0 = { - CreatedOnToolsVersion = 11.4; - LastSwiftMigration = 1140; - }; 9ABFF8F5248BEBCB00C9041A = { CreatedOnToolsVersion = 11.5; LastSwiftMigration = 1150; @@ -1383,8 +1252,7 @@ targets = ( 9A1410F4229E721100D29793 /* Stats */, 9A343526243E26A0006B19F9 /* LaunchAtLogin */, - 9AABEADC243FB13500668CB0 /* ModuleKit */, - 9A0C82D924460F7200FAE3D4 /* StatsKit */, + 9A2846F62666A9CC00EC1F6D /* Kit */, 9A97CEC92537331B00742D8F /* CPU */, 9A90E18824EAD2BB00471E9A /* GPU */, 9A81C7552449A41400825D92 /* RAM */, @@ -1399,14 +1267,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 9A0C82D824460F7200FAE3D4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9AECEF3B24ACF7BA00DB95D4 /* updater.sh in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A1410F3229E721100D29793 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1416,6 +1276,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9A2846F52666A9CC00EC1F6D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9A2848892666AC0100EC1F6D /* Assets.xcassets in Resources */, + 9A2848082666AB3000EC1F6D /* updater.sh in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A343525243E26A0006B19F9 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1463,14 +1332,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9AABEADB243FB13500668CB0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9AA4A00A2443656D00ECCF07 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9ABFF8F4248BEBCB00C9041A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1518,23 +1379,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 9A0C82D624460F7200FAE3D4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9A81C7702449B8D500825D92 /* Charts.swift in Sources */, - 9A0C82E624460F9A00FAE3D4 /* extensions.swift in Sources */, - 9A0C82E724460F9C00FAE3D4 /* updater.swift in Sources */, - 9A885B1A26513253000E43FE /* constants.swift in Sources */, - 9A1D5E4B25235C8100B82BFC /* helpers.swift in Sources */, - 9A0C82EE2446124800FAE3D4 /* SystemKit.swift in Sources */, - 9A9D728A24471FAE005CF997 /* SMC.swift in Sources */, - 9A5F191626220D510085C3CC /* types.swift in Sources */, - 9A0C82E824460F9E00FAE3D4 /* launchAtLogin.swift in Sources */, - 9A0C82E924460F9F00FAE3D4 /* store.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A1410F1229E721100D29793 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1549,6 +1393,37 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9A2846F32666A9CC00EC1F6D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9A2847612666AA2700EC1F6D /* PieChart.swift in Sources */, + 9A2847672666AA2700EC1F6D /* BarChart.swift in Sources */, + 9A28477B2666AA5000EC1F6D /* popup.swift in Sources */, + 9A2848202666AB3600EC1F6D /* types.swift in Sources */, + 9A28481E2666AB3600EC1F6D /* extensions.swift in Sources */, + 9A2848092666AB3000EC1F6D /* Store.swift in Sources */, + 9A28481F2666AB3600EC1F6D /* constants.swift in Sources */, + 9A28480A2666AB3000EC1F6D /* SystemKit.swift in Sources */, + 9A28477D2666AA5000EC1F6D /* widget.swift in Sources */, + 9A2848212666AB3600EC1F6D /* helpers.swift in Sources */, + 9A28477A2666AA5000EC1F6D /* settings.swift in Sources */, + 9A28475F2666AA2700EC1F6D /* LineChart.swift in Sources */, + 9A28480E2666AB3000EC1F6D /* updater.swift in Sources */, + 9A2847622666AA2700EC1F6D /* Label.swift in Sources */, + 9A28477C2666AA5000EC1F6D /* reader.swift in Sources */, + 9A2847652666AA2700EC1F6D /* Memory.swift in Sources */, + 9A2847642666AA2700EC1F6D /* Battery.swift in Sources */, + 9A28480C2666AB3000EC1F6D /* SMC.swift in Sources */, + 9A28480B2666AB3000EC1F6D /* Charts.swift in Sources */, + 9A2847632666AA2700EC1F6D /* Mini.swift in Sources */, + 9A2847602666AA2700EC1F6D /* NetworkChart.swift in Sources */, + 9A2847792666AA5000EC1F6D /* module.swift in Sources */, + 9A2847662666AA2700EC1F6D /* Speed.swift in Sources */, + 9A2847682666AA2700EC1F6D /* Sensors.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A343523243E26A0006B19F9 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1612,28 +1487,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9AABEAD9243FB13500668CB0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9A3E17E8247AA8E100449CD1 /* Speed.swift in Sources */, - 9AA64264244B94F300416A33 /* LineChart.swift in Sources */, - 9A1A7ABA24561F0B00A84F7A /* BarChart.swift in Sources */, - 9A20E6DA2575555100AC2302 /* PieChart.swift in Sources */, - 9A944D55244920690058F32A /* reader.swift in Sources */, - 9A65295825B78056005E2DE4 /* NetworkChart.swift in Sources */, - 9A599701261121F00043560F /* Label.swift in Sources */, - 9A7C61B42440DF810032695D /* Mini.swift in Sources */, - 9AE29AFE249A82B70071B02D /* Sensors.swift in Sources */, - 9A944D5D24492A8B0058F32A /* popup.swift in Sources */, - 9ABFF912248BF39500C9041A /* Battery.swift in Sources */, - 9AABEAEA243FB15E00668CB0 /* module.swift in Sources */, - 9A944D5B244925720058F32A /* widget.swift in Sources */, - 9A41530C24ABC3AF00A2BDA7 /* Memory.swift in Sources */, - 9A81C75024499D6600825D92 /* settings.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9ABFF8F2248BEBCB00C9041A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1682,51 +1535,61 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 9A0C82E024460F7200FAE3D4 /* PBXTargetDependency */ = { + 9A2846FD2666A9CC00EC1F6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A0C82DF24460F7200FAE3D4 /* PBXContainerItemProxy */; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2846FC2666A9CC00EC1F6D /* PBXContainerItemProxy */; }; - 9A0C82ED24460FB100FAE3D4 /* PBXTargetDependency */ = { + 9A2847C52666AA8700EC1F6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A0C82EC24460FB100FAE3D4 /* PBXContainerItemProxy */; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847C42666AA8700EC1F6D /* PBXContainerItemProxy */; }; - 9A3E17C4247A8F5E00449CD1 /* PBXTargetDependency */ = { + 9A2847CA2666AA8C00EC1F6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A3E17C3247A8F5E00449CD1 /* PBXContainerItemProxy */; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847C92666AA8C00EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847CF2666AA9100EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847CE2666AA9100EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847D42666AA9500EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847D32666AA9500EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847D92666AA9C00EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847D82666AA9C00EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847DE2666AAA000EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847DD2666AAA000EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847E32666AAA400EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847E22666AAA400EC1F6D /* PBXContainerItemProxy */; + }; + 9A2847E82666AAA900EC1F6D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A2846F62666A9CC00EC1F6D /* Kit */; + targetProxy = 9A2847E72666AAA900EC1F6D /* PBXContainerItemProxy */; }; 9A3E17D2247A94AF00449CD1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9A3E17CB247A94AF00449CD1 /* Net */; targetProxy = 9A3E17D1247A94AF00449CD1 /* PBXContainerItemProxy */; }; - 9A3E17E1247A94DC00449CD1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9A3E17E0247A94DC00449CD1 /* PBXContainerItemProxy */; - }; - 9A3E17E5247A94DC00449CD1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A3E17E4247A94DC00449CD1 /* PBXContainerItemProxy */; - }; 9A81C75C2449A41400825D92 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9A81C7552449A41400825D92 /* RAM */; targetProxy = 9A81C75B2449A41400825D92 /* PBXContainerItemProxy */; }; - 9A81C7652449A41E00825D92 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9A81C7642449A41E00825D92 /* PBXContainerItemProxy */; - }; - 9A81C76E2449AE9400825D92 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A81C76D2449AE9400825D92 /* PBXContainerItemProxy */; - }; 9A8DE58D253DEFA9006A748F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9A8DE586253DEFA9006A748F /* Fans */; @@ -1737,86 +1600,26 @@ target = 9A90E18824EAD2BB00471E9A /* GPU */; targetProxy = 9A90E18E24EAD2BB00471E9A /* PBXContainerItemProxy */; }; - 9A90E19C24EAD3E300471E9A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9A90E19B24EAD3E300471E9A /* PBXContainerItemProxy */; - }; - 9A90E1A024EAD3E300471E9A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A90E19F24EAD3E300471E9A /* PBXContainerItemProxy */; - }; 9A97CED02537331B00742D8F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9A97CEC92537331B00742D8F /* CPU */; targetProxy = 9A97CECF2537331B00742D8F /* PBXContainerItemProxy */; }; - 9A97CF0A2537351600742D8F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9A97CF092537351600742D8F /* PBXContainerItemProxy */; - }; - 9A97CF0F2537351800742D8F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9A97CF0E2537351800742D8F /* PBXContainerItemProxy */; - }; - 9AABEAE3243FB13500668CB0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9AABEAE2243FB13500668CB0 /* PBXContainerItemProxy */; - }; - 9AB1573125407F7B00671260 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9AB1573025407F7B00671260 /* PBXContainerItemProxy */; - }; - 9AB1574025407F7E00671260 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9AB1573F25407F7E00671260 /* PBXContainerItemProxy */; - }; 9ABFF8FC248BEBCB00C9041A /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9ABFF8F5248BEBCB00C9041A /* Battery */; targetProxy = 9ABFF8FB248BEBCB00C9041A /* PBXContainerItemProxy */; }; - 9ABFF909248BEC2600C9041A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9ABFF908248BEC2600C9041A /* PBXContainerItemProxy */; - }; - 9ABFF90E248BEC2900C9041A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9ABFF90D248BEC2900C9041A /* PBXContainerItemProxy */; - }; 9AE29ADB249A50350071B02D /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9AE29AD4249A50350071B02D /* Sensors */; targetProxy = 9AE29ADA249A50350071B02D /* PBXContainerItemProxy */; }; - 9AE29AE4249A50640071B02D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9AE29AE3249A50640071B02D /* PBXContainerItemProxy */; - }; - 9AE29AE8249A50640071B02D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A0C82D924460F7200FAE3D4 /* StatsKit */; - targetProxy = 9AE29AE7249A50640071B02D /* PBXContainerItemProxy */; - }; 9AF9EE0824648751005D2270 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9AF9EE0124648751005D2270 /* Disk */; targetProxy = 9AF9EE0724648751005D2270 /* PBXContainerItemProxy */; }; - 9AF9EE1724649BAD005D2270 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9AABEADC243FB13500668CB0 /* ModuleKit */; - targetProxy = 9AF9EE1624649BAD005D2270 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1852,81 +1655,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 9A0C82E424460F7200FAE3D4 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RP2S87B72W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - INFOPLIST_FILE = StatsKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.StatsKit; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 9A0C82E524460F7200FAE3D4 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RP2S87B72W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - INFOPLIST_FILE = StatsKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.StatsKit; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 9A141103229E721200D29793 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2120,6 +1848,69 @@ }; name = Release; }; + 9A2847012666A9CC00EC1F6D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = RP2S87B72W; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Kit/Supporting Files/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.14; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.Kit; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 9A2847022666A9CC00EC1F6D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = RP2S87B72W; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Kit/Supporting Files/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.14; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.Kit; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 9A343538243E26A0006B19F9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2489,69 +2280,6 @@ }; name = Release; }; - 9AABEAE6243FB13500668CB0 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RP2S87B72W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "ModuleKit/Supporting Files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.ModuleKit; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 9AABEAE7243FB13500668CB0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RP2S87B72W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "ModuleKit/Supporting Files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats.ModuleKit; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 9ABFF8FF248BEBCB00C9041A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2778,15 +2506,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9A0C82E324460F7200FAE3D4 /* Build configuration list for PBXNativeTarget "StatsKit" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9A0C82E424460F7200FAE3D4 /* Debug */, - 9A0C82E524460F7200FAE3D4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9A1410F0229E721100D29793 /* Build configuration list for PBXProject "Stats" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2805,6 +2524,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 9A2847002666A9CC00EC1F6D /* Build configuration list for PBXNativeTarget "Kit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9A2847012666A9CC00EC1F6D /* Debug */, + 9A2847022666A9CC00EC1F6D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 9A343537243E26A0006B19F9 /* Build configuration list for PBXNativeTarget "LaunchAtLogin" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2859,15 +2587,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9AABEAE8243FB13500668CB0 /* Build configuration list for PBXNativeTarget "ModuleKit" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9AABEAE6243FB13500668CB0 /* Debug */, - 9AABEAE7243FB13500668CB0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9ABFF901248BEBCB00C9041A /* Build configuration list for PBXNativeTarget "Battery" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2926,16 +2645,16 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 9A27D4FC2538A3E5001BB651 /* Repeat */ = { - isa = XCSwiftPackageProductDependency; - package = 9A27D4D72538A38A001BB651 /* XCRemoteSwiftPackageReference "Repeat" */; - productName = Repeat; - }; 9A27D5342538A456001BB651 /* Reachability */ = { isa = XCSwiftPackageProductDependency; package = 9A27D4D42538A37D001BB651 /* XCRemoteSwiftPackageReference "Reachability" */; productName = Reachability; }; + 9A2847AA2666AA7B00EC1F6D /* Repeat */ = { + isa = XCSwiftPackageProductDependency; + package = 9A27D4D72538A38A001BB651 /* XCRemoteSwiftPackageReference "Repeat" */; + productName = Repeat; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 9A1410ED229E721100D29793 /* Project object */; diff --git a/Stats/AppDelegate.swift b/Stats/AppDelegate.swift index 509048a1..bf795d48 100755 --- a/Stats/AppDelegate.swift +++ b/Stats/AppDelegate.swift @@ -9,8 +9,7 @@ import Cocoa import os.log -import StatsKit -import ModuleKit +import Kit import CPU import RAM diff --git a/Stats/Views/AppSettings.swift b/Stats/Views/AppSettings.swift index aa2b65fa..e0703fa7 100644 --- a/Stats/Views/AppSettings.swift +++ b/Stats/Views/AppSettings.swift @@ -10,7 +10,7 @@ // import Cocoa -import StatsKit +import Kit import os.log class ApplicationSettings: NSScrollView { diff --git a/Stats/Views/Dashboard.swift b/Stats/Views/Dashboard.swift index 8856d95b..2226a7ce 100644 --- a/Stats/Views/Dashboard.swift +++ b/Stats/Views/Dashboard.swift @@ -10,8 +10,7 @@ // import Cocoa -import StatsKit -import ModuleKit +import Kit import os.log class Dashboard: NSScrollView { diff --git a/Stats/Views/Settings.swift b/Stats/Views/Settings.swift index c226701c..77847e6b 100644 --- a/Stats/Views/Settings.swift +++ b/Stats/Views/Settings.swift @@ -10,8 +10,7 @@ // import Cocoa -import ModuleKit -import StatsKit +import Kit class SettingsWindow: NSWindow, NSWindowDelegate { private let viewController: SettingsViewController = SettingsViewController() diff --git a/Stats/Views/Update.swift b/Stats/Views/Update.swift index 5e0b2a30..377fdefd 100644 --- a/Stats/Views/Update.swift +++ b/Stats/Views/Update.swift @@ -10,7 +10,7 @@ // import Cocoa -import StatsKit +import Kit import os.log class UpdateWindow: NSWindow, NSWindowDelegate { diff --git a/Stats/helpers.swift b/Stats/helpers.swift index dd8f56d0..d5585b8c 100644 --- a/Stats/helpers.swift +++ b/Stats/helpers.swift @@ -10,8 +10,8 @@ // import Cocoa +import Kit import os.log -import StatsKit extension AppDelegate { internal func parseArguments() { diff --git a/StatsKit/Info.plist b/StatsKit/Info.plist deleted file mode 100644 index 20202aa7..00000000 --- a/StatsKit/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. - - diff --git a/StatsKit/StatsKit.h b/StatsKit/StatsKit.h deleted file mode 100644 index acae1b22..00000000 --- a/StatsKit/StatsKit.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// StatsKit.h -// StatsKit -// -// Created by Serhiy Mytrovtsiy on 14/04/2020. -// Using Swift 5.0. -// Running on macOS 10.15. -// -// Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. -// - -#import - -FOUNDATION_EXPORT double StatsKitVersionNumber; -FOUNDATION_EXPORT const unsigned char StatsKitVersionString[]; diff --git a/StatsKit/launchAtLogin.swift b/StatsKit/launchAtLogin.swift deleted file mode 100644 index a895334f..00000000 --- a/StatsKit/launchAtLogin.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// launchAtLogin.swift -// StatsKit -// -// Created by Serhiy Mytrovtsiy on 14/04/2020. -// Using Swift 5.0. -// Running on macOS 10.15. -// -// Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved. -// - -import Cocoa -import ServiceManagement - -public struct LaunchAtLogin { - private static let id = "\(Bundle.main.bundleIdentifier!).LaunchAtLogin" - - public static var isEnabled: Bool { - get { - guard let jobs = (SMCopyAllJobDictionaries(kSMDomainUserLaunchd).takeRetainedValue() as? [[String: AnyObject]]) else { - return false - } - - let job = jobs.first { $0["Label"] as! String == id } - - return job?["OnDemand"] as? Bool ?? false - } - set { - SMLoginItemSetEnabled(id as CFString, newValue) - } - } -}