Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply Xcode11 changes #4153

Merged
merged 7 commits into from
Sep 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: objective-c
osx_image: xcode10
osx_image: xcode11
matrix:
include:
- osx_image: xcode10.2
- osx_image: xcode11
env: PLATFORM="iOS"
- osx_image: xcode10.2
- osx_image: xcode11
env: PLATFORM="tvOS"
- osx_image: xcode10.2
- osx_image: xcode11
env: PLATFORM="macOS"
env:
global:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "uber/ios-snapshot-test-case" "6.0.3"
github "uber/ios-snapshot-test-case" "6.1.0"
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def devices
{
iOS: {
sdk: 'iphonesimulator',
device: "name='iPhone 7'",
name: 'iPhone 7'
device: "name='iPhone 8'",
name: 'iPhone 8'
},
macOS: {
sdk: 'macosx',
Expand Down Expand Up @@ -179,4 +179,4 @@ end
desc 'generate changelog'
task :generate_changelog do
sh 'github_changelog_generator'
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ open class RadarChartDataEntry: ChartDataEntry
@objc open var value: Double
{
get { return y }
set { y = value }
set { y = newValue }
}

// MARK: NSCopying
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/BarChartRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
let barData = dataProvider.barData
else { return }

var dataSets = barData.dataSets
let dataSets = barData.dataSets

let valueOffsetPlus: CGFloat = 4.5
var posOffset: CGFloat
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/CandleStickChartRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
// if values are drawn
if isDrawingValuesAllowed(dataProvider: dataProvider)
{
var dataSets = candleData.dataSets
let dataSets = candleData.dataSets

let phaseY = animator.phaseY

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/HorizontalBarChartRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
let barData = dataProvider.barData
else { return }

var dataSets = barData.dataSets
let dataSets = barData.dataSets

let textAlign = NSTextAlignment.left

Expand Down
12 changes: 6 additions & 6 deletions Source/Charts/Renderers/LegendRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ open class LegendRenderer: Renderer
{
guard let dataSet = data.getDataSetByIndex(i) else { continue }

var clrs: [NSUIColor] = dataSet.colors
let clrs: [NSUIColor] = dataSet.colors
let entryCount = dataSet.entryCount

// if we have a barchart with stacked bars
if dataSet is IBarChartDataSet &&
(dataSet as! IBarChartDataSet).isStacked
{
let bds = dataSet as! IBarChartDataSet
var sLabels = bds.stackLabels
let sLabels = bds.stackLabels
let minEntries = min(clrs.count, bds.stackSize)

for j in 0..<minEntries
Expand Down Expand Up @@ -208,7 +208,7 @@ open class LegendRenderer: Renderer
let labelLineHeight = labelFont.lineHeight
let formYOffset = labelLineHeight / 2.0

var entries = legend.entries
let entries = legend.entries

let defaultFormSize = legend.formSize
let formToTextSpace = legend.formToTextSpace
Expand Down Expand Up @@ -296,9 +296,9 @@ open class LegendRenderer: Renderer
{
case .horizontal:

var calculatedLineSizes = legend.calculatedLineSizes
var calculatedLabelSizes = legend.calculatedLabelSizes
var calculatedLabelBreakPoints = legend.calculatedLabelBreakPoints
let calculatedLineSizes = legend.calculatedLineSizes
let calculatedLabelSizes = legend.calculatedLabelSizes
let calculatedLabelBreakPoints = legend.calculatedLabelBreakPoints

var posX: CGFloat = originPosX
var posY: CGFloat
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/LineChartRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ open class LineChartRenderer: LineRadarRenderer

if isDrawingValuesAllowed(dataProvider: dataProvider)
{
var dataSets = lineData.dataSets
let dataSets = lineData.dataSets

let phaseY = animator.phaseY

Expand Down
6 changes: 3 additions & 3 deletions Source/Charts/Renderers/PieChartRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ open class PieChartRenderer: DataRenderer
let phaseY = animator.phaseY

let entryCount = dataSet.entryCount
var drawAngles = chart.drawAngles
let drawAngles = chart.drawAngles
let center = chart.centerCircleBox
let radius = chart.radius
let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
Expand Down Expand Up @@ -715,8 +715,8 @@ open class PieChartRenderer: DataRenderer
var angle: CGFloat = 0.0
let rotationAngle = chart.rotationAngle

var drawAngles = chart.drawAngles
var absoluteAngles = chart.absoluteAngles
let drawAngles = chart.drawAngles
let absoluteAngles = chart.absoluteAngles
let center = chart.centerCircleBox
let radius = chart.radius
let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/YAxisRendererRadarChart.swift
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
let data = chart.data
else { return }

var limitLines = yAxis.limitLines
let limitLines = yAxis.limitLines

if limitLines.count == 0
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.