Merge commit 'f2795b9813e7e8c2bcdac3f4c3cc74790116999e' into refactor…

…ing/swift-4.2 * commit 'f2795b9813e7e8c2bcdac3f4c3cc74790116999e': (108 commits) Remove delegate method call for translation when no translation really occured add call chartScaled() after double tap (ChartsOrg#3770) fix ChartsOrg#3719 Update README.md (ChartsOrg#3737) Fix applying lineCap value for line chart data sets (Fixes ChartsOrg#3739) Fix legend offset bug for horizontal bar chart (Fixes ChartsOrg#3301) Add missing properties to copy(with:) methods (ChartsOrg#3715) improvements in barRect height calculation (ChartsOrg#3650) Remove meaningless comment fix wrong assignment to axisMaxLabels property Add missing empty line between Summary and other section manually fix casting warnings Fix guard statement format. Fix memory leak for macOS. Update ChartViewBase.swift bump version to 3.2.1 close ChartsOrg#3659: fix index out of bounds issue when using stacked bar chart Fix memory leak after rendering close ChartsOrg#3661: update podspec to include swift verison fix issue ChartsOrg#3662 ... # Conflicts: # Charts.xcodeproj/project.pbxproj # ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj # ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m # ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m # ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift # Rakefile # Source/Charts/Charts/BarLineChartViewBase.swift # Source/Charts/Charts/ChartViewBase.swift # Source/Charts/Charts/HorizontalBarChartView.swift # Source/Charts/Charts/PieChartView.swift # Source/Charts/Charts/RadarChartView.swift # Source/Charts/Components/Legend.swift # Source/Charts/Components/Marker.swift # Source/Charts/Components/YAxis.swift # Source/Charts/Data/Implementations/ChartBaseDataSet.swift # Source/Charts/Data/Implementations/Standard/ChartData.swift # Source/Charts/Data/Implementations/Standard/PieChartData.swift # Source/Charts/Data/Interfaces/ChartDataSetProtocol.swift # Source/Charts/Data/Interfaces/ScatterChartDataSetProtocol.swift # Source/Charts/Filters/DataApproximator+N.swift # Source/Charts/Formatters/FillFormatter.swift # Source/Charts/Formatters/ValueFormatter.swift # Source/Charts/Highlight/BarHighlighter.swift # Source/Charts/Highlight/ChartHighlighter.swift # Source/Charts/Highlight/HorizontalBarHighlighter.swift # Source/Charts/Renderers/AxisRendererBase.swift # Source/Charts/Renderers/BarChartRenderer.swift # Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift # Source/Charts/Renderers/BubbleChartRenderer.swift # Source/Charts/Renderers/CandleStickChartRenderer.swift # Source/Charts/Renderers/ChartDataRendererBase.swift # Source/Charts/Renderers/CombinedChartRenderer.swift # Source/Charts/Renderers/HorizontalBarChartRenderer.swift # Source/Charts/Renderers/LegendRenderer.swift # Source/Charts/Renderers/LineChartRenderer.swift # Source/Charts/Renderers/PieChartRenderer.swift # Source/Charts/Renderers/RadarChartRenderer.swift # Source/Charts/Renderers/Renderer.swift # Source/Charts/Renderers/ScatterChartRenderer.swift # Source/Charts/Renderers/XAxisRenderer.swift # Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/XAxisRendererRadarChart.swift # Source/Charts/Renderers/YAxisRenderer.swift # Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift # Source/Charts/Utils/ChartUtils.swift # Source/Charts/Utils/ViewPortHandler.swift # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_tvOS_1920.0_1080.0.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_tvOS_1920.0_1080.0.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_tvOS_1920.0_1080.0.png
MobileTradingPartnersLLP · Jan 22, 2019 · af4e20c · af4e20c
2 parents 2422377 + f2795b9
commit af4e20c
Show file tree

Hide file tree

Showing 445 changed files with 7,691 additions and 4,471 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,33 @@
+> ℹ Please fill out this template when filing an issue.
+> All lines beginning with an ℹ symbol instruct you with what info we expect. You can delete those lines once you've filled in the info.
+>
+> Per our [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md), we use GitHub for
+> bugs and feature requests, not general support. Other issues should be opened on Stack Overflow with the tag [`ios-charts`.](https://stackoverflow.com/questions/tagged/ios-charts)
+>
+> Please remove this line and everything above it before submitting.
+
+* [ ] I've read, understood, and done my best to follow the [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md).
+
+## What did you do?
+
+ℹ Please replace this with what you did.  
+
+## What did you expect to happen?
+
+ℹ Please replace this with what you expected to happen.  
+
+## What happened instead?
+
+ℹ Please replace this with of what happened instead.  
+
+## Charts Environment
+
+**Charts version/Branch/Commit Number:**
+**Xcode version:**
+**Swift version:**
+**Platform(s) running Charts:**
+**macOS version running Xcode:**
+
+## Demo Project
+
+ℹ Please link to or upload a project we can download that reproduces the issue.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+### Issue Link :link:
+<!-- What issue does this fix? If an issue doesn't exist, remove this section. -->
+
+### Goals :soccer:
+<!-- List the high-level objectives of this pull request. -->
+<!-- Include any relevant context. -->
+
+### Implementation Details :construction:
+<!-- Explain the reasoning behind any architectural changes. -->
+<!-- Highlight any new functionality. -->
+
+### Testing Details :mag:
+<!-- Describe what tests you've added for your changes. -->
diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10
 matrix:
   include:
-    - osx_image: xcode9
+    - osx_image: xcode10
       env: PLATFORM="iOS"
-    - osx_image: xcode9
+    - osx_image: xcode10
       env: PLATFORM="tvOS"
-    - osx_image: xcode9
+    - osx_image: xcode10
       env: PLATFORM="macOS"
 env:
   global:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Charts.podspec.bak b/Charts.podspec.bak
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "Charts"
-  s.version = "3.0.4"
+  s.version = "3.2.1"
   s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
   s.homepage = "https://github.com/danielgindi/Charts"
   s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -10,6 +10,8 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.11"
   s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
   s.default_subspec = "Core"
+  s.swift_version = '4.2'
+  s.cocoapods_version = '>= 1.5.0'
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Source/Charts/**/*.swift"

diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
@@ -1,74 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'A58A4ED274A941CA248EA921'
-               BlueprintName = 'Charts'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'Charts.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A58A4ED274A941CA248EA921"
+               BuildableName = "Charts.framework"
+               BlueprintName = "Charts"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug"
-      codeCoverageEnabled = "NO">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A58A4ED274A941CA248EA921"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = 'FB_REFERENCE_IMAGE_DIR'
-            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
-            isEnabled = 'YES'>
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
@@ -1,74 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug"
-      codeCoverageEnabled = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+            BuildableName = "ChartsTests.xctest"
+            BlueprintName = "ChartsTests"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = 'FB_REFERENCE_IMAGE_DIR'
-            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
-            isEnabled = 'YES'>
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Charts.xcworkspace/contents.xcworkspacedata b/Charts.xcworkspace/contents.xcworkspacedata
diff --git a/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>