Skip to content

Commit f74ad6b

Browse files
danielgindidanielgindi
committed
Converted to Swift 3.0
1 parent 5e020a8 commit f74ad6b

File tree

151 files changed

+4699
-4582
lines changed

Some content is hidden

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

151 files changed

+4699
-4582
lines changed

‎Charts/Charts.xcodeproj/project.pbxproj

+21-1
Original file line numberDiff line numberDiff line change
@@ -1056,14 +1056,15 @@
10561056
attributes = {
10571057
LastSwiftMigration = 0700;
10581058
LastSwiftUpdateCheck = 0710;
1059-
LastUpgradeCheck = 0730;
1059+
LastUpgradeCheck = 0800;
10601060
ORGANIZATIONNAME = dcg;
10611061
TargetAttributes = {
10621062
06AEE7A11BDC3F8B009875AE = {
10631063
CreatedOnToolsVersion = 7.1;
10641064
};
10651065
5BA8EC3F1A9D14DC00CE82E1 = {
10661066
CreatedOnToolsVersion = 6.1.1;
1067+
LastSwiftMigration = 0800;
10671068
};
10681069
65B3F5BE1C7370BE000983D0 = {
10691070
CreatedOnToolsVersion = 7.2.1;
@@ -1577,6 +1578,7 @@
15771578
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15781579
PRODUCT_BUNDLE_IDENTIFIER = com.pierremarcairoldi.ChartsTests;
15791580
PRODUCT_NAME = "$(TARGET_NAME)";
1581+
SWIFT_VERSION = 3.0;
15801582
};
15811583
name = Debug;
15821584
};
@@ -1596,6 +1598,7 @@
15961598
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15971599
PRODUCT_BUNDLE_IDENTIFIER = com.pierremarcairoldi.ChartsTests;
15981600
PRODUCT_NAME = "$(TARGET_NAME)";
1601+
SWIFT_VERSION = 3.0;
15991602
};
16001603
name = Release;
16011604
};
@@ -1613,8 +1616,10 @@
16131616
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
16141617
CLANG_WARN_EMPTY_BODY = YES;
16151618
CLANG_WARN_ENUM_CONVERSION = YES;
1619+
CLANG_WARN_INFINITE_RECURSION = YES;
16161620
CLANG_WARN_INT_CONVERSION = YES;
16171621
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1622+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
16181623
CLANG_WARN_UNREACHABLE_CODE = YES;
16191624
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
16201625
COPY_PHASE_STRIP = NO;
@@ -1623,6 +1628,7 @@
16231628
ENABLE_TESTABILITY = YES;
16241629
GCC_C_LANGUAGE_STANDARD = gnu99;
16251630
GCC_DYNAMIC_NO_PIC = NO;
1631+
GCC_NO_COMMON_BLOCKS = YES;
16261632
GCC_OPTIMIZATION_LEVEL = 0;
16271633
GCC_PREPROCESSOR_DEFINITIONS = (
16281634
"DEBUG=1",
@@ -1660,15 +1666,18 @@
16601666
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
16611667
CLANG_WARN_EMPTY_BODY = YES;
16621668
CLANG_WARN_ENUM_CONVERSION = YES;
1669+
CLANG_WARN_INFINITE_RECURSION = YES;
16631670
CLANG_WARN_INT_CONVERSION = YES;
16641671
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1672+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
16651673
CLANG_WARN_UNREACHABLE_CODE = YES;
16661674
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
16671675
COPY_PHASE_STRIP = YES;
16681676
CURRENT_PROJECT_VERSION = 1;
16691677
ENABLE_NS_ASSERTIONS = NO;
16701678
ENABLE_STRICT_OBJC_MSGSEND = YES;
16711679
GCC_C_LANGUAGE_STANDARD = gnu99;
1680+
GCC_NO_COMMON_BLOCKS = YES;
16721681
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
16731682
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
16741683
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1678,6 +1687,7 @@
16781687
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
16791688
MTL_ENABLE_DEBUG_INFO = NO;
16801689
SDKROOT = iphoneos;
1690+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
16811691
TARGETED_DEVICE_FAMILY = "1,2";
16821692
VALIDATE_PRODUCT = YES;
16831693
VERSIONING_SYSTEM = "apple-generic";
@@ -1691,6 +1701,7 @@
16911701
APPLICATION_EXTENSION_API_ONLY = YES;
16921702
CLANG_ENABLE_MODULES = YES;
16931703
CODE_SIGN_IDENTITY = "iPhone Developer";
1704+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
16941705
DEFINES_MODULE = YES;
16951706
DYLIB_COMPATIBILITY_VERSION = 1;
16961707
DYLIB_CURRENT_VERSION = 2.2.5;
@@ -1703,6 +1714,7 @@
17031714
PRODUCT_NAME = Charts;
17041715
SKIP_INSTALL = YES;
17051716
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1717+
SWIFT_VERSION = 3.0;
17061718
};
17071719
name = Debug;
17081720
};
@@ -1712,6 +1724,7 @@
17121724
APPLICATION_EXTENSION_API_ONLY = YES;
17131725
CLANG_ENABLE_MODULES = YES;
17141726
CODE_SIGN_IDENTITY = "iPhone Distribution";
1727+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
17151728
DEFINES_MODULE = YES;
17161729
DYLIB_COMPATIBILITY_VERSION = 1;
17171730
DYLIB_CURRENT_VERSION = 2.2.5;
@@ -1723,6 +1736,7 @@
17231736
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
17241737
PRODUCT_NAME = Charts;
17251738
SKIP_INSTALL = YES;
1739+
SWIFT_VERSION = 3.0;
17261740
};
17271741
name = Release;
17281742
};
@@ -1744,6 +1758,7 @@
17441758
PRODUCT_NAME = Charts;
17451759
SDKROOT = macosx;
17461760
SKIP_INSTALL = YES;
1761+
SWIFT_VERSION = 3.0;
17471762
};
17481763
name = Debug;
17491764
};
@@ -1766,6 +1781,7 @@
17661781
PRODUCT_NAME = Charts;
17671782
SDKROOT = macosx;
17681783
SKIP_INSTALL = YES;
1784+
SWIFT_VERSION = 3.0;
17691785
};
17701786
name = Release;
17711787
};
@@ -1774,6 +1790,7 @@
17741790
buildSettings = {
17751791
APPLICATION_EXTENSION_API_ONLY = YES;
17761792
CLANG_ENABLE_MODULES = YES;
1793+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
17771794
DEFINES_MODULE = YES;
17781795
DYLIB_COMPATIBILITY_VERSION = 1;
17791796
DYLIB_CURRENT_VERSION = 2.2.5;
@@ -1787,6 +1804,7 @@
17871804
SDKROOT = appletvos;
17881805
SKIP_INSTALL = YES;
17891806
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1807+
SWIFT_VERSION = 3.0;
17901808
TARGETED_DEVICE_FAMILY = 3;
17911809
TVOS_DEPLOYMENT_TARGET = 9.0;
17921810
};
@@ -1797,6 +1815,7 @@
17971815
buildSettings = {
17981816
APPLICATION_EXTENSION_API_ONLY = YES;
17991817
CLANG_ENABLE_MODULES = YES;
1818+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
18001819
COPY_PHASE_STRIP = NO;
18011820
DEFINES_MODULE = YES;
18021821
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1810,6 +1829,7 @@
18101829
PRODUCT_NAME = Charts;
18111830
SDKROOT = appletvos;
18121831
SKIP_INSTALL = YES;
1832+
SWIFT_VERSION = 3.0;
18131833
TARGETED_DEVICE_FAMILY = 3;
18141834
TVOS_DEPLOYMENT_TARGET = 9.0;
18151835
};

‎Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-OSX.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Charts/ChartsTests/BarChartTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BarChartTests: FBSnapshotTestCase
3030
dataSet = BarChartDataSet(values: entries, label: "Bar chart unit test data")
3131

3232
let data = BarChartData(dataSet: dataSet)
33-
data.barWidth = 0.85;
33+
data.barWidth = 0.85
3434

3535
chart = BarChartView(frame: CGRectMake(0, 0, 480, 350))
3636
chart.leftAxis.axisMinimum = 0.0

0 commit comments

Comments
 (0)