Merge pull request #196 from yasuoza/explicit_dependencies_import

Make sure to import dependent framework header explicitly

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v3.0.1](https://github.com/Jawbone/JBChartView/tree/v3.0.1) (2016-01-16)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.0...v3.0.1)
+
+## [v3.0.0](https://github.com/Jawbone/JBChartView/tree/v3.0.0) (2016-01-14)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.1...v3.0.0)
+
+**Closed issues:**
+
+- Show data above each column   [\#194](https://github.com/Jawbone/JBChartView/issues/194)
+
+**Merged pull requests:**
+
+- JBChartView 3.0 [\#195](https://github.com/Jawbone/JBChartView/pull/195) ([terryworona](https://github.com/terryworona))
+
 ## [v2.9.1](https://github.com/Jawbone/JBChartView/tree/v2.9.1) (2015-12-17)
 [Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.0...v2.9.1)
 

Classes/Bar/Views/JBGradientBarView.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class JBGradientBarView;
 

Classes/Line/Layers/JBGradientLineLayer.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface JBGradientLineLayer : CAGradientLayer
 
@@ -18,4 +19,3 @@
 @property (nonatomic, readonly) CGFloat alpha; // alpha of gradient, based on first color
 
 @end
-

Classes/Line/Layers/JBGradientLineLayer.m

@@ -9,7 +9,7 @@
 #import "JBGradientLineLayer.h"
 
 // Numerics
-CGFloat const kJBGradientLineLayerDefaultAlpha = 1.0f;
+static CGFloat const kJBGradientLineLayerDefaultAlpha = 1.0f;
 
 @implementation JBGradientLineLayer
 

Classes/Line/Layers/JBShapeLineLayer.m

@@ -9,7 +9,7 @@
 #import "JBShapeLineLayer.h"
 
 // Numerics
-CGFloat const kJBShapeLineLayerDefaultLinePhase = 1.0f;
+static CGFloat const kJBShapeLineLayerDefaultLinePhase = 1.0f;
 
 // Structures
 static NSArray *kJBShapeLineLayerDefaultDashPattern = nil;

Classes/Line/Models/JBLineChartPoint.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
 
 @interface JBLineChartPoint : NSObject
 

Classes/Line/Views/JBLineChartDotView.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface JBLineChartDotView : UIView
 

Classes/Line/Views/JBLineChartDotsView.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 // Numerics
 extern NSInteger const kJBLineChartDotsViewUnselectedLineIndex;

Classes/Line/Views/JBLineChartDotsView.m

@@ -20,7 +20,7 @@
 #import "JBLineChartView.h"
 
 // Numerics
-CGFloat const kJBLineChartDotsViewReloadDataAnimationDuration = 0.15f;
+static CGFloat const kJBLineChartDotsViewReloadDataAnimationDuration = 0.15f;
 NSInteger const kJBLineChartDotsViewUnselectedLineIndex = 0.25f;
 
 @implementation JBLineChartDotsView
@@ -213,7 +213,7 @@ NSInteger const kJBLineChartDotsViewUnselectedLineIndex = 0.25f;
 
 #pragma mark - Getters
 
-- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
 	NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:dotViewAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIView *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
 	UIView *dotView = [self.delegate lineChartDotsView:self dotViewAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];

Classes/Line/Views/JBLineChartLinesView.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 // Numerics
 extern NSInteger const kJBLineChartLinesViewUnselectedLineIndex;

Classes/Line/Views/JBLineChartLinesView.m

@@ -17,10 +17,10 @@
 #import "JBLineChartPoint.h"
 
 // Numerics
-CGFloat const kJBLineChartLinesViewMiterLimit = -5.0;
-CGFloat const kJBLineChartLinesViewSmoothThresholdSlope = 0.01f;
-CGFloat const kJBLineChartLinesViewReloadDataAnimationDuration = 0.15f;
-NSInteger const kJBLineChartLinesViewSmoothThresholdVertical = 1;
+static CGFloat const kJBLineChartLinesViewMiterLimit = -5.0;
+static CGFloat const kJBLineChartLinesViewSmoothThresholdSlope = 0.01f;
+static CGFloat const kJBLineChartLinesViewReloadDataAnimationDuration = 0.15f;
+static NSInteger const kJBLineChartLinesViewSmoothThresholdVertical = 1;
 NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 
 @interface JBLineChartLinesView ()
@@ -65,7 +65,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 	NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // delegate must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
 	NSArray *chartData = [self.delegate lineChartLinesForLineChartLinesView:self];
 	
-	for (int lineIndex=0; lineIndex<[chartData count]; lineIndex++)
+	for (NSUInteger lineIndex=0; lineIndex<[chartData count]; lineIndex++)
 	{
 		JBLineChartLine *lineChartLine = [chartData objectAtIndex:lineIndex];
 		{
@@ -238,7 +238,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 	NSArray *removedLayers = [NSArray arrayWithArray:mutableRemovedLayers];
 	if ([removedLayers count] > 0)
 	{
-		for (int index=0; index<[removedLayers count]; index++)
+		for (NSUInteger index=0; index<[removedLayers count]; index++)
 		{
 			CALayer *removedLayer = [removedLayers objectAtIndex:index];
 			
@@ -318,7 +318,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 				if (shapeLineLayer.filled)
 				{
 					// Selected solid fill
-					if (shapeLineLayer.tag == weakSelf.selectedLineIndex)
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
 					{
 						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionFillColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex");
 						shapeLineLayer.fillColor = [self.delegate lineChartLinesView:self selectionFillColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
@@ -337,7 +337,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 				else
 				{
 					// Selected solid line
-					if (shapeLineLayer.tag == weakSelf.selectedLineIndex)
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
 					{
 						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex");
 						shapeLineLayer.strokeColor = [self.delegate lineChartLinesView:self selectionColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
@@ -369,7 +369,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 					if (shapeLineLayer.filled)
 					{
 						// Selected gradient fill
-						if (shapeLineLayer.tag == weakSelf.selectedLineIndex)
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
 						{
 							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionFillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
 							CAGradientLayer *selectedFillGradient = [self.delegate lineChartLinesView:self selectionFillGradientForLineAtLineIndex:shapeLineLayer.tag];
@@ -393,7 +393,7 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 					else
 					{
 						// Selected gradient line
-						if (shapeLineLayer.tag == weakSelf.selectedLineIndex)
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
 						{
 							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex");
 							CAGradientLayer *selectedGradient = [self.delegate lineChartLinesView:self selectionGradientForLineAtLineIndex:shapeLineLayer.tag];
@@ -570,8 +570,11 @@ NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
 - (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezierPath toBezierPath:(UIBezierPath *)toBezierPath
 {
 	CABasicAnimation *basicPathAnimation = [CABasicAnimation animationWithKeyPath:@"path"];
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
 	basicPathAnimation.fromValue = (id)fromBezierPath.CGPath;
 	basicPathAnimation.toValue = (id)toBezierPath.CGPath;
+#pragma GCC diagnostic pop
 	basicPathAnimation.duration = kJBLineChartLinesViewReloadDataAnimationDuration;
 	basicPathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeInEaseOut"];
 	basicPathAnimation.fillMode = kCAFillModeBoth;

JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.9.1"
+  s.version      = "3.0.1"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v2.9.1"
+	:tag => "v3.0.1"
   }
 
   s.platform     = :ios, '6.0'