From 2bcfe6fc5e93d63d0196717878d8ef7c8d382933 Mon Sep 17 00:00:00 2001 From: BlueVirusX Date: Wed, 2 Mar 2016 15:48:31 +0100 Subject: [PATCH] Fixed warnings Fixed warnings: Recommended project settings and cast of variable --- Classes/ProgressViews/M13ProgressViewSegmentedBar.m | 10 +++++----- M13ProgressSuite.xcodeproj/project.pbxproj | 10 +++++++++- .../xcschemes/M13ProgressSuiteFramework.xcscheme | 13 ++++++++----- M13ProgressSuite/M13ProgressSuite-Info.plist | 2 +- M13ProgressSuiteFramework/Info.plist | 2 +- .../M13ProgressSuiteTests-Info.plist | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Classes/ProgressViews/M13ProgressViewSegmentedBar.m b/Classes/ProgressViews/M13ProgressViewSegmentedBar.m index e5d2328..3e771b9 100644 --- a/Classes/ProgressViews/M13ProgressViewSegmentedBar.m +++ b/Classes/ProgressViews/M13ProgressViewSegmentedBar.m @@ -228,7 +228,7 @@ [self setNeedsDisplay]; [CATransaction begin]; for (int i = 0; i < _numberOfSegments; i++) { - CAShapeLayer *layer = _segmentsLayer.sublayers[i]; + CAShapeLayer *layer = (CAShapeLayer *)_segmentsLayer.sublayers[i]; CABasicAnimation *barAnimation = [self barColorAnimation]; barAnimation.fromValue = (id)layer.fillColor; barAnimation.toValue = (id)[self colorForSegment:i].CGColor; @@ -240,7 +240,7 @@ [self setNeedsDisplay]; [CATransaction begin]; for (int i = 0; i < _numberOfSegments; i++) { - CAShapeLayer *layer = _segmentsLayer.sublayers[i]; + CAShapeLayer *layer = (CAShapeLayer *)_segmentsLayer.sublayers[i]; CABasicAnimation *barAnimation = [self barColorAnimation]; barAnimation.fromValue = (id)layer.fillColor; barAnimation.toValue = (id)_successColor.CGColor; @@ -252,7 +252,7 @@ [self setNeedsDisplay]; [CATransaction begin]; for (int i = 0; i < _numberOfSegments; i++) { - CAShapeLayer *layer = _segmentsLayer.sublayers[i]; + CAShapeLayer *layer = (CAShapeLayer *)_segmentsLayer.sublayers[i]; CABasicAnimation *barAnimation = [self barColorAnimation]; barAnimation.fromValue = (id)layer.fillColor; barAnimation.toValue = (id)_failureColor.CGColor; @@ -450,7 +450,7 @@ } //Add segment to the proper layer, and color it - CAShapeLayer *layer = _segmentsLayer.sublayers[i]; + CAShapeLayer *layer = (CAShapeLayer *)_segmentsLayer.sublayers[i]; layer.path = path.CGPath; layer.fillColor = [self colorForSegment:i].CGColor; } @@ -529,7 +529,7 @@ } //Add the segment to the proper path //Add segment to the proper layer, and color it - CAShapeLayer *layer = _segmentsLayer.sublayers[i]; + CAShapeLayer *layer = (CAShapeLayer *)_segmentsLayer.sublayers[i]; layer.path = path.CGPath; if (i >= indeterminateIndex && i < indeterminateIndex + numberOfSegmentsToBeColored) { layer.fillColor = ((UIColor *)segmentColorsPrimary[i]).CGColor; diff --git a/M13ProgressSuite.xcodeproj/project.pbxproj b/M13ProgressSuite.xcodeproj/project.pbxproj index 40c4cde..39e81ba 100644 --- a/M13ProgressSuite.xcodeproj/project.pbxproj +++ b/M13ProgressSuite.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ CA2FAF901889907300BCAEF5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = "Brandon McQuilkin"; TargetAttributes = { CA2FAFBB1889907300BCAEF5 = { @@ -898,6 +898,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -961,6 +962,7 @@ GCC_PREFIX_HEADER = "M13ProgressSuite/M13ProgressSuite-Prefix.pch"; INFOPLIST_FILE = "M13ProgressSuite/M13ProgressSuite-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -975,6 +977,7 @@ GCC_PREFIX_HEADER = "M13ProgressSuite/M13ProgressSuite-Prefix.pch"; INFOPLIST_FILE = "M13ProgressSuite/M13ProgressSuite-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -996,6 +999,7 @@ "$(inherited)", ); INFOPLIST_FILE = "M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -1014,6 +1018,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "M13ProgressSuite/M13ProgressSuite-Prefix.pch"; INFOPLIST_FILE = "M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -1056,6 +1061,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.4; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1082,6 +1088,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.4; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "com.BrandonMcQuilkin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1135,6 +1142,7 @@ FB2A7BF61B793E5600FE4E4A /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme index e39c19c..c6635b6 100644 --- a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme +++ b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> + + CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/M13ProgressSuiteFramework/Info.plist b/M13ProgressSuiteFramework/Info.plist index ea23b75..d3de8ee 100644 --- a/M13ProgressSuiteFramework/Info.plist +++ b/M13ProgressSuiteFramework/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.BrandonMcQuilkin.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist b/M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist index b0ee5c2..169b6f7 100644 --- a/M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist +++ b/M13ProgressSuiteTests/M13ProgressSuiteTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.BrandonMcQuilkin.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType