xCode 12, iOS 14

dani-gavrilov · Sep 21, 2020 · 46164e9 · 46164e9
1 parent b9207be
commit 46164e9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/GDPerformanceView-Swift.podspec b/GDPerformanceView-Swift.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name         = "GDPerformanceView-Swift"
-  s.version      = "2.0.3"
+  s.version      = "2.1.0"
   s.summary      = "Shows FPS, CPU and memory usage, device model, app and iOS versions above the status bar and report FPS, CPU and memory usage via delegate."
   s.homepage     = "https://github.com/dani-gavrilov/GDPerformanceView-Swift"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Gavrilov Daniil" => "[email protected]" }
-  s.platform     = :ios, "8.0"
-  s.ios.deployment_target = "8.0"
+  s.platform     = :ios, "9.0"
+  s.ios.deployment_target = "9.0"
   s.source       = { :git => "https://github.com/dani-gavrilov/GDPerformanceView-Swift.git", :tag => s.version.to_s }
   s.source_files = "GDPerformanceView-Swift/GDPerformanceMonitoring/*.swift"
   s.frameworks = "UIKit", "Foundation", "QuartzCore"  

diff --git a/GDPerformanceView-Swift.xcodeproj/project.pbxproj b/GDPerformanceView-Swift.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
 		0C340AC321A348C600734F1C /* PerformanceMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C340AB621A348C600734F1C /* PerformanceMonitor.swift */; };
 		0C340AC421A348C600734F1C /* PerformanceСalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C340AB721A348C600734F1C /* PerformanceСalculator.swift */; };
 		0C340AC521A348C600734F1C /* PerformanceСalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C340AB721A348C600734F1C /* PerformanceСalculator.swift */; };
+		1B076A082518CB1A0086536C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB46D87824F86404006F54B3 /* Extensions.swift */; };
 		42AD06F31E1D18C400A5C840 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42AD06E71E1D18C400A5C840 /* AppDelegate.swift */; };
 		42AD06F41E1D18C400A5C840 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42AD06E81E1D18C400A5C840 /* Assets.xcassets */; };
 		42AD06F51E1D18C400A5C840 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42AD06E91E1D18C400A5C840 /* LaunchScreen.storyboard */; };
@@ -207,7 +208,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 1120;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Daniil Gavrilov";
 				TargetAttributes = {
 					4237B6D71E0FE2290059FF8B = {
@@ -268,6 +269,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C340ABE21A348C600734F1C /* LinkedFramesList.swift in Sources */,
+				1B076A082518CB1A0086536C /* Extensions.swift in Sources */,
 				42AD06F31E1D18C400A5C840 /* AppDelegate.swift in Sources */,
 				0C340ABC21A348C600734F1C /* Protocols.swift in Sources */,
 				0C340AC221A348C600734F1C /* PerformanceMonitor.swift in Sources */,
@@ -348,6 +350,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -372,7 +375,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -407,6 +410,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -425,7 +429,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -441,9 +445,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = RU64C364MT;
 				INFOPLIST_FILE = "GDPerformanceView-Swift/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "GD.GDPerformanceView-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -457,9 +461,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = RU64C364MT;
 				INFOPLIST_FILE = "GDPerformanceView-Swift/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "GD.GDPerformanceView-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -478,9 +482,9 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "GDPerformanceView-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "GD.GDPerformanceView-iOS";
 				PRODUCT_NAME = GDPerformanceView;
 				SKIP_INSTALL = YES;
@@ -503,9 +507,9 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "GDPerformanceView-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "GD.GDPerformanceView-iOS";
 				PRODUCT_NAME = GDPerformanceView;
 				SKIP_INSTALL = YES;

diff --git a/GDPerformanceView-Swift.xcodeproj/xcshareddata/xcschemes/GDPerformanceView-iOS.xcscheme b/GDPerformanceView-Swift.xcodeproj/xcshareddata/xcschemes/GDPerformanceView-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/GDPerformanceView-Swift/GDPerformanceMonitoring/PerformanceСalculator.swift b/GDPerformanceView-Swift/GDPerformanceMonitoring/PerformanceСalculator.swift
@@ -93,15 +93,15 @@ private extension PerformanceCalculator {
 
     func cpuUsage() -> Double {
         var totalUsageOfCPU: Double = 0.0
-        var threadsList = UnsafeMutablePointer(mutating: [thread_act_t]())
+        var threadsList: thread_act_array_t?
         var threadsCount = mach_msg_type_number_t(0)
         let threadsResult = withUnsafeMutablePointer(to: &threadsList) {
             return $0.withMemoryRebound(to: thread_act_array_t?.self, capacity: 1) {
                 task_threads(mach_task_self_, $0, &threadsCount)
             }
         }
 
-        if threadsResult == KERN_SUCCESS {
+        if threadsResult == KERN_SUCCESS, let threadsList = threadsList {
             for index in 0..<threadsCount {
                 var threadInfo = thread_basic_info()
                 var threadInfoCount = mach_msg_type_number_t(THREAD_INFO_MAX)

diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 Shows FPS, CPU and memory usage, device model, app and iOS versions above the status bar and report FPS, CPU and memory usage via delegate.
 
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) 
-[![Pod Version](https://img.shields.io/badge/Pod-2.0.3-6193DF.svg)](https://cocoapods.org/)
-![Swift Version](https://img.shields.io/badge/xCode-10.1+-blue.svg)
-![Swift Version](https://img.shields.io/badge/iOS-8.0+-blue.svg) 
-![Swift Version](https://img.shields.io/badge/Swift-4.2+-orange.svg)
+[![Pod Version](https://img.shields.io/badge/Pod-2.1.0-6193DF.svg)](https://cocoapods.org/)
+![Swift Version](https://img.shields.io/badge/xCode-12.0+-blue.svg)
+![Swift Version](https://img.shields.io/badge/iOS-9.0+-blue.svg) 
+![Swift Version](https://img.shields.io/badge/Swift-5.0+-orange.svg)
 ![Plaform](https://img.shields.io/badge/Platform-iOS-lightgrey.svg)
 ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) 
 
@@ -21,7 +21,7 @@ Simply add GDPerformanceMonitoring folder with files to your project, or use Coc
 Create a `Cartfile` that lists the framework and run `carthage update`. Follow the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add `$(SRCROOT)/Carthage/Build/iOS/GDPerformanceView.framework` to an iOS project.
 
 ```ruby
-github "dani-gavrilov/GDPerformanceView-Swift" ~> 2.0.3
+github "dani-gavrilov/GDPerformanceView-Swift" ~> 2.1.0
 ```
 Don't forget to import GDPerformanceView by adding: 
 
@@ -37,7 +37,7 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'project_name' do
-	pod 'GDPerformanceView-Swift', '~> 2.0.3'
+	pod 'GDPerformanceView-Swift', '~> 2.1.0'
 end
 ```
 Don't forget to import GDPerformanceView by adding: