Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
op06072 committed Jan 27, 2024
1 parent 0309eb0 commit de4b8de
Show file tree
Hide file tree
Showing 8 changed files with 1,032 additions and 190 deletions.
89 changes: 74 additions & 15 deletions socpowerbuddy_swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,29 @@
3A8A035528E3F0800027B16E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8A035428E3F0800027B16E /* main.swift */; };
3A8A035A28E3F6EE0027B16E /* libIOReport.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF36E0B28D21A4C00DA3EB3 /* libIOReport.tbd */; };
3A9A723328D15F5C0021E6F1 /* static.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9A723228D15F5C0021E6F1 /* static.swift */; };
3AC4FF342ACEBA9100880617 /* render.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3DA87D28DC91C000BFEFAC /* render.swift */; };
3AC974B5298184EF00DA67A8 /* readers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AC974B4298184EF00DA67A8 /* readers.m */; };
3AC9F1EA28F02E7B008C5D5C /* libncurses.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AC9F1E928F02E6F008C5D5C /* libncurses.tbd */; };
3AECE96B297AEB4000D45A12 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 3AECE96A297AEB4000D45A12 /* Alamofire */; };
3AECE971297AFCF500D45A12 /* neoasitop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AECE970297AFCF500D45A12 /* neoasitop.swift */; };
3AEF373E2B4EB77900AF72FA /* PathKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3AEF373D2B4EB77900AF72FA /* PathKit */; };
3AEF373F2B5140C800AF72FA /* head.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF36E0D28D2ACCC00DA3EB3 /* head.swift */; };
3AEF37402B51416600AF72FA /* static.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9A723228D15F5C0021E6F1 /* static.swift */; };
3AEF37412B51451F00AF72FA /* smc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EF228D5C64D0033A580 /* smc.swift */; };
3AEF37442B64D13800AF72FA /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EF428D5C6710033A580 /* readers.swift */; };
3AEF374A2B64D37A00AF72FA /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EEE28D5C1F20033A580 /* Types.swift */; };
3AEF374B2B64D3C800AF72FA /* helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EEA28D5BFC10033A580 /* helper.swift */; };
3AEF374E2B64D3EF00AF72FA /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EE828D5BF410033A580 /* Logger.swift */; };
3AEF374F2B64D41700AF72FA /* Module.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EFC28D5C9B70033A580 /* Module.swift */; };
3AEF37522B64D47900AF72FA /* reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EF828D5C8210033A580 /* reader.swift */; };
3AEF37532B64D49800AF72FA /* Repeater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238F0028D5CCEF0033A580 /* Repeater.swift */; };
3AEF37542B64D4BB00AF72FA /* SystemKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EE628D5BED50033A580 /* SystemKit.swift */; };
3AEF37552B64D4C900AF72FA /* extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EF028D5C2AA0033A580 /* extensions.swift */; };
3AEF37572B64D55A00AF72FA /* values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EF628D5C6910033A580 /* values.swift */; };
3AEF37582B64D55D00AF72FA /* Sensors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A238EFA28D5C9360033A580 /* Sensors.swift */; };
3AEF37592B64D56000AF72FA /* readers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AC974B4298184EF00DA67A8 /* readers.m */; };
3AF36E0C28D21A6B00DA3EB3 /* libIOReport.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF36E0B28D21A4C00DA3EB3 /* libIOReport.tbd */; };
3AF36E0E28D2ACCC00DA3EB3 /* head.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF36E0D28D2ACCC00DA3EB3 /* head.swift */; };
3AFF17882B48043F00B160D9 /* reporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF17872B48043F00B160D9 /* reporter.swift */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -84,6 +100,7 @@
3AF36E0828D2174A00DA3EB3 /* socpowerbuddy_bridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = socpowerbuddy_bridge.h; sourceTree = "<group>"; };
3AF36E0B28D21A4C00DA3EB3 /* libIOReport.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libIOReport.tbd; path = usr/lib/libIOReport.tbd; sourceTree = SDKROOT; };
3AF36E0D28D2ACCC00DA3EB3 /* head.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = head.swift; sourceTree = "<group>"; };
3AFF17872B48043F00B160D9 /* reporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = reporter.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -101,6 +118,7 @@
files = (
3AF36E0C28D21A6B00DA3EB3 /* libIOReport.tbd in Frameworks */,
3AECE96B297AEB4000D45A12 /* Alamofire in Frameworks */,
3AEF373E2B4EB77900AF72FA /* PathKit in Frameworks */,
3A3DA8AC28E0A76D00BFEFAC /* ArgumentParser in Frameworks */,
3AC9F1EA28F02E7B008C5D5C /* libncurses.tbd in Frameworks */,
);
Expand All @@ -120,6 +138,7 @@
3A9A721F28D15EBB0021E6F1 = {
isa = PBXGroup;
children = (
3AEF37562B64D4EB00AF72FA /* SensorUtil */,
3A238F0228D5E32F0033A580 /* License */,
3A9A722A28D15EBB0021E6F1 /* socpowerbuddy_swift */,
3A8A035328E3F0800027B16E /* IOReportDump */,
Expand All @@ -146,25 +165,33 @@
3AF36E0828D2174A00DA3EB3 /* socpowerbuddy_bridge.h */,
3AF36E0D28D2ACCC00DA3EB3 /* head.swift */,
3A238E8828D2FBD60033A580 /* sampler.swift */,
3A238EE628D5BED50033A580 /* SystemKit.swift */,
3A238EE828D5BF410033A580 /* Logger.swift */,
3A238EEA28D5BFC10033A580 /* helper.swift */,
3A238EEE28D5C1F20033A580 /* Types.swift */,
3A238EF028D5C2AA0033A580 /* extensions.swift */,
3A238EF228D5C64D0033A580 /* smc.swift */,
3A238EF428D5C6710033A580 /* readers.swift */,
3A238EF628D5C6910033A580 /* values.swift */,
3A238EF828D5C8210033A580 /* reader.swift */,
3A238EFA28D5C9360033A580 /* Sensors.swift */,
3A238EFC28D5C9B70033A580 /* Module.swift */,
3A238F0028D5CCEF0033A580 /* Repeater.swift */,
3A3DA87D28DC91C000BFEFAC /* render.swift */,
3A3DA88528DEDC5B00BFEFAC /* util.swift */,
3AC974B4298184EF00DA67A8 /* readers.m */,
3AFF17872B48043F00B160D9 /* reporter.swift */,
);
path = socpowerbuddy_swift;
sourceTree = "<group>";
};
3AEF37562B64D4EB00AF72FA /* SensorUtil */ = {
isa = PBXGroup;
children = (
3A238EE628D5BED50033A580 /* SystemKit.swift */,
3A238EF828D5C8210033A580 /* reader.swift */,
3A238EF428D5C6710033A580 /* readers.swift */,
3A238EFC28D5C9B70033A580 /* Module.swift */,
3A238EEA28D5BFC10033A580 /* helper.swift */,
3AC974B4298184EF00DA67A8 /* readers.m */,
3A238EF628D5C6910033A580 /* values.swift */,
3A238EF228D5C64D0033A580 /* smc.swift */,
3A238EE828D5BF410033A580 /* Logger.swift */,
3A238EF028D5C2AA0033A580 /* extensions.swift */,
3A238EFA28D5C9360033A580 /* Sensors.swift */,
3A238EEE28D5C1F20033A580 /* Types.swift */,
);
path = SensorUtil;
sourceTree = "<group>";
};
3AF36E0928D21A3600DA3EB3 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -210,6 +237,7 @@
packageProductDependencies = (
3A3DA8AB28E0A76D00BFEFAC /* ArgumentParser */,
3AECE96A297AEB4000D45A12 /* Alamofire */,
3AEF373D2B4EB77900AF72FA /* PathKit */,
);
productName = socpowerbuddy_swift;
productReference = 3A9A722828D15EBB0021E6F1 /* socpowerbuddy_swift */;
Expand All @@ -223,7 +251,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1400;
LastUpgradeCheck = 1410;
LastUpgradeCheck = 1500;
TargetAttributes = {
3A8A035128E3F0800027B16E = {
CreatedOnToolsVersion = 14.0;
Expand All @@ -245,6 +273,7 @@
packageReferences = (
3A3DA8A628E09E4500BFEFAC /* XCRemoteSwiftPackageReference "swift-argument-parser" */,
3AECE969297AEB4000D45A12 /* XCRemoteSwiftPackageReference "Alamofire" */,
3AEF373C2B4EB6DF00AF72FA /* XCRemoteSwiftPackageReference "PathKit" */,
);
productRefGroup = 3A9A722928D15EBB0021E6F1 /* Products */;
projectDirPath = "";
Expand All @@ -261,8 +290,22 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3AEF37592B64D56000AF72FA /* readers.m in Sources */,
3AEF37582B64D55D00AF72FA /* Sensors.swift in Sources */,
3AEF37572B64D55A00AF72FA /* values.swift in Sources */,
3AEF37552B64D4C900AF72FA /* extensions.swift in Sources */,
3AEF37542B64D4BB00AF72FA /* SystemKit.swift in Sources */,
3AEF37532B64D49800AF72FA /* Repeater.swift in Sources */,
3AEF37522B64D47900AF72FA /* reader.swift in Sources */,
3AEF374F2B64D41700AF72FA /* Module.swift in Sources */,
3AEF374E2B64D3EF00AF72FA /* Logger.swift in Sources */,
3AEF374B2B64D3C800AF72FA /* helper.swift in Sources */,
3AEF374A2B64D37A00AF72FA /* Types.swift in Sources */,
3AEF37442B64D13800AF72FA /* readers.swift in Sources */,
3AEF37412B51451F00AF72FA /* smc.swift in Sources */,
3AEF37402B51416600AF72FA /* static.swift in Sources */,
3AEF373F2B5140C800AF72FA /* head.swift in Sources */,
3A8A035528E3F0800027B16E /* main.swift in Sources */,
3AC4FF342ACEBA9100880617 /* render.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -286,6 +329,7 @@
3A238EFD28D5C9B70033A580 /* Module.swift in Sources */,
3A238EE728D5BED50033A580 /* SystemKit.swift in Sources */,
3A238EF928D5C8210033A580 /* reader.swift in Sources */,
3AFF17882B48043F00B160D9 /* reporter.swift in Sources */,
3A9A723328D15F5C0021E6F1 /* static.swift in Sources */,
3A238EF728D5C6910033A580 /* values.swift in Sources */,
3A238EFB28D5C9360033A580 /* Sensors.swift in Sources */,
Expand Down Expand Up @@ -362,6 +406,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -424,6 +469,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down Expand Up @@ -521,6 +567,14 @@
minimumVersion = 5.0.0;
};
};
3AEF373C2B4EB6DF00AF72FA /* XCRemoteSwiftPackageReference "PathKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kylef/PathKit.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -534,6 +588,11 @@
package = 3AECE969297AEB4000D45A12 /* XCRemoteSwiftPackageReference "Alamofire" */;
productName = Alamofire;
};
3AEF373D2B4EB77900AF72FA /* PathKit */ = {
isa = XCSwiftPackageProductDependency;
package = 3AEF373C2B4EB6DF00AF72FA /* XCRemoteSwiftPackageReference "PathKit" */;
productName = PathKit;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 3A9A722028D15EBB0021E6F1 /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
"version" : "5.6.4"
}
},
{
"identity" : "pathkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kylef/PathKit.git",
"state" : {
"revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
"version" : "1.0.1"
}
},
{
"identity" : "spectre",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kylef/Spectre.git",
"state" : {
"revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7",
"version" : "0.10.1"
}
},
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A8A035128E3F0800027B16E"
BuildableName = "IOReportDump"
BlueprintName = "IOReportDump"
ReferencedContainer = "container:socpowerbuddy_swift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
viewDebuggingEnabled = "No">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A8A035128E3F0800027B16E"
BuildableName = "IOReportDump"
BlueprintName = "IOReportDump"
ReferencedContainer = "container:socpowerbuddy_swift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A8A035128E3F0800027B16E"
BuildableName = "IOReportDump"
BlueprintName = "IOReportDump"
ReferencedContainer = "container:socpowerbuddy_swift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit de4b8de

Please sign in to comment.