diff --git a/Classes/NavigationController/UINavigationController+M13ProgressViewBar.m b/Classes/NavigationController/UINavigationController+M13ProgressViewBar.m index a500499..111bd5f 100644 --- a/Classes/NavigationController/UINavigationController+M13ProgressViewBar.m +++ b/Classes/NavigationController/UINavigationController+M13ProgressViewBar.m @@ -71,21 +71,18 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - [self getAnimationStartTime]) / [self getAnimationDuration]; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; - self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [self setProgress:[self getAnimationToValue]]; - }); + [self setDisplayLink:nil]; + [self setProgress:[self getAnimationToValue]]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [self setProgress:([self getAnimationFromValue] + dt * ([self getAnimationToValue] - [self getAnimationFromValue]))]; - }); + + //Set progress + [self setProgress:[self getAnimationFromValue] + dt * ([self getAnimationToValue] - [self getAnimationFromValue])]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewBar.m b/Classes/ProgressViews/M13ProgressViewBar.m index a53e250..039296b 100644 --- a/Classes/ProgressViews/M13ProgressViewBar.m +++ b/Classes/ProgressViews/M13ProgressViewBar.m @@ -215,24 +215,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewBorderedBar.m b/Classes/ProgressViews/M13ProgressViewBorderedBar.m index f3ee31b..dae8c91 100644 --- a/Classes/ProgressViews/M13ProgressViewBorderedBar.m +++ b/Classes/ProgressViews/M13ProgressViewBorderedBar.m @@ -201,24 +201,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewFilteredImage.m b/Classes/ProgressViews/M13ProgressViewFilteredImage.m index a2f18a5..79af78b 100644 --- a/Classes/ProgressViews/M13ProgressViewFilteredImage.m +++ b/Classes/ProgressViews/M13ProgressViewFilteredImage.m @@ -124,24 +124,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewImage.m b/Classes/ProgressViews/M13ProgressViewImage.m index e806312..8c1ee47 100644 --- a/Classes/ProgressViews/M13ProgressViewImage.m +++ b/Classes/ProgressViews/M13ProgressViewImage.m @@ -131,24 +131,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewLetterpress.m b/Classes/ProgressViews/M13ProgressViewLetterpress.m index 1439ec9..6e8ca78 100644 --- a/Classes/ProgressViews/M13ProgressViewLetterpress.m +++ b/Classes/ProgressViews/M13ProgressViewLetterpress.m @@ -182,24 +182,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewMetro.m b/Classes/ProgressViews/M13ProgressViewMetro.m index b18f54a..e3f7c08 100644 --- a/Classes/ProgressViews/M13ProgressViewMetro.m +++ b/Classes/ProgressViews/M13ProgressViewMetro.m @@ -251,24 +251,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self showProgress]; - }); + [super setProgress:_animationToValue animated:NO]; + [self showProgress]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self showProgress]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self showProgress]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewPie.m b/Classes/ProgressViews/M13ProgressViewPie.m index baf4127..212fab2 100644 --- a/Classes/ProgressViews/M13ProgressViewPie.m +++ b/Classes/ProgressViews/M13ProgressViewPie.m @@ -177,24 +177,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewRadiative.m b/Classes/ProgressViews/M13ProgressViewRadiative.m index c18f23f..4d1caed 100644 --- a/Classes/ProgressViews/M13ProgressViewRadiative.m +++ b/Classes/ProgressViews/M13ProgressViewRadiative.m @@ -167,24 +167,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewRing.m b/Classes/ProgressViews/M13ProgressViewRing.m index 8f2f27b..1001b5e 100755 --- a/Classes/ProgressViews/M13ProgressViewRing.m +++ b/Classes/ProgressViews/M13ProgressViewRing.m @@ -208,24 +208,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewSegmentedBar.m b/Classes/ProgressViews/M13ProgressViewSegmentedBar.m index 20dc4e9..2139f30 100644 --- a/Classes/ProgressViews/M13ProgressViewSegmentedBar.m +++ b/Classes/ProgressViews/M13ProgressViewSegmentedBar.m @@ -185,24 +185,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewSegmentedRing.m b/Classes/ProgressViews/M13ProgressViewSegmentedRing.m index 4cb21d1..f3268c2 100644 --- a/Classes/ProgressViews/M13ProgressViewSegmentedRing.m +++ b/Classes/ProgressViews/M13ProgressViewSegmentedRing.m @@ -228,24 +228,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/Classes/ProgressViews/M13ProgressViewStripedBar.m b/Classes/ProgressViews/M13ProgressViewStripedBar.m index 9686859..17cf4d6 100644 --- a/Classes/ProgressViews/M13ProgressViewStripedBar.m +++ b/Classes/ProgressViews/M13ProgressViewStripedBar.m @@ -230,24 +230,20 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated - (void)animateProgress:(CADisplayLink *)displayLink { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ + dispatch_async(dispatch_get_main_queue(), ^{ CGFloat dt = (displayLink.timestamp - _animationStartTime) / self.animationDuration; if (dt >= 1.0) { //Order is important! Otherwise concurrency will cause errors, because setProgress: will detect an animation in progress and try to stop it by itself. Once over one, set to actual progress amount. Animation is over. [self.displayLink removeFromRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes]; self.displayLink = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [super setProgress:_animationToValue animated:NO]; - [self setNeedsDisplay]; - }); + [super setProgress:_animationToValue animated:NO]; + [self setNeedsDisplay]; return; } - dispatch_async(dispatch_get_main_queue(), ^{ - //Set progress - [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; - [self setNeedsDisplay]; - }); + //Set progress + [super setProgress:_animationFromValue + dt * (_animationToValue - _animationFromValue) animated:YES]; + [self setNeedsDisplay]; }); } diff --git a/M13ProgressSuite.podspec b/M13ProgressSuite.podspec index ad8755d..dd7ee84 100644 --- a/M13ProgressSuite.podspec +++ b/M13ProgressSuite.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "M13ProgressSuite" - s.version = "1.2.2" + s.version = "1.2.3" s.summary = "A suite containing many tools to display progress information on iOS." s.description = <<-DESC @@ -27,7 +27,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI s.platform = :ios, '7.0' - s.source = { :git => "https://github.com/Marxon13/M13ProgressSuite.git", :tag => "v1.2.2"} + s.source = { :git => "https://github.com/Marxon13/M13ProgressSuite.git", :tag => "v1.2.3"} s.source_files = 'Classes/*/*' diff --git a/M13ProgressSuite.xcodeproj/project.pbxproj b/M13ProgressSuite.xcodeproj/project.pbxproj index e18e919..9177bc0 100644 --- a/M13ProgressSuite.xcodeproj/project.pbxproj +++ b/M13ProgressSuite.xcodeproj/project.pbxproj @@ -431,8 +431,6 @@ isa = PBXGroup; children = ( CA412B0618D2655500FCB7CC /* Finished */, - CA6F31C5190EBF11008D1E64 /* LetterpressViewController.h */, - CA6F31C6190EBF11008D1E64 /* LetterpressViewController.m */, ); name = "Example View Controllers"; sourceTree = ""; @@ -458,6 +456,8 @@ CA412B0618D2655500FCB7CC /* Finished */ = { isa = PBXGroup; children = ( + CA6F31C5190EBF11008D1E64 /* LetterpressViewController.h */, + CA6F31C6190EBF11008D1E64 /* LetterpressViewController.m */, CA2FB01A1889946F00BCAEF5 /* SampleViewController.h */, CA2FB01B1889946F00BCAEF5 /* SampleViewController.m */, CA412B0318D2638E00FCB7CC /* RadiativeViewController.h */, @@ -556,7 +556,7 @@ CA2FAF901889907300BCAEF5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Brandon McQuilkin"; TargetAttributes = { CA2FAFBB1889907300BCAEF5 = { @@ -726,7 +726,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -766,7 +765,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -825,7 +823,6 @@ CA2FAFD11889907300BCAEF5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/M13ProgressSuite.app/M13ProgressSuite"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -848,7 +845,6 @@ CA2FAFD21889907300BCAEF5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/M13ProgressSuite.app/M13ProgressSuite"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", diff --git a/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/Documentation.xcscheme b/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/Documentation.xcscheme index e325565..87dd102 100644 --- a/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/Documentation.xcscheme +++ b/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/Documentation.xcscheme @@ -1,6 +1,6 @@ diff --git a/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme b/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme index 6207bbe..b3f4dcb 100644 --- a/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme +++ b/M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme @@ -1,6 +1,6 @@ + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + +