From 0d6a390634c95a42f39af919372988c26fb9e62d Mon Sep 17 00:00:00 2001 From: Selim <47898885+lima0@users.noreply.github.com> Date: Thu, 25 Jun 2020 00:40:23 +0200 Subject: [PATCH] Updated for Swift 5 --- SystemKit.xcodeproj/project.pbxproj | 74 ++++++++++++++----- .../xcshareddata/xcschemes/SystemKit.xcscheme | 24 +++--- SystemKit/Battery.swift | 20 ++--- SystemKit/System.swift | 14 ++-- 4 files changed, 84 insertions(+), 48 deletions(-) diff --git a/SystemKit.xcodeproj/project.pbxproj b/SystemKit.xcodeproj/project.pbxproj index 19c7a91..632b684 100644 --- a/SystemKit.xcodeproj/project.pbxproj +++ b/SystemKit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -231,7 +231,7 @@ 4C543D131A08396700C5D9B2 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1150; ORGANIZATIONNAME = beltex; TargetAttributes = { 4C4BE6061A083A690085170A = { @@ -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 */; @@ -335,21 +336,23 @@ 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; }; @@ -357,18 +360,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; @@ -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 = ""; }; @@ -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; @@ -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 = ""; }; @@ -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; }; @@ -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; }; @@ -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; }; @@ -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; }; diff --git a/SystemKit.xcodeproj/xcshareddata/xcschemes/SystemKit.xcscheme b/SystemKit.xcodeproj/xcshareddata/xcschemes/SystemKit.xcscheme index 70f3e82..8ba0cd1 100644 --- a/SystemKit.xcodeproj/xcshareddata/xcschemes/SystemKit.xcscheme +++ b/SystemKit.xcodeproj/xcshareddata/xcschemes/SystemKit.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - Int { let prop = IORegistryEntryCreateCFProperty(service, - Key.CurrentCapacity.rawValue as CFString!, + Key.CurrentCapacity.rawValue as CFString?, kCFAllocatorDefault,0) return prop!.takeUnretainedValue() as! Int } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 diff --git a/SystemKit/System.swift b/SystemKit/System.swift index c88ffd5..6bccd01 100644 --- a/SystemKit/System.swift +++ b/SystemKit/System.swift @@ -188,7 +188,7 @@ public struct System { else { name = String() } - ptr.deallocate(capacity: 1) + ptr.deallocate() #if DEBUG if result != 0 { @@ -461,7 +461,7 @@ public struct System { as! Double } - status.deallocate(capacity: 1) + status.deallocate() return (processorSpeed, processorCount, schedulerTime) } @@ -523,7 +523,7 @@ public struct System { } let data = hostInfo.move() - hostInfo.deallocate(capacity: 1) + hostInfo.deallocate() #if DEBUG if result != KERN_SUCCESS { @@ -547,7 +547,7 @@ public struct System { } let data = hostInfo.move() - hostInfo.deallocate(capacity: 1) + hostInfo.deallocate() #if DEBUG if result != KERN_SUCCESS { @@ -571,7 +571,7 @@ public struct System { } let data = hostInfo.move() - hostInfo.deallocate(capacity: 1) + hostInfo.deallocate() #if DEBUG if result != KERN_SUCCESS { @@ -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 } @@ -649,7 +649,7 @@ public struct System { } let data = hostInfo.move() - hostInfo.deallocate(capacity: 1) + hostInfo.deallocate() #if DEBUG if result != KERN_SUCCESS {