Skip to content

Commit 0fe8fd6

Browse files
authored
Update charts from original repository (#1)
* Added delegate callback to detect when panning is finished, to potentially allow users to manually reset the hightlight values once panning is complete * Changed the part of the code where the delegate gets called * Make NSUIAccessibilityElement initializer public. * Add Parameters Section ``` (\n[ ]+)(((/// - parameter \w+:.*\s+)(///((\s+)|( \s+.+\s+)))?)*/// - parameter \w+:.*) ``` ``` $1/// - Parameters:$1$2 ``` * Remove parameter prefix ``` /// - parameter (\w+):(.*)(\s+///(\n))*(\s+) ``` ``` /// - $1:$2$4$5 ``` * Remove property’s `returns` section ``` /// - returns: (.+\s+((override|@IBOutlet|@objc|weak|unowned|lazy|static|class|open|public|private|fileprivate|internal)(\(set\))? )*(var|let)) ``` ``` /// $1 ``` * Add missing `-` ``` /// (note|return|parameters|throws): ``` ``` /// - $1: ``` * Sort sections ``` ((///)[ ]+[^-\n]+(\s+))?(((((/// - Parameters:\s+(/// (( - \w+:)|([^-]{1})).*\s+)+)\s+)|(/// - Returns:.*\s+(/// [^-]{1}.*\s+)*)|(/// - Note:.*\s+(/// [^-]{1}.*\s+)*)|(/// - Throws:.*\s+(/// [^-]{1}.*\s+)*))(///\n\s+)?)+) ``` ``` $1$2$3$15$7$17$13 ``` * Uppercased the section title * fix function groupBars document error * Remove duplicated section * Update ChartViewBase.swift Updated documentation in the code based on feedback * Add missing empty line between Summary and other section manually * fix wrong assignment to axisMaxLabels property * Remove meaningless comment * improvements in barRect height calculation (ChartsOrg#3650) * fixed barRectCaculation * fixed offset calculation * Fix the mess caused by the setting the min&min value of the y-axis by error : Just simply swap their values * Fix the mess caused by the setting the min&min value of the y-axis by error * Revert "Fix the mess caused by the setting the min&min value of the y-axis by error" This reverts commit 526a73a. * Fix the mess caused by the setting the min&min value of the y-axis by error * update offset calculation * update code style * update code style * update offset calculation * keep barRect calculation untouched try to simply the calculation. keep barRect calculation untouched * After the correction of min and max , they should be assigned back to _axisMinimum and _axisMaximum * add demo for bar chart unit test * update unit test * revert last commit * update unit test * make sure max is greater than min & turnoff record mode for barchartest * add new UT and fix some issues. 1. add more bar chart UT 2. code style fix 3. manually add chart.notifyDataSetChanged() - some old UT and new ones forget to call this method, leading the test images to be wrong. Notice: some test images diff shows slight pixel shift, not sure why, but both old and new image seems drawing correctly * update tvOS images * update tolerance to 1% & more swift-y * update tvOS images, removing "Description Label", (not rendered anymore) changing tolerance will trigger "Description Label" detection * update iOS test images, "Description Label" no longer rendered. * fixed offset calculation in some cases. moved those codes into the for loop. because the offset of each bar may be different. (detail in comments) * Update Source/Charts/Renderers/BarChartRenderer.swift Co-Authored-By: potato04 <shiww@outlook.com> * Add missing properties to copy(with:) methods (ChartsOrg#3715) * ChartsOrg#3578 Add missing properties to copy(with:) methods * Add NSCopying conformance * Fix legend offset bug for horizontal bar chart (Fixes ChartsOrg#3301) * Fix applying lineCap value for line chart data sets (Fixes ChartsOrg#3739) DataSets for line chart have lineCap property which is supposed to be applied to the chart line. But it was applied only if dataSet is drawn in linear/stepped mode. This commit makes lineCap work for any existing mode. * Update README.md (ChartsOrg#3737) Replace a confusing sentence with a clear one. Fix grammatical errors. * fix ChartsOrg#3719 * add call chartScaled() after double tap (ChartsOrg#3770) * Remove delegate method call for translation when no translation really occured * Removed use of `values` where appropriate * Fixed `addEntry` implementation * Deprecated direct usage of values * BarLineScatterCandleBubbleRenderer.XBounds conformance to RangeExpression and Sequence Sequence conformance simplifies for-in loops Looking forward to when data types conforming to Collection, RangeExpression conformance by XBounds allows for slicing of the collections further simplifying algorithms on data/datasets. * Draws the line chart the same way regardless of the number of colors for the data set (ChartsOrg#3764) * Multiple colors for valueline (Fixes ChartsOrg#3480) (ChartsOrg#3709) * Multiple colors for valueline (Fixes ChartsOrg#3480) This change adds a flag matchValueLineColorToPieSlice to PieChartDataSet and IPieChartDataSet protocol. When enabled, valuelines will have the same color as slices they attached to. matchValueLineColorToPieSlice is set to false by default, so colors won't be changed in old projects that use Charts. * Changed variable name from matchValueLineColorToPieSlice to valueLineAutoColor * Changed variable name from valueLineAutoColor to useValueColorForLine * Changed variable name from valueLineAutoColor to useValueColorForLine * fix code style fix code style * Changed check for useValueColorForLine with suggested * fix code style * Added name DrawLine: to do{} section * bump version to 3.2.2 * update change log * Renamed `values` to `entries` to reflect the property's type Removed arbitrary setter access to `entries` to encourage use of `Collection` mechanics Added `replaceEntries` * Fixed tests * Create "chartViewDidEndAnimate" callback function in "ChartViewBase" that is called when Animator stops animating * Update protocol function description * Improve HorizontalBarChart offset calculation for negative value labels (Fixes ChartsOrg#3850) * Replace AnyObject with Any This is in line with how Objc interfaces are now imported * Fixed target on NSUIDisplayLink * Removed unnecessary #if statements and unified style to align with Xcode's indentation * Velocity samples calculation (ChartsOrg#3883) * Updated `PieRadarChartViewBase.sampleVelocity(touchLocation:)` algorithm. * Updated `PieRadarChartViewBase.calculateVelocity` algorithm * Updated naming for `_velocitySamples` * A fix for ChartsOrg#3848. Use a stock iterator instead of a custom one. (ChartsOrg#3891) * Migrating to built-in algorithms (ChartsOrg#3892) * Align `ChartLimit.LabelPosition` naming with `UIRectCorner` (ChartsOrg#3846) * Align `ChartLimit.LabelPosition` naming with `UIRectCorner` * Fixed Demos * fix indent after replacing if with guard * reverted mistaken changes * Removed unused #if statements * add animator reference to animatorDidStop ChartViewBase delegate callback. * Minor updates for Swift 5 (ChartsOrg#3874) * Minor updates for Swift 5 Need FBSnapshotTestCase to be updated * Updated testing Framework for Swift 5 bumped minimum deployment version to 8.4 * Bumped Travis Xcode version * Fix test failures. add a new extension to only use 64bit arch. This is the companion commit that only has code change regards fixing test failures. * delete unused test images with specific screen size. this is a companion commit to only have deleted files * rename the in-use test images. this is a companion commit to only have renamed files. * change image diff to 0.001 tolerance make clipValuesToContentEnabled to true to fix BarTests:testPositiveValuesWithCustomAxisMaximum() failure * 1. merge master to fix xBounds iterator() to match the behavior of `stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)` this fix issues from ChartsOrg@2a1ecb4 2. revert clipValuesToContentEnabled to false by default. but enable it for bar chart test - testPositiveValuesWithCustomAxisMaximum() 3. update tvOS test image for testPositiveValuesWithCustomAxisMaximum. After changing tolerance to 0.001, it fails while the same iOS test pass. I looked into the image diff, it shows the intersect of bar top edge and axis line at value 50 has diff, but I suppose the image is the same. safe to merge. * fix ChartsOrg#3860. maxHeight didn't count the last label * Reassess convenience initializers (ChartsOrg#3862) * Reassess convenience initializers The only data required to initialize an entry is an x and y value (or y in the case of Pie and Radar). All other data can easily be updated by initializing and assigning properties on the entry. Therefor, those initializers should be the ones marked as convenience. Made initializer declarations consistent. * Modernize BarChartDataEntry internal calculations * Style updated for PR * Fix horizontal bar chart not drawing values and add unit tests (ChartsOrg#3906) * fix horizontal bar chart drawValues not correctly drawing and add testNotDrawValueAboveBars UT * add unit tests for horizontal bar chart, including default tests and drawValues and drawValuesAboveBars default data entries included positive and negative values * add tvOS test images * add stacked bar tests for bar chart unit tests * fix typo * change to guard statement for shouldDrawValues * update test images to match master branch * Data as any (ChartsOrg#3863) * `ChartEntry.data` is now of type `Any` There is no need to restrict `ChartEntry.data` to `AnyObject`. This PR loosens that restriction. As a result we cannot compare `data`, though this should never have been the case in the first place. * Updated `ChartDataEntry` initializers to accept `Any` for `data` * Updated test * bump version to 3.3 * update change log * update gemfile * correct 3.3 to 3.3.0. * For ChartsOrg#3917. make init(label: String?) convenient initializer (ChartsOrg#3973) * fix ChartsOrg#3917. make `init(label: String?)` to be a convenient init to enable auto inheritance. * add UT for default dataSet label
1 parent 1f6585b commit 0fe8fd6

File tree

375 files changed

+3153
-2653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+3153
-2653
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ language: objective-c
22
osx_image: xcode10
33
matrix:
44
include:
5-
- osx_image: xcode10
5+
- osx_image: xcode10.2
66
env: PLATFORM="iOS"
7-
- osx_image: xcode10
7+
- osx_image: xcode10.2
88
env: PLATFORM="tvOS"
9-
- osx_image: xcode10
9+
- osx_image: xcode10.2
1010
env: PLATFORM="macOS"
1111
env:
1212
global:

CHANGELOG.md

Lines changed: 303 additions & 31 deletions
Large diffs are not rendered by default.

Cartfile

Whitespace-only changes.

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "facebook/ios-snapshot-test-case" "master"
1+
github "uber/ios-snapshot-test-case"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "facebook/ios-snapshot-test-case" "ed4e6a6e81bfb69a5223156e6c3d389a416cf6e3"
1+
github "uber/ios-snapshot-test-case" "6.0.3"

Charts.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Charts"
3-
s.version = "3.2.1"
3+
s.version = "3.3.0"
44
s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
55
s.homepage = "https://github.com/danielgindi/Charts"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.osx.deployment_target = "10.11"
1111
s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
1212
s.default_subspec = "Core"
13-
s.swift_version = '4.2'
13+
s.swift_version = '5.0'
1414
s.cocoapods_version = '>= 1.5.0'
1515

1616
s.subspec "Core" do |ss|

Charts.xcodeproj/project.pbxproj

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
B0D28C68BB9A958DC56EB214 /* DefaultValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107D8F8163EE54D6D9E916B0 /* DefaultValueFormatter.swift */; };
112112
B13C74B4FF705D7B595D01EF /* IAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD9DF16AF59680A3BB49452 /* IAxisValueFormatter.swift */; };
113113
B539114951455C35BADAE3F3 /* PieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4FB5E3761EF8B4D1E1E1014 /* PieChartDataSet.swift */; };
114+
B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */; };
114115
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */; };
115116
B6C9F450D937B87224D29D5C /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818AC6B12505B7C0A53D62F9 /* IFillFormatter.swift */; };
116117
B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */; };
@@ -273,6 +274,7 @@
273274
B137428B41C143D5115726C4 /* Description.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Description.swift; path = Source/Charts/Components/Description.swift; sourceTree = "<group>"; };
274275
B1BA6B21CBDF77A15848994F /* RadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift; sourceTree = "<group>"; };
275276
B44829AF0ADA583F1F0279B7 /* BubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift; sourceTree = "<group>"; };
277+
B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartTests.swift; path = Tests/Charts/HorizontalBarChartTests.swift; sourceTree = "<group>"; };
276278
B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CombinedChartTests.swift; path = Tests/Charts/CombinedChartTests.swift; sourceTree = "<group>"; };
277279
BA157EFF2F952192C11DF937 /* AnimatedMoveViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnimatedMoveViewJob.swift; path = Source/Charts/Jobs/AnimatedMoveViewJob.swift; sourceTree = "<group>"; };
278280
BA1A58428DC4780BAB4EAADC /* CandleStickChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartView.swift; path = Source/Charts/Charts/CandleStickChartView.swift; sourceTree = "<group>"; };
@@ -520,6 +522,7 @@
520522
isa = PBXGroup;
521523
children = (
522524
5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */,
525+
B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */,
523526
224EFF981FBAAC4700CF9B3B /* EquatableTests.swift */,
524527
7AB9062A28AAB9469752A954 /* ChartUtilsTests.swift */,
525528
B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */,
@@ -734,7 +737,7 @@
734737
isa = PBXProject;
735738
attributes = {
736739
LastSwiftUpdateCheck = 0830;
737-
LastUpgradeCheck = 0930;
740+
LastUpgradeCheck = 1020;
738741
TargetAttributes = {
739742
A58A4ED274A941CA248EA921 = {
740743
LastSwiftMigration = 0900;
@@ -749,6 +752,7 @@
749752
developmentRegion = English;
750753
hasScannedForEncodings = 0;
751754
knownRegions = (
755+
English,
752756
en,
753757
);
754758
mainGroup = 865A1CF149F52850CAB7F177;
@@ -962,6 +966,7 @@
962966
8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */,
963967
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */,
964968
2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */,
969+
B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */,
965970
135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */,
966971
064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */,
967972
224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */,
@@ -996,7 +1001,7 @@
9961001
GCC_NO_COMMON_BLOCKS = YES;
9971002
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
9981003
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
999-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1004+
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
10001005
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
10011006
MACOSX_DEPLOYMENT_TARGET = 10.11;
10021007
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1007,7 +1012,7 @@
10071012
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
10081013
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10091014
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1010-
SWIFT_VERSION = 4.2;
1015+
SWIFT_VERSION = 5.0;
10111016
TVOS_DEPLOYMENT_TARGET = 9.0;
10121017
VERSIONING_SYSTEM = "apple-generic";
10131018
VERSION_INFO_PREFIX = "";
@@ -1030,7 +1035,7 @@
10301035
);
10311036
GCC_NO_COMMON_BLOCKS = YES;
10321037
INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
1033-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1038+
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
10341039
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10351040
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
10361041
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1040,7 +1045,7 @@
10401045
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
10411046
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10421047
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1043-
SWIFT_VERSION = 4.0;
1048+
SWIFT_VERSION = 5.0;
10441049
TVOS_DEPLOYMENT_TARGET = 9.0;
10451050
};
10461051
name = Debug;
@@ -1049,6 +1054,7 @@
10491054
isa = XCBuildConfiguration;
10501055
buildSettings = {
10511056
ALWAYS_SEARCH_USER_PATHS = NO;
1057+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10521058
CLANG_ANALYZER_NONNULL = YES;
10531059
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
10541060
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -1090,7 +1096,7 @@
10901096
GCC_WARN_UNUSED_VARIABLE = YES;
10911097
SDKROOT = macosx;
10921098
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1093-
SWIFT_VERSION = 4.0;
1099+
SWIFT_VERSION = 5.0;
10941100
TARGETED_DEVICE_FAMILY = "1,2,3,4";
10951101
VALIDATE_PRODUCT = YES;
10961102
};
@@ -1100,6 +1106,7 @@
11001106
isa = XCBuildConfiguration;
11011107
buildSettings = {
11021108
ALWAYS_SEARCH_USER_PATHS = NO;
1109+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
11031110
CLANG_ANALYZER_NONNULL = YES;
11041111
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
11051112
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -1149,7 +1156,7 @@
11491156
ONLY_ACTIVE_ARCH = YES;
11501157
SDKROOT = macosx;
11511158
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1152-
SWIFT_VERSION = 4.0;
1159+
SWIFT_VERSION = 5.0;
11531160
TARGETED_DEVICE_FAMILY = "1,2,3,4";
11541161
};
11551162
name = Debug;
@@ -1170,7 +1177,7 @@
11701177
GCC_NO_COMMON_BLOCKS = YES;
11711178
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
11721179
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1173-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1180+
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
11741181
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
11751182
MACOSX_DEPLOYMENT_TARGET = 10.11;
11761183
MTL_ENABLE_DEBUG_INFO = NO;
@@ -1180,7 +1187,7 @@
11801187
SKIP_INSTALL = YES;
11811188
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
11821189
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1183-
SWIFT_VERSION = 4.2;
1190+
SWIFT_VERSION = 5.0;
11841191
TVOS_DEPLOYMENT_TARGET = 9.0;
11851192
VERSIONING_SYSTEM = "apple-generic";
11861193
VERSION_INFO_PREFIX = "";
@@ -1203,7 +1210,7 @@
12031210
);
12041211
GCC_NO_COMMON_BLOCKS = YES;
12051212
INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
1206-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1213+
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
12071214
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12081215
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
12091216
MTL_ENABLE_DEBUG_INFO = NO;
@@ -1212,7 +1219,7 @@
12121219
SDKROOT = macosx;
12131220
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
12141221
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1215-
SWIFT_VERSION = 4.0;
1222+
SWIFT_VERSION = 5.0;
12161223
TVOS_DEPLOYMENT_TARGET = 9.0;
12171224
};
12181225
name = Release;

Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@
653653
attributes = {
654654
LastSwiftMigration = 0700;
655655
LastSwiftUpdateCheck = 0700;
656-
LastUpgradeCheck = 0930;
656+
LastUpgradeCheck = 1020;
657657
ORGANIZATIONNAME = dcg;
658658
TargetAttributes = {
659659
225B361C1F6EB9A50005B3D5 = {
@@ -672,6 +672,7 @@
672672
developmentRegion = English;
673673
hasScannedForEncodings = 0;
674674
knownRegions = (
675+
English,
675676
en,
676677
Base,
677678
);
@@ -907,7 +908,7 @@
907908
PRODUCT_NAME = "$(TARGET_NAME)";
908909
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
909910
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
910-
SWIFT_VERSION = 4.2;
911+
SWIFT_VERSION = 5.0;
911912
TARGETED_DEVICE_FAMILY = 1;
912913
};
913914
name = Debug;
@@ -936,7 +937,7 @@
936937
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
937938
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-Swift";
938939
PRODUCT_NAME = "$(TARGET_NAME)";
939-
SWIFT_VERSION = 4.2;
940+
SWIFT_VERSION = 5.0;
940941
TARGETED_DEVICE_FAMILY = 1;
941942
};
942943
name = Release;
@@ -945,6 +946,7 @@
945946
isa = XCBuildConfiguration;
946947
buildSettings = {
947948
ALWAYS_SEARCH_USER_PATHS = NO;
949+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
948950
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
949951
CLANG_CXX_LIBRARY = "libc++";
950952
CLANG_ENABLE_MODULES = YES;
@@ -986,18 +988,19 @@
986988
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
987989
GCC_WARN_UNUSED_FUNCTION = YES;
988990
GCC_WARN_UNUSED_VARIABLE = YES;
989-
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
991+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
990992
MTL_ENABLE_DEBUG_INFO = YES;
991993
ONLY_ACTIVE_ARCH = YES;
992994
SDKROOT = iphoneos;
993-
SWIFT_VERSION = 4.0;
995+
SWIFT_VERSION = 5.0;
994996
};
995997
name = Debug;
996998
};
997999
5B57BBD11A9B26AA0036A6CC /* Release */ = {
9981000
isa = XCBuildConfiguration;
9991001
buildSettings = {
10001002
ALWAYS_SEARCH_USER_PATHS = NO;
1003+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10011004
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
10021005
CLANG_CXX_LIBRARY = "libc++";
10031006
CLANG_ENABLE_MODULES = YES;
@@ -1032,11 +1035,11 @@
10321035
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10331036
GCC_WARN_UNUSED_FUNCTION = YES;
10341037
GCC_WARN_UNUSED_VARIABLE = YES;
1035-
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
1038+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
10361039
MTL_ENABLE_DEBUG_INFO = NO;
10371040
SDKROOT = iphoneos;
10381041
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1039-
SWIFT_VERSION = 4.0;
1042+
SWIFT_VERSION = 5.0;
10401043
VALIDATE_PRODUCT = YES;
10411044
};
10421045
name = Release;
@@ -1057,7 +1060,7 @@
10571060
SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
10581061
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
10591062
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1060-
SWIFT_VERSION = 4.2;
1063+
SWIFT_VERSION = 5.0;
10611064
};
10621065
name = Debug;
10631066
};
@@ -1076,7 +1079,7 @@
10761079
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
10771080
SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
10781081
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
1079-
SWIFT_VERSION = 4.2;
1082+
SWIFT_VERSION = 5.0;
10801083
};
10811084
name = Release;
10821085
};

0 commit comments

Comments
 (0)