Skip to content

Commit 0d8888a

Browse files
eskrocheskroch
committed
Added a shared header file for apps using Core Plot with CocoaPods and other fixes in the podspec. Fixed issue core-plot#163 and issue core-plot#164.
1 parent 8f4b2ee commit 0d8888a

5 files changed

Lines changed: 96 additions & 7 deletions

File tree

‎CorePlot.podspec‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
2424
s.ios.header_dir = 'ios'
2525
s.osx.header_dir = 'osx'
2626

27-
s.source_files = 'framework/Source/*.{h,m}'
28-
s.exclude_files = '**/*{TestCase,Tests}.{h,m}'
27+
s.source_files = 'framework/Source/*.{h,m}', 'framework/CocoaPods/*.h', 'framework/TestResources/CorePlotProbes.d'
28+
s.exclude_files = '**/*{TestCase,Tests}.{h,m}', '**/mainpage.h'
2929
s.ios.source_files = 'framework/CorePlot-CocoaTouch.h', 'framework/iPhoneOnly/*.{h,m}'
30-
s.osx.source_files = 'framework/CorePlot.h', 'framework/MacOnly/*.{h,m}'
30+
s.osx.source_files = 'framework/MacOnly/*.{h,m}'
3131
s.private_header_files = '**/_*.h', '**/CorePlotProbes.h'
3232

3333
s.requires_arc = true
@@ -36,8 +36,4 @@ Pod::Spec.new do |s|
3636
s.frameworks = 'QuartzCore', 'Accelerate'
3737
s.ios.frameworks = 'UIKit', 'Foundation'
3838
s.osx.frameworks = 'Cocoa'
39-
40-
s.prepare_command = <<-CMD
41-
dtrace -h -s framework/TestResources/CorePlotProbes.d -o framework/Source/CorePlotProbes.h
42-
CMD
4339
end

‎documentation/changelog.markdown‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ To be determined.
88
- **New**: Added hand cursors to the Mac hosting view to indicate when user interaction is enabled and when dragging is in progress.
99
- **New**: Added two additional initialization methods to `CPTImage`.
1010
- **New**: Added a dependency on the Accelerate framework. All iOS clients must now link against this framework.
11+
- **New**: Added a shared header file for apps using Core Plot with CocoaPods.
1112
- **New**: Added support for pinch zoom gestures on the Mac.
1213
- **New**: Added support for trackpad and mouse wheel scrolling gestures on the Mac.
1314
- **New**: Added a scroll wheel event to `<CPTResponder>`.

‎framework/CocoaPods/CorePlot.h‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
2+
#import <Foundation/Foundation.h>
3+
#import <UIKit/UIKit.h>
4+
#else
5+
#import <Cocoa/Cocoa.h>
6+
#endif
7+
8+
#import "CPTAnimation.h"
9+
#import "CPTAnimationOperation.h"
10+
#import "CPTAnimationPeriod.h"
11+
#import "CPTAnnotation.h"
12+
#import "CPTAnnotationHostLayer.h"
13+
#import "CPTAxis.h"
14+
#import "CPTAxisLabel.h"
15+
#import "CPTAxisSet.h"
16+
#import "CPTAxisTitle.h"
17+
#import "CPTBarPlot.h"
18+
#import "CPTBorderedLayer.h"
19+
#import "CPTCalendarFormatter.h"
20+
#import "CPTColor.h"
21+
#import "CPTColorSpace.h"
22+
#import "CPTConstraints.h"
23+
#import "CPTDefinitions.h"
24+
#import "CPTExceptions.h"
25+
#import "CPTFill.h"
26+
#import "CPTFunctionDataSource.h"
27+
#import "CPTGradient.h"
28+
#import "CPTGraph.h"
29+
#import "CPTGraphHostingView.h"
30+
#import "CPTImage.h"
31+
#import "CPTLayer.h"
32+
#import "CPTLayerAnnotation.h"
33+
#import "CPTLegend.h"
34+
#import "CPTLegendEntry.h"
35+
#import "CPTLimitBand.h"
36+
#import "CPTLineCap.h"
37+
#import "CPTLineStyle.h"
38+
#import "CPTMutableLineStyle.h"
39+
#import "CPTMutableNumericData.h"
40+
#import "CPTMutableNumericData+TypeConversion.h"
41+
#import "CPTMutablePlotRange.h"
42+
#import "CPTMutableShadow.h"
43+
#import "CPTMutableTextStyle.h"
44+
#import "CPTNumericData.h"
45+
#import "CPTNumericData+TypeConversion.h"
46+
#import "CPTNumericDataType.h"
47+
#import "CPTPieChart.h"
48+
#import "CPTPlatformSpecificDefines.h"
49+
#import "CPTPlatformSpecificFunctions.h"
50+
#import "CPTPlatformSpecificCategories.h"
51+
#import "CPTPathExtensions.h"
52+
#import "CPTPlot.h"
53+
#import "CPTPlotArea.h"
54+
#import "CPTPlotAreaFrame.h"
55+
#import "CPTPlotRange.h"
56+
#import "CPTPlotSpace.h"
57+
#import "CPTPlotSpaceAnnotation.h"
58+
#import "CPTPlotSymbol.h"
59+
#import "CPTRangePlot.h"
60+
#import "CPTResponder.h"
61+
#import "CPTScatterPlot.h"
62+
#import "CPTShadow.h"
63+
#import "CPTTextLayer.h"
64+
#import "CPTTextStyle.h"
65+
#import "CPTTheme.h"
66+
#import "CPTTimeFormatter.h"
67+
#import "CPTTradingRangePlot.h"
68+
#import "CPTUtilities.h"
69+
#import "CPTXYAxis.h"
70+
#import "CPTXYAxisSet.h"
71+
#import "CPTXYGraph.h"
72+
#import "CPTXYPlotSpace.h"

‎framework/CorePlot-CocoaTouch.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@
392392
C3978E0F13CE65C600A420D9 /* NSCoderExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCoderExtensions.m; path = Source/NSCoderExtensions.m; sourceTree = "<group>"; };
393393
C3A695DF146A196100AF5653 /* CPTMutablePlotRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CPTMutablePlotRange.h; path = Source/CPTMutablePlotRange.h; sourceTree = "<group>"; };
394394
C3A695E0146A196100AF5653 /* CPTMutablePlotRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CPTMutablePlotRange.m; path = Source/CPTMutablePlotRange.m; sourceTree = "<group>"; };
395+
C3B25EE11AC23A930063CCD8 /* CorePlot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CorePlot.h; sourceTree = "<group>"; };
395396
C3C68318166138E200340E39 /* CPTAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CPTAnimation.h; path = Source/CPTAnimation.h; sourceTree = "<group>"; };
396397
C3C68319166138E200340E39 /* CPTAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CPTAnimation.m; path = Source/CPTAnimation.m; sourceTree = "<group>"; };
397398
C3C6831A166138E200340E39 /* CPTAnimationOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CPTAnimationOperation.h; path = Source/CPTAnimationOperation.h; sourceTree = "<group>"; };
@@ -606,6 +607,7 @@
606607
BC9B82520FB89B420035D8DA /* Source */,
607608
0789EFB70FB9F97F00C0A613 /* iPhone Specific */,
608609
C3566B8610EED12700FB3866 /* Documentation */,
610+
C3B25EE01AC23A930063CCD8 /* CocoaPods */,
609611
29B97315FDCFA39411CA2CEA /* Other Sources */,
610612
29B97317FDCFA39411CA2CEA /* Resources */,
611613
29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -851,6 +853,14 @@
851853
name = Legends;
852854
sourceTree = "<group>";
853855
};
856+
C3B25EE01AC23A930063CCD8 /* CocoaPods */ = {
857+
isa = PBXGroup;
858+
children = (
859+
C3B25EE11AC23A930063CCD8 /* CorePlot.h */,
860+
);
861+
path = CocoaPods;
862+
sourceTree = "<group>";
863+
};
854864
C3B623A9107EC5460009EF0B /* Layout */ = {
855865
isa = PBXGroup;
856866
children = (

‎framework/CorePlot.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
C3AFC9CF0FB62969005DFFDC /* CPTImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CPTImage.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
459459
C3AFC9D00FB62969005DFFDC /* CPTImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPTImage.m; sourceTree = "<group>"; };
460460
C3B235631009931400970270 /* doxygen-cocoa-tags.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "doxygen-cocoa-tags.xml"; path = "../documentation/doxygen/doxygen-cocoa-tags.xml"; sourceTree = "<group>"; };
461+
C3B25EDF1AC23A7D0063CCD8 /* CorePlot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CorePlot.h; sourceTree = "<group>"; };
461462
C3BB7D1416322F7E00BC9515 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
462463
C3C032C710B8DEDC003A11B6 /* CPTAxisLabelGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxisLabelGroup.h; sourceTree = "<group>"; };
463464
C3C032C810B8DEDC003A11B6 /* CPTAxisLabelGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPTAxisLabelGroup.m; sourceTree = "<group>"; };
@@ -848,6 +849,7 @@
848849
07BF0D5F0F2B6FE1002FCEA7 /* Mac Specific */,
849850
4C32D37A0F43B3B400EDFE7A /* Test Host */,
850851
9021E4920FC5C6DD00443472 /* Documentation */,
852+
C3B25EDE1AC23A7D0063CCD8 /* CocoaPods */,
851853
32C88DFF0371C24200C91783 /* Other Sources */,
852854
089C1665FE841158C02AAC07 /* Resources */,
853855
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
@@ -1104,6 +1106,14 @@
11041106
name = "Mac Specific";
11051107
sourceTree = "<group>";
11061108
};
1109+
C3B25EDE1AC23A7D0063CCD8 /* CocoaPods */ = {
1110+
isa = PBXGroup;
1111+
children = (
1112+
C3B25EDF1AC23A7D0063CCD8 /* CorePlot.h */,
1113+
);
1114+
path = CocoaPods;
1115+
sourceTree = "<group>";
1116+
};
11071117
C3C032C510B8DE87003A11B6 /* Labels */ = {
11081118
isa = PBXGroup;
11091119
children = (

0 commit comments

Comments
 (0)