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

Updated for Swift 5 #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated for Swift 5 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 57 additions & 17 deletions SystemKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -231,7 +231,7 @@
4C543D131A08396700C5D9B2 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = beltex;
TargetAttributes = {
4C4BE6061A083A690085170A = {
Expand All @@ -240,20 +240,21 @@
};
4C543D1B1A08396700C5D9B2 = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1150;
};
4C543D261A08396700C5D9B2 = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1150;
};
};
};
buildConfigurationList = 4C543D161A08396700C5D9B2 /* Build configuration list for PBXProject "SystemKit" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
compatibilityVersion = "Xcode 10.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 4C543D121A08396700C5D9B2;
productRefGroup = 4C543D1D1A08396700C5D9B2 /* Products */;
Expand Down Expand Up @@ -335,40 +336,51 @@
4C4BE60B1A083A690085170A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
OTHER_SWIFT_FLAGS = "-D DEBUG";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
4C4BE60C1A083A690085170A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
4C543D301A08396700C5D9B2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
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 @@ -396,6 +408,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -405,18 +418,27 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
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 All @@ -436,7 +458,9 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -454,12 +478,16 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = SystemKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "beltex.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -475,11 +503,15 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = SystemKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "beltex.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -496,10 +528,14 @@
"$(inherited)",
);
INFOPLIST_FILE = SystemKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
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_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -512,10 +548,14 @@
"$(inherited)",
);
INFOPLIST_FILE = SystemKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
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_VERSION = 5.0;
};
name = Release;
};
Expand Down
24 changes: 10 additions & 14 deletions 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 = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C543D1B1A08396700C5D9B2"
BuildableName = "SystemKit.framework"
BlueprintName = "SystemKit"
ReferencedContainer = "container:SystemKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C543D1B1A08396700C5D9B2"
BuildableName = "SystemKit.framework"
BlueprintName = "SystemKit"
ReferencedContainer = "container:SystemKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:SystemKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
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
Loading