From 524cf10f706412dc06a2ad3c68245b7d3fdbd654 Mon Sep 17 00:00:00 2001 From: Sasha Heinen Date: Wed, 7 Sep 2016 10:20:23 -0600 Subject: [PATCH 1/2] Added shared framework for Carthage consumption --- .../JBChartView.xcodeproj/project.pbxproj | 300 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcschemes/JBChartView.xcscheme | 80 +++++ JBChartView/JBChartView/Info.plist | 26 ++ JBChartView/JBChartView/JBChartView.h | 30 ++ 5 files changed, 443 insertions(+) create mode 100644 JBChartView/JBChartView.xcodeproj/project.pbxproj create mode 100644 JBChartView/JBChartView.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme create mode 100644 JBChartView/JBChartView/Info.plist create mode 100644 JBChartView/JBChartView/JBChartView.h diff --git a/JBChartView/JBChartView.xcodeproj/project.pbxproj b/JBChartView/JBChartView.xcodeproj/project.pbxproj new file mode 100644 index 000000000..18f5a5540 --- /dev/null +++ b/JBChartView/JBChartView.xcodeproj/project.pbxproj @@ -0,0 +1,300 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + AE49CB4D1D8075000015154D /* JBChartView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE49CB4C1D8075000015154D /* JBChartView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE49CB581D80750C0015154D /* Additions in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB541D80750C0015154D /* Additions */; }; + AE49CB591D80750C0015154D /* Bar in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB551D80750C0015154D /* Bar */; }; + AE49CB5A1D80750C0015154D /* Base in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB561D80750C0015154D /* Base */; }; + AE49CB5B1D80750C0015154D /* Line in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB571D80750C0015154D /* Line */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + AE49CB491D8075000015154D /* JBChartView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JBChartView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AE49CB4C1D8075000015154D /* JBChartView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JBChartView.h; sourceTree = ""; }; + AE49CB4E1D8075000015154D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + AE49CB541D80750C0015154D /* Additions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Additions; path = ../../Classes/Additions; sourceTree = ""; }; + AE49CB551D80750C0015154D /* Bar */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Bar; path = ../../Classes/Bar; sourceTree = ""; }; + AE49CB561D80750C0015154D /* Base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base; path = ../../Classes/Base; sourceTree = ""; }; + AE49CB571D80750C0015154D /* Line */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Line; path = ../../Classes/Line; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + AE49CB451D8075000015154D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + AE49CB3F1D8075000015154D = { + isa = PBXGroup; + children = ( + AE49CB4B1D8075000015154D /* JBChartView */, + AE49CB4A1D8075000015154D /* Products */, + ); + sourceTree = ""; + }; + AE49CB4A1D8075000015154D /* Products */ = { + isa = PBXGroup; + children = ( + AE49CB491D8075000015154D /* JBChartView.framework */, + ); + name = Products; + sourceTree = ""; + }; + AE49CB4B1D8075000015154D /* JBChartView */ = { + isa = PBXGroup; + children = ( + AE49CB541D80750C0015154D /* Additions */, + AE49CB551D80750C0015154D /* Bar */, + AE49CB561D80750C0015154D /* Base */, + AE49CB571D80750C0015154D /* Line */, + AE49CB4C1D8075000015154D /* JBChartView.h */, + AE49CB4E1D8075000015154D /* Info.plist */, + ); + path = JBChartView; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + AE49CB461D8075000015154D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + AE49CB4D1D8075000015154D /* JBChartView.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + AE49CB481D8075000015154D /* JBChartView */ = { + isa = PBXNativeTarget; + buildConfigurationList = AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChartView" */; + buildPhases = ( + AE49CB441D8075000015154D /* Sources */, + AE49CB451D8075000015154D /* Frameworks */, + AE49CB461D8075000015154D /* Headers */, + AE49CB471D8075000015154D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = JBChartView; + productName = JBChartView; + productReference = AE49CB491D8075000015154D /* JBChartView.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + AE49CB401D8075000015154D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0730; + ORGANIZATIONNAME = pivotal; + TargetAttributes = { + AE49CB481D8075000015154D = { + CreatedOnToolsVersion = 7.3.1; + }; + }; + }; + buildConfigurationList = AE49CB431D8075000015154D /* Build configuration list for PBXProject "JBChartView" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = AE49CB3F1D8075000015154D; + productRefGroup = AE49CB4A1D8075000015154D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + AE49CB481D8075000015154D /* JBChartView */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + AE49CB471D8075000015154D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AE49CB5B1D80750C0015154D /* Line in Resources */, + AE49CB591D80750C0015154D /* Bar in Resources */, + AE49CB5A1D80750C0015154D /* Base in Resources */, + AE49CB581D80750C0015154D /* Additions in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + AE49CB441D8075000015154D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + AE49CB4F1D8075000015154D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + 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", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + AE49CB501D8075000015154D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + 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; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + AE49CB521D8075000015154D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = JBChartView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = pivotaltracker.JBChartView; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + AE49CB531D8075000015154D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = JBChartView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = pivotaltracker.JBChartView; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + AE49CB431D8075000015154D /* Build configuration list for PBXProject "JBChartView" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AE49CB4F1D8075000015154D /* Debug */, + AE49CB501D8075000015154D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChartView" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AE49CB521D8075000015154D /* Debug */, + AE49CB531D8075000015154D /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = AE49CB401D8075000015154D /* Project object */; +} diff --git a/JBChartView/JBChartView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/JBChartView/JBChartView.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..ed544991a --- /dev/null +++ b/JBChartView/JBChartView.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme b/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme new file mode 100644 index 000000000..8e55be48e --- /dev/null +++ b/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JBChartView/JBChartView/Info.plist b/JBChartView/JBChartView/Info.plist new file mode 100644 index 000000000..d3de8eefb --- /dev/null +++ b/JBChartView/JBChartView/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/JBChartView/JBChartView/JBChartView.h b/JBChartView/JBChartView/JBChartView.h new file mode 100644 index 000000000..a8920f789 --- /dev/null +++ b/JBChartView/JBChartView/JBChartView.h @@ -0,0 +1,30 @@ +// +// JBChartView.h +// JBChartView +// +// Created by pivotal on 9/7/16. +// Copyright © 2016 pivotal. All rights reserved. +// + +#import + +//! Project version number for JBChartView. +FOUNDATION_EXPORT double JBChartViewVersionNumber; + +//! Project version string for JBChartView. +FOUNDATION_EXPORT const unsigned char JBChartViewVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import From 221025252a2392a361142d6b429824c0d7c3fd89 Mon Sep 17 00:00:00 2001 From: Cody Sehl Date: Wed, 7 Sep 2016 13:49:22 -0600 Subject: [PATCH 2/2] Fixed inclusion issues with Carthage Signed-off-by: Sasha Heinen Signed-off-by: Cody Sehl --- .../JBChartView.xcodeproj/project.pbxproj | 137 ++++++++++++++---- ...{JBChartView.xcscheme => JBChart.xcscheme} | 12 +- .../JBChartView/Classes}/JBBarChartView.h | 0 .../JBChartView/Classes}/JBBarChartView.m | 0 .../JBChartView/Classes}/JBChartView.h | 0 .../JBChartView/Classes}/JBChartView.m | 0 .../JBChartView/Classes}/JBGradientBarView.h | 0 .../JBChartView/Classes}/JBGradientBarView.m | 0 .../Classes}/JBGradientLineLayer.h | 0 .../Classes}/JBGradientLineLayer.m | 0 .../JBChartView/Classes}/JBLineChartDotView.h | 0 .../JBChartView/Classes}/JBLineChartDotView.m | 0 .../Classes}/JBLineChartDotsView.h | 0 .../Classes}/JBLineChartDotsView.m | 0 .../JBChartView/Classes}/JBLineChartLine.h | 0 .../JBChartView/Classes}/JBLineChartLine.m | 0 .../Classes}/JBLineChartLinesView.h | 0 .../Classes}/JBLineChartLinesView.m | 0 .../JBChartView/Classes}/JBLineChartPoint.h | 0 .../JBChartView/Classes}/JBLineChartPoint.m | 0 .../JBChartView/Classes}/JBLineChartView.h | 0 .../JBChartView/Classes}/JBLineChartView.m | 0 .../JBChartView/Classes}/JBShapeLineLayer.h | 0 .../JBChartView/Classes}/JBShapeLineLayer.m | 0 .../Classes}/NSMutableArray+JBStack.h | 0 .../Classes}/NSMutableArray+JBStack.m | 0 JBChartView/JBChartView/JBChart.h | 30 ++++ JBChartView/JBChartView/JBChartView.h | 30 ---- 28 files changed, 145 insertions(+), 64 deletions(-) rename JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/{JBChartView.xcscheme => JBChart.xcscheme} (90%) rename {Classes/Bar => JBChartView/JBChartView/Classes}/JBBarChartView.h (100%) rename {Classes/Bar => JBChartView/JBChartView/Classes}/JBBarChartView.m (100%) rename {Classes/Base => JBChartView/JBChartView/Classes}/JBChartView.h (100%) rename {Classes/Base => JBChartView/JBChartView/Classes}/JBChartView.m (100%) rename {Classes/Bar/Views => JBChartView/JBChartView/Classes}/JBGradientBarView.h (100%) rename {Classes/Bar/Views => JBChartView/JBChartView/Classes}/JBGradientBarView.m (100%) rename {Classes/Line/Layers => JBChartView/JBChartView/Classes}/JBGradientLineLayer.h (100%) rename {Classes/Line/Layers => JBChartView/JBChartView/Classes}/JBGradientLineLayer.m (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartDotView.h (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartDotView.m (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartDotsView.h (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartDotsView.m (100%) rename {Classes/Line/Models => JBChartView/JBChartView/Classes}/JBLineChartLine.h (100%) rename {Classes/Line/Models => JBChartView/JBChartView/Classes}/JBLineChartLine.m (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartLinesView.h (100%) rename {Classes/Line/Views => JBChartView/JBChartView/Classes}/JBLineChartLinesView.m (100%) rename {Classes/Line/Models => JBChartView/JBChartView/Classes}/JBLineChartPoint.h (100%) rename {Classes/Line/Models => JBChartView/JBChartView/Classes}/JBLineChartPoint.m (100%) rename {Classes/Line => JBChartView/JBChartView/Classes}/JBLineChartView.h (100%) rename {Classes/Line => JBChartView/JBChartView/Classes}/JBLineChartView.m (100%) rename {Classes/Line/Layers => JBChartView/JBChartView/Classes}/JBShapeLineLayer.h (100%) rename {Classes/Line/Layers => JBChartView/JBChartView/Classes}/JBShapeLineLayer.m (100%) rename {Classes/Additions => JBChartView/JBChartView/Classes}/NSMutableArray+JBStack.h (100%) rename {Classes/Additions => JBChartView/JBChartView/Classes}/NSMutableArray+JBStack.m (100%) create mode 100644 JBChartView/JBChartView/JBChart.h delete mode 100644 JBChartView/JBChartView/JBChartView.h diff --git a/JBChartView/JBChartView.xcodeproj/project.pbxproj b/JBChartView/JBChartView.xcodeproj/project.pbxproj index 18f5a5540..153b8b17e 100644 --- a/JBChartView/JBChartView.xcodeproj/project.pbxproj +++ b/JBChartView/JBChartView.xcodeproj/project.pbxproj @@ -7,21 +7,61 @@ objects = { /* Begin PBXBuildFile section */ - AE49CB4D1D8075000015154D /* JBChartView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE49CB4C1D8075000015154D /* JBChartView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AE49CB581D80750C0015154D /* Additions in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB541D80750C0015154D /* Additions */; }; - AE49CB591D80750C0015154D /* Bar in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB551D80750C0015154D /* Bar */; }; - AE49CB5A1D80750C0015154D /* Base in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB561D80750C0015154D /* Base */; }; - AE49CB5B1D80750C0015154D /* Line in Resources */ = {isa = PBXBuildFile; fileRef = AE49CB571D80750C0015154D /* Line */; }; + AE49CB4D1D8075000015154D /* JBChart.h in Headers */ = {isa = PBXBuildFile; fileRef = AE49CB4C1D8075000015154D /* JBChart.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4311D80A5BF007575A5 /* JBBarChartView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4191D80A5BF007575A5 /* JBBarChartView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4321D80A5BF007575A5 /* JBBarChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB41A1D80A5BF007575A5 /* JBBarChartView.m */; }; + AE6CB4331D80A5BF007575A5 /* JBChartView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB41B1D80A5BF007575A5 /* JBChartView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4341D80A5BF007575A5 /* JBChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB41C1D80A5BF007575A5 /* JBChartView.m */; }; + AE6CB4351D80A5BF007575A5 /* JBGradientBarView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB41D1D80A5BF007575A5 /* JBGradientBarView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4361D80A5BF007575A5 /* JBGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB41E1D80A5BF007575A5 /* JBGradientBarView.m */; }; + AE6CB4371D80A5BF007575A5 /* JBGradientLineLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB41F1D80A5BF007575A5 /* JBGradientLineLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4381D80A5BF007575A5 /* JBGradientLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4201D80A5BF007575A5 /* JBGradientLineLayer.m */; }; + AE6CB4391D80A5BF007575A5 /* JBLineChartDotsView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4211D80A5BF007575A5 /* JBLineChartDotsView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB43A1D80A5BF007575A5 /* JBLineChartDotsView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4221D80A5BF007575A5 /* JBLineChartDotsView.m */; }; + AE6CB43B1D80A5BF007575A5 /* JBLineChartDotView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4231D80A5BF007575A5 /* JBLineChartDotView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB43C1D80A5BF007575A5 /* JBLineChartDotView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4241D80A5BF007575A5 /* JBLineChartDotView.m */; }; + AE6CB43D1D80A5BF007575A5 /* JBLineChartLine.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4251D80A5BF007575A5 /* JBLineChartLine.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB43E1D80A5BF007575A5 /* JBLineChartLine.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4261D80A5BF007575A5 /* JBLineChartLine.m */; }; + AE6CB43F1D80A5BF007575A5 /* JBLineChartLinesView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4271D80A5BF007575A5 /* JBLineChartLinesView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4401D80A5BF007575A5 /* JBLineChartLinesView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4281D80A5BF007575A5 /* JBLineChartLinesView.m */; }; + AE6CB4411D80A5BF007575A5 /* JBLineChartPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB4291D80A5BF007575A5 /* JBLineChartPoint.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4421D80A5BF007575A5 /* JBLineChartPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB42A1D80A5BF007575A5 /* JBLineChartPoint.m */; }; + AE6CB4431D80A5BF007575A5 /* JBLineChartView.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB42B1D80A5BF007575A5 /* JBLineChartView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4441D80A5BF007575A5 /* JBLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB42C1D80A5BF007575A5 /* JBLineChartView.m */; }; + AE6CB4451D80A5BF007575A5 /* JBShapeLineLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB42D1D80A5BF007575A5 /* JBShapeLineLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4461D80A5BF007575A5 /* JBShapeLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB42E1D80A5BF007575A5 /* JBShapeLineLayer.m */; }; + AE6CB4471D80A5BF007575A5 /* NSMutableArray+JBStack.h in Headers */ = {isa = PBXBuildFile; fileRef = AE6CB42F1D80A5BF007575A5 /* NSMutableArray+JBStack.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AE6CB4481D80A5BF007575A5 /* NSMutableArray+JBStack.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6CB4301D80A5BF007575A5 /* NSMutableArray+JBStack.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - AE49CB491D8075000015154D /* JBChartView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JBChartView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - AE49CB4C1D8075000015154D /* JBChartView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JBChartView.h; sourceTree = ""; }; + AE49CB491D8075000015154D /* JBChart.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JBChart.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AE49CB4C1D8075000015154D /* JBChart.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JBChart.h; sourceTree = ""; }; AE49CB4E1D8075000015154D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AE49CB541D80750C0015154D /* Additions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Additions; path = ../../Classes/Additions; sourceTree = ""; }; - AE49CB551D80750C0015154D /* Bar */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Bar; path = ../../Classes/Bar; sourceTree = ""; }; - AE49CB561D80750C0015154D /* Base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base; path = ../../Classes/Base; sourceTree = ""; }; - AE49CB571D80750C0015154D /* Line */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Line; path = ../../Classes/Line; sourceTree = ""; }; + AE6CB4191D80A5BF007575A5 /* JBBarChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBBarChartView.h; path = Classes/JBBarChartView.h; sourceTree = ""; }; + AE6CB41A1D80A5BF007575A5 /* JBBarChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBBarChartView.m; path = Classes/JBBarChartView.m; sourceTree = ""; }; + AE6CB41B1D80A5BF007575A5 /* JBChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBChartView.h; path = Classes/JBChartView.h; sourceTree = ""; }; + AE6CB41C1D80A5BF007575A5 /* JBChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBChartView.m; path = Classes/JBChartView.m; sourceTree = ""; }; + AE6CB41D1D80A5BF007575A5 /* JBGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBGradientBarView.h; path = Classes/JBGradientBarView.h; sourceTree = ""; }; + AE6CB41E1D80A5BF007575A5 /* JBGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBGradientBarView.m; path = Classes/JBGradientBarView.m; sourceTree = ""; }; + AE6CB41F1D80A5BF007575A5 /* JBGradientLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBGradientLineLayer.h; path = Classes/JBGradientLineLayer.h; sourceTree = ""; }; + AE6CB4201D80A5BF007575A5 /* JBGradientLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBGradientLineLayer.m; path = Classes/JBGradientLineLayer.m; sourceTree = ""; }; + AE6CB4211D80A5BF007575A5 /* JBLineChartDotsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartDotsView.h; path = Classes/JBLineChartDotsView.h; sourceTree = ""; }; + AE6CB4221D80A5BF007575A5 /* JBLineChartDotsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartDotsView.m; path = Classes/JBLineChartDotsView.m; sourceTree = ""; }; + AE6CB4231D80A5BF007575A5 /* JBLineChartDotView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartDotView.h; path = Classes/JBLineChartDotView.h; sourceTree = ""; }; + AE6CB4241D80A5BF007575A5 /* JBLineChartDotView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartDotView.m; path = Classes/JBLineChartDotView.m; sourceTree = ""; }; + AE6CB4251D80A5BF007575A5 /* JBLineChartLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartLine.h; path = Classes/JBLineChartLine.h; sourceTree = ""; }; + AE6CB4261D80A5BF007575A5 /* JBLineChartLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartLine.m; path = Classes/JBLineChartLine.m; sourceTree = ""; }; + AE6CB4271D80A5BF007575A5 /* JBLineChartLinesView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartLinesView.h; path = Classes/JBLineChartLinesView.h; sourceTree = ""; }; + AE6CB4281D80A5BF007575A5 /* JBLineChartLinesView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartLinesView.m; path = Classes/JBLineChartLinesView.m; sourceTree = ""; }; + AE6CB4291D80A5BF007575A5 /* JBLineChartPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartPoint.h; path = Classes/JBLineChartPoint.h; sourceTree = ""; }; + AE6CB42A1D80A5BF007575A5 /* JBLineChartPoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartPoint.m; path = Classes/JBLineChartPoint.m; sourceTree = ""; }; + AE6CB42B1D80A5BF007575A5 /* JBLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartView.h; path = Classes/JBLineChartView.h; sourceTree = ""; }; + AE6CB42C1D80A5BF007575A5 /* JBLineChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartView.m; path = Classes/JBLineChartView.m; sourceTree = ""; }; + AE6CB42D1D80A5BF007575A5 /* JBShapeLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBShapeLineLayer.h; path = Classes/JBShapeLineLayer.h; sourceTree = ""; }; + AE6CB42E1D80A5BF007575A5 /* JBShapeLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBShapeLineLayer.m; path = Classes/JBShapeLineLayer.m; sourceTree = ""; }; + AE6CB42F1D80A5BF007575A5 /* NSMutableArray+JBStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableArray+JBStack.h"; path = "Classes/NSMutableArray+JBStack.h"; sourceTree = ""; }; + AE6CB4301D80A5BF007575A5 /* NSMutableArray+JBStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSMutableArray+JBStack.m"; path = "Classes/NSMutableArray+JBStack.m"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -46,7 +86,7 @@ AE49CB4A1D8075000015154D /* Products */ = { isa = PBXGroup; children = ( - AE49CB491D8075000015154D /* JBChartView.framework */, + AE49CB491D8075000015154D /* JBChart.framework */, ); name = Products; sourceTree = ""; @@ -54,11 +94,31 @@ AE49CB4B1D8075000015154D /* JBChartView */ = { isa = PBXGroup; children = ( - AE49CB541D80750C0015154D /* Additions */, - AE49CB551D80750C0015154D /* Bar */, - AE49CB561D80750C0015154D /* Base */, - AE49CB571D80750C0015154D /* Line */, - AE49CB4C1D8075000015154D /* JBChartView.h */, + AE6CB4191D80A5BF007575A5 /* JBBarChartView.h */, + AE6CB41A1D80A5BF007575A5 /* JBBarChartView.m */, + AE6CB41B1D80A5BF007575A5 /* JBChartView.h */, + AE6CB41C1D80A5BF007575A5 /* JBChartView.m */, + AE6CB41D1D80A5BF007575A5 /* JBGradientBarView.h */, + AE6CB41E1D80A5BF007575A5 /* JBGradientBarView.m */, + AE6CB41F1D80A5BF007575A5 /* JBGradientLineLayer.h */, + AE6CB4201D80A5BF007575A5 /* JBGradientLineLayer.m */, + AE6CB4211D80A5BF007575A5 /* JBLineChartDotsView.h */, + AE6CB4221D80A5BF007575A5 /* JBLineChartDotsView.m */, + AE6CB4231D80A5BF007575A5 /* JBLineChartDotView.h */, + AE6CB4241D80A5BF007575A5 /* JBLineChartDotView.m */, + AE6CB4251D80A5BF007575A5 /* JBLineChartLine.h */, + AE6CB4261D80A5BF007575A5 /* JBLineChartLine.m */, + AE6CB4271D80A5BF007575A5 /* JBLineChartLinesView.h */, + AE6CB4281D80A5BF007575A5 /* JBLineChartLinesView.m */, + AE6CB4291D80A5BF007575A5 /* JBLineChartPoint.h */, + AE6CB42A1D80A5BF007575A5 /* JBLineChartPoint.m */, + AE6CB42B1D80A5BF007575A5 /* JBLineChartView.h */, + AE6CB42C1D80A5BF007575A5 /* JBLineChartView.m */, + AE6CB42D1D80A5BF007575A5 /* JBShapeLineLayer.h */, + AE6CB42E1D80A5BF007575A5 /* JBShapeLineLayer.m */, + AE6CB42F1D80A5BF007575A5 /* NSMutableArray+JBStack.h */, + AE6CB4301D80A5BF007575A5 /* NSMutableArray+JBStack.m */, + AE49CB4C1D8075000015154D /* JBChart.h */, AE49CB4E1D8075000015154D /* Info.plist */, ); path = JBChartView; @@ -71,16 +131,28 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - AE49CB4D1D8075000015154D /* JBChartView.h in Headers */, + AE6CB4431D80A5BF007575A5 /* JBLineChartView.h in Headers */, + AE6CB4411D80A5BF007575A5 /* JBLineChartPoint.h in Headers */, + AE6CB4311D80A5BF007575A5 /* JBBarChartView.h in Headers */, + AE6CB4331D80A5BF007575A5 /* JBChartView.h in Headers */, + AE6CB4471D80A5BF007575A5 /* NSMutableArray+JBStack.h in Headers */, + AE49CB4D1D8075000015154D /* JBChart.h in Headers */, + AE6CB43B1D80A5BF007575A5 /* JBLineChartDotView.h in Headers */, + AE6CB4351D80A5BF007575A5 /* JBGradientBarView.h in Headers */, + AE6CB43D1D80A5BF007575A5 /* JBLineChartLine.h in Headers */, + AE6CB43F1D80A5BF007575A5 /* JBLineChartLinesView.h in Headers */, + AE6CB4391D80A5BF007575A5 /* JBLineChartDotsView.h in Headers */, + AE6CB4451D80A5BF007575A5 /* JBShapeLineLayer.h in Headers */, + AE6CB4371D80A5BF007575A5 /* JBGradientLineLayer.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - AE49CB481D8075000015154D /* JBChartView */ = { + AE49CB481D8075000015154D /* JBChart */ = { isa = PBXNativeTarget; - buildConfigurationList = AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChartView" */; + buildConfigurationList = AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChart" */; buildPhases = ( AE49CB441D8075000015154D /* Sources */, AE49CB451D8075000015154D /* Frameworks */, @@ -91,9 +163,9 @@ ); dependencies = ( ); - name = JBChartView; + name = JBChart; productName = JBChartView; - productReference = AE49CB491D8075000015154D /* JBChartView.framework */; + productReference = AE49CB491D8075000015154D /* JBChart.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -122,7 +194,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - AE49CB481D8075000015154D /* JBChartView */, + AE49CB481D8075000015154D /* JBChart */, ); }; /* End PBXProject section */ @@ -132,10 +204,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - AE49CB5B1D80750C0015154D /* Line in Resources */, - AE49CB591D80750C0015154D /* Bar in Resources */, - AE49CB5A1D80750C0015154D /* Base in Resources */, - AE49CB581D80750C0015154D /* Additions in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -146,6 +214,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + AE6CB4321D80A5BF007575A5 /* JBBarChartView.m in Sources */, + AE6CB43A1D80A5BF007575A5 /* JBLineChartDotsView.m in Sources */, + AE6CB4481D80A5BF007575A5 /* NSMutableArray+JBStack.m in Sources */, + AE6CB4341D80A5BF007575A5 /* JBChartView.m in Sources */, + AE6CB43C1D80A5BF007575A5 /* JBLineChartDotView.m in Sources */, + AE6CB4461D80A5BF007575A5 /* JBShapeLineLayer.m in Sources */, + AE6CB4421D80A5BF007575A5 /* JBLineChartPoint.m in Sources */, + AE6CB4441D80A5BF007575A5 /* JBLineChartView.m in Sources */, + AE6CB4361D80A5BF007575A5 /* JBGradientBarView.m in Sources */, + AE6CB4401D80A5BF007575A5 /* JBLineChartLinesView.m in Sources */, + AE6CB4381D80A5BF007575A5 /* JBGradientLineLayer.m in Sources */, + AE6CB43E1D80A5BF007575A5 /* JBLineChartLine.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -286,13 +366,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChartView" */ = { + AE49CB511D8075000015154D /* Build configuration list for PBXNativeTarget "JBChart" */ = { isa = XCConfigurationList; buildConfigurations = ( AE49CB521D8075000015154D /* Debug */, AE49CB531D8075000015154D /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme b/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChart.xcscheme similarity index 90% rename from JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme rename to JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChart.xcscheme index 8e55be48e..cb089e59e 100644 --- a/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChartView.xcscheme +++ b/JBChartView/JBChartView.xcodeproj/xcshareddata/xcschemes/JBChart.xcscheme @@ -15,8 +15,8 @@ @@ -46,8 +46,8 @@ @@ -64,8 +64,8 @@ diff --git a/Classes/Bar/JBBarChartView.h b/JBChartView/JBChartView/Classes/JBBarChartView.h similarity index 100% rename from Classes/Bar/JBBarChartView.h rename to JBChartView/JBChartView/Classes/JBBarChartView.h diff --git a/Classes/Bar/JBBarChartView.m b/JBChartView/JBChartView/Classes/JBBarChartView.m similarity index 100% rename from Classes/Bar/JBBarChartView.m rename to JBChartView/JBChartView/Classes/JBBarChartView.m diff --git a/Classes/Base/JBChartView.h b/JBChartView/JBChartView/Classes/JBChartView.h similarity index 100% rename from Classes/Base/JBChartView.h rename to JBChartView/JBChartView/Classes/JBChartView.h diff --git a/Classes/Base/JBChartView.m b/JBChartView/JBChartView/Classes/JBChartView.m similarity index 100% rename from Classes/Base/JBChartView.m rename to JBChartView/JBChartView/Classes/JBChartView.m diff --git a/Classes/Bar/Views/JBGradientBarView.h b/JBChartView/JBChartView/Classes/JBGradientBarView.h similarity index 100% rename from Classes/Bar/Views/JBGradientBarView.h rename to JBChartView/JBChartView/Classes/JBGradientBarView.h diff --git a/Classes/Bar/Views/JBGradientBarView.m b/JBChartView/JBChartView/Classes/JBGradientBarView.m similarity index 100% rename from Classes/Bar/Views/JBGradientBarView.m rename to JBChartView/JBChartView/Classes/JBGradientBarView.m diff --git a/Classes/Line/Layers/JBGradientLineLayer.h b/JBChartView/JBChartView/Classes/JBGradientLineLayer.h similarity index 100% rename from Classes/Line/Layers/JBGradientLineLayer.h rename to JBChartView/JBChartView/Classes/JBGradientLineLayer.h diff --git a/Classes/Line/Layers/JBGradientLineLayer.m b/JBChartView/JBChartView/Classes/JBGradientLineLayer.m similarity index 100% rename from Classes/Line/Layers/JBGradientLineLayer.m rename to JBChartView/JBChartView/Classes/JBGradientLineLayer.m diff --git a/Classes/Line/Views/JBLineChartDotView.h b/JBChartView/JBChartView/Classes/JBLineChartDotView.h similarity index 100% rename from Classes/Line/Views/JBLineChartDotView.h rename to JBChartView/JBChartView/Classes/JBLineChartDotView.h diff --git a/Classes/Line/Views/JBLineChartDotView.m b/JBChartView/JBChartView/Classes/JBLineChartDotView.m similarity index 100% rename from Classes/Line/Views/JBLineChartDotView.m rename to JBChartView/JBChartView/Classes/JBLineChartDotView.m diff --git a/Classes/Line/Views/JBLineChartDotsView.h b/JBChartView/JBChartView/Classes/JBLineChartDotsView.h similarity index 100% rename from Classes/Line/Views/JBLineChartDotsView.h rename to JBChartView/JBChartView/Classes/JBLineChartDotsView.h diff --git a/Classes/Line/Views/JBLineChartDotsView.m b/JBChartView/JBChartView/Classes/JBLineChartDotsView.m similarity index 100% rename from Classes/Line/Views/JBLineChartDotsView.m rename to JBChartView/JBChartView/Classes/JBLineChartDotsView.m diff --git a/Classes/Line/Models/JBLineChartLine.h b/JBChartView/JBChartView/Classes/JBLineChartLine.h similarity index 100% rename from Classes/Line/Models/JBLineChartLine.h rename to JBChartView/JBChartView/Classes/JBLineChartLine.h diff --git a/Classes/Line/Models/JBLineChartLine.m b/JBChartView/JBChartView/Classes/JBLineChartLine.m similarity index 100% rename from Classes/Line/Models/JBLineChartLine.m rename to JBChartView/JBChartView/Classes/JBLineChartLine.m diff --git a/Classes/Line/Views/JBLineChartLinesView.h b/JBChartView/JBChartView/Classes/JBLineChartLinesView.h similarity index 100% rename from Classes/Line/Views/JBLineChartLinesView.h rename to JBChartView/JBChartView/Classes/JBLineChartLinesView.h diff --git a/Classes/Line/Views/JBLineChartLinesView.m b/JBChartView/JBChartView/Classes/JBLineChartLinesView.m similarity index 100% rename from Classes/Line/Views/JBLineChartLinesView.m rename to JBChartView/JBChartView/Classes/JBLineChartLinesView.m diff --git a/Classes/Line/Models/JBLineChartPoint.h b/JBChartView/JBChartView/Classes/JBLineChartPoint.h similarity index 100% rename from Classes/Line/Models/JBLineChartPoint.h rename to JBChartView/JBChartView/Classes/JBLineChartPoint.h diff --git a/Classes/Line/Models/JBLineChartPoint.m b/JBChartView/JBChartView/Classes/JBLineChartPoint.m similarity index 100% rename from Classes/Line/Models/JBLineChartPoint.m rename to JBChartView/JBChartView/Classes/JBLineChartPoint.m diff --git a/Classes/Line/JBLineChartView.h b/JBChartView/JBChartView/Classes/JBLineChartView.h similarity index 100% rename from Classes/Line/JBLineChartView.h rename to JBChartView/JBChartView/Classes/JBLineChartView.h diff --git a/Classes/Line/JBLineChartView.m b/JBChartView/JBChartView/Classes/JBLineChartView.m similarity index 100% rename from Classes/Line/JBLineChartView.m rename to JBChartView/JBChartView/Classes/JBLineChartView.m diff --git a/Classes/Line/Layers/JBShapeLineLayer.h b/JBChartView/JBChartView/Classes/JBShapeLineLayer.h similarity index 100% rename from Classes/Line/Layers/JBShapeLineLayer.h rename to JBChartView/JBChartView/Classes/JBShapeLineLayer.h diff --git a/Classes/Line/Layers/JBShapeLineLayer.m b/JBChartView/JBChartView/Classes/JBShapeLineLayer.m similarity index 100% rename from Classes/Line/Layers/JBShapeLineLayer.m rename to JBChartView/JBChartView/Classes/JBShapeLineLayer.m diff --git a/Classes/Additions/NSMutableArray+JBStack.h b/JBChartView/JBChartView/Classes/NSMutableArray+JBStack.h similarity index 100% rename from Classes/Additions/NSMutableArray+JBStack.h rename to JBChartView/JBChartView/Classes/NSMutableArray+JBStack.h diff --git a/Classes/Additions/NSMutableArray+JBStack.m b/JBChartView/JBChartView/Classes/NSMutableArray+JBStack.m similarity index 100% rename from Classes/Additions/NSMutableArray+JBStack.m rename to JBChartView/JBChartView/Classes/NSMutableArray+JBStack.m diff --git a/JBChartView/JBChartView/JBChart.h b/JBChartView/JBChartView/JBChart.h new file mode 100644 index 000000000..9177134f9 --- /dev/null +++ b/JBChartView/JBChartView/JBChart.h @@ -0,0 +1,30 @@ +// +// JBChartView.h +// JBChartView +// +// Created by pivotal on 9/7/16. +// Copyright © 2016 pivotal. All rights reserved. +// + +#import + +//! Project version number for JBChartView. +FOUNDATION_EXPORT double JBChartViewVersionNumber; + +//! Project version string for JBChartView. +FOUNDATION_EXPORT const unsigned char JBChartViewVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/JBChartView/JBChartView/JBChartView.h b/JBChartView/JBChartView/JBChartView.h deleted file mode 100644 index a8920f789..000000000 --- a/JBChartView/JBChartView/JBChartView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// JBChartView.h -// JBChartView -// -// Created by pivotal on 9/7/16. -// Copyright © 2016 pivotal. All rights reserved. -// - -#import - -//! Project version number for JBChartView. -FOUNDATION_EXPORT double JBChartViewVersionNumber; - -//! Project version string for JBChartView. -FOUNDATION_EXPORT const unsigned char JBChartViewVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import