From 5c41932c505a8dcd6feb978713120316f8d1da8f Mon Sep 17 00:00:00 2001 From: Gareth Miller Date: Thu, 27 Sep 2018 13:42:37 +0100 Subject: [PATCH 1/2] Removed use of deprecated .frameInterval in place of .preferredFramePerSecond --- .../M13ProgressViewLetterpress.m | 4 ++- M13ProgressSuite.xcodeproj/project.pbxproj | 30 ++++++++++++++++++- .../M13ProgressSuiteFramework.xcscheme | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Classes/ProgressViews/M13ProgressViewLetterpress.m b/Classes/ProgressViews/M13ProgressViewLetterpress.m index aeaf40d..abc33e4 100644 --- a/Classes/ProgressViews/M13ProgressViewLetterpress.m +++ b/Classes/ProgressViews/M13ProgressViewLetterpress.m @@ -213,7 +213,9 @@ - (void)animateProgress:(CADisplayLink *)displayLink - (void)rotateWithDisplayLink:(CADisplayLink *)displayLink { //Take account for lag - for (int i = 0; i < displayLink.frameInterval; i++){ + NSInteger timeInterval = 0; + + for (int i = 0; i < displayLink.preferredFramesPerSecond; i++){ //Calculate the new angle CGFloat displacement = rotation - restRotation; diff --git a/M13ProgressSuite.xcodeproj/project.pbxproj b/M13ProgressSuite.xcodeproj/project.pbxproj index 83862fc..21224f2 100644 --- a/M13ProgressSuite.xcodeproj/project.pbxproj +++ b/M13ProgressSuite.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ CA2FAF901889907300BCAEF5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0720; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Brandon McQuilkin"; TargetAttributes = { CA2FAFBB1889907300BCAEF5 = { @@ -888,19 +888,32 @@ 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -928,18 +941,31 @@ 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1045,6 +1071,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; @@ -1077,6 +1104,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme index 7ce4552..a715cd0 100644 --- a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme +++ b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 27 Sep 2018 13:44:04 +0100 Subject: [PATCH 2/2] Removed rogue unused variable --- Classes/ProgressViews/M13ProgressViewLetterpress.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/Classes/ProgressViews/M13ProgressViewLetterpress.m b/Classes/ProgressViews/M13ProgressViewLetterpress.m index abc33e4..3d81edc 100644 --- a/Classes/ProgressViews/M13ProgressViewLetterpress.m +++ b/Classes/ProgressViews/M13ProgressViewLetterpress.m @@ -213,8 +213,6 @@ - (void)animateProgress:(CADisplayLink *)displayLink - (void)rotateWithDisplayLink:(CADisplayLink *)displayLink { //Take account for lag - NSInteger timeInterval = 0; - for (int i = 0; i < displayLink.preferredFramesPerSecond; i++){ //Calculate the new angle