Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 4 #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Swift 4 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ab503f
Swift 3
OskarGroth Aug 14, 2016
60dcaf3
v0.0.6 Swift 3 Beta 6 Support
OskarGroth Aug 18, 2016
466f3a4
Swift 3.0.1
OskarGroth Nov 2, 2016
64df008
Merge branch 'master' of git://github.com/beltex/SystemKit
OskarGroth Jun 28, 2018
6975606
Swift 4, fix errors
OskarGroth Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ let counts = System.processCounts()
print("\tPROCESSES: \(counts.processCount)")
print("\tTHREADS: \(counts.threadCount)")

let loadAverage = System.loadAverage().map { NSString(format:"%.2f", $0) }
let loadAverage = System.loadAverage().map { Double(round(100*$0)/100) } // Round to 2 decimals
print("\tLOAD AVERAGE: \(loadAverage)")
print("\tMACH FACTOR: \(System.machFactor())")

Expand Down
42 changes: 32 additions & 10 deletions SystemKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,20 +231,20 @@
4C543D131A08396700C5D9B2 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = beltex;
TargetAttributes = {
4C4BE6061A083A690085170A = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
4C543D1B1A08396700C5D9B2 = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
4C543D261A08396700C5D9B2 = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
};
};
Expand Down Expand Up @@ -341,15 +341,17 @@
);
OTHER_SWIFT_FLAGS = "-D DEBUG";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
4C4BE60C1A083A690085170A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -361,14 +363,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -409,14 +419,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -459,7 +477,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -479,7 +498,8 @@
PRODUCT_BUNDLE_IDENTIFIER = "beltex.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -499,7 +519,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "beltex.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -515,7 +536,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "beltex.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions SystemKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion SystemKit.xcodeproj/xcshareddata/xcschemes/SystemKit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
20 changes: 10 additions & 10 deletions SystemKit/Battery.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public struct Battery {
*/
public func currentCapacity() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.CurrentCapacity.rawValue as CFString!,
Key.CurrentCapacity.rawValue as CFString,
kCFAllocatorDefault,0)
return prop!.takeUnretainedValue() as! Int
}
Expand All @@ -176,7 +176,7 @@ public struct Battery {
*/
public func maxCapactiy() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.MaxCapacity.rawValue as CFString!,
Key.MaxCapacity.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Int
}
Expand All @@ -191,7 +191,7 @@ public struct Battery {
*/
public func designCapacity() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.DesignCapacity.rawValue as CFString!,
Key.DesignCapacity.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Int
}
Expand All @@ -204,7 +204,7 @@ public struct Battery {
*/
public func cycleCount() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.CycleCount.rawValue as CFString!,
Key.CycleCount.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Int
}
Expand All @@ -217,7 +217,7 @@ public struct Battery {
*/
public func designCycleCount() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.DesignCycleCount.rawValue as CFString!,
Key.DesignCycleCount.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Int
}
Expand All @@ -230,7 +230,7 @@ public struct Battery {
*/
public func isACPowered() -> Bool {
let prop = IORegistryEntryCreateCFProperty(service,
Key.ACPowered.rawValue as CFString!,
Key.ACPowered.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Bool
}
Expand All @@ -243,7 +243,7 @@ public struct Battery {
*/
public func isCharging() -> Bool {
let prop = IORegistryEntryCreateCFProperty(service,
Key.IsCharging.rawValue as CFString!,
Key.IsCharging.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Bool
}
Expand All @@ -256,7 +256,7 @@ public struct Battery {
*/
public func isCharged() -> Bool {
let prop = IORegistryEntryCreateCFProperty(service,
Key.FullyCharged.rawValue as CFString!,
Key.FullyCharged.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Bool
}
Expand All @@ -282,7 +282,7 @@ public struct Battery {
*/
public func timeRemaining() -> Int {
let prop = IORegistryEntryCreateCFProperty(service,
Key.TimeRemaining.rawValue as CFString!,
Key.TimeRemaining.rawValue as CFString,
kCFAllocatorDefault, 0)
return prop!.takeUnretainedValue() as! Int
}
Expand Down Expand Up @@ -312,7 +312,7 @@ public struct Battery {
*/
public func temperature(_ unit: TemperatureUnit = .celsius) -> Double {
let prop = IORegistryEntryCreateCFProperty(service,
Key.Temperature.rawValue as CFString!,
Key.Temperature.rawValue as CFString,
kCFAllocatorDefault, 0)

var temperature = prop?.takeUnretainedValue() as! Double / 100.0
Expand Down
2 changes: 1 addition & 1 deletion SystemKit/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.0.5</string>
<string>0.0.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
14 changes: 7 additions & 7 deletions SystemKit/System.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public struct System {
else { name = String() }


ptr.deallocate(capacity: 1)
ptr.deallocate()

#if DEBUG
if result != 0 {
Expand Down Expand Up @@ -461,7 +461,7 @@ public struct System {
as! Double
}

status.deallocate(capacity: 1)
status.deallocate()

return (processorSpeed, processorCount, schedulerTime)
}
Expand Down Expand Up @@ -523,7 +523,7 @@ public struct System {
}

let data = hostInfo.move()
hostInfo.deallocate(capacity: 1)
hostInfo.deallocate()

#if DEBUG
if result != KERN_SUCCESS {
Expand All @@ -547,7 +547,7 @@ public struct System {
}

let data = hostInfo.move()
hostInfo.deallocate(capacity: 1)
hostInfo.deallocate()

#if DEBUG
if result != KERN_SUCCESS {
Expand All @@ -571,7 +571,7 @@ public struct System {
}

let data = hostInfo.move()
hostInfo.deallocate(capacity: 1)
hostInfo.deallocate()

#if DEBUG
if result != KERN_SUCCESS {
Expand Down Expand Up @@ -624,7 +624,7 @@ public struct System {
mach_port_deallocate(mach_task_self_, pset)

let data = info_out.move()
info_out.deallocate(capacity: 1)
info_out.deallocate()

return data
}
Expand All @@ -649,7 +649,7 @@ public struct System {
}

let data = hostInfo.move()
hostInfo.deallocate(capacity: 1)
hostInfo.deallocate()

#if DEBUG
if result != KERN_SUCCESS {
Expand Down