upgrade to SwiftJson 5.0 , Charts 3.3

wuxudong · Apr 16, 2019 · 20e93db · 20e93db
1 parent 4f80038
commit 20e93db
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 1,617 deletions.
diff --git a/Example/ios/Example.xcodeproj/project.pbxproj b/Example/ios/Example.xcodeproj/project.pbxproj
@@ -147,6 +147,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -308,7 +309,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Example-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -339,7 +340,7 @@
 				PRODUCT_NAME = Example;
 				SWIFT_OBJC_BRIDGING_HEADER = "Example-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
@@ -386,7 +387,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -424,7 +425,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/Example/ios/Podfile b/Example/ios/Podfile
@@ -27,16 +27,4 @@ target 'Example' do
     pod 'RNCharts', :path => '../../'
     pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
 
-end
-
-swift4 = ['Charts']
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      if swift4.include?(target.name)
-        config.build_settings['SWIFT_VERSION'] = '4.2'
-      end
-    end
-  end
-end
+end
diff --git a/Example/yarn.lock b/Example/yarn.lock
diff --git a/RNCharts.podspec b/RNCharts.podspec
@@ -17,11 +17,9 @@ Pod::Spec.new do |s|
   s.source_files = "ios/ReactNativeCharts/**/*.{h,m,swift}"
   s.static_framework = true
 
-  s.swift_version= '4.2'
-
   s.dependency 'React'
-  s.dependency 'SwiftyJSON'
-  s.dependency 'Charts', '3.2.2'
+  s.dependency 'SwiftyJSON', '5.0'
+  s.dependency 'Charts', '3.3'
 
 
 end
diff --git a/ios/ReactNativeCharts/bar/BarDataExtract.swift b/ios/ReactNativeCharts/bar/BarDataExtract.swift
@@ -32,7 +32,7 @@ class BarDataExtract : DataExtract {
     }
 
     override open func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return BarChartDataSet(values: entries, label: label)
+        return BarChartDataSet(entries: entries, label: label)
     }
 
     override open func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/bubble/BubbleDataExtract.swift b/ios/ReactNativeCharts/bubble/BubbleDataExtract.swift
@@ -13,7 +13,7 @@ class BubbleDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return BubbleChartDataSet(values: entries, label: label)
+        return BubbleChartDataSet(entries: entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/candlestick/CandleDataExtract.swift b/ios/ReactNativeCharts/candlestick/CandleDataExtract.swift
@@ -12,7 +12,7 @@ class CandleDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return CandleChartDataSet(values: entries, label: label)
+        return CandleChartDataSet(entries: entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/line/LineDataExtract.swift b/ios/ReactNativeCharts/line/LineDataExtract.swift
@@ -13,7 +13,7 @@ class LineDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return LineChartDataSet(values: entries, label: label)
+        return LineChartDataSet(entries: entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/pie/PieDataExtract.swift b/ios/ReactNativeCharts/pie/PieDataExtract.swift
@@ -13,7 +13,7 @@ class PieDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return PieChartDataSet(values: entries, label: label)
+        return PieChartDataSet(entries: entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/radar/RadarDataExtract.swift b/ios/ReactNativeCharts/radar/RadarDataExtract.swift
@@ -13,7 +13,7 @@ class RadarDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return RadarChartDataSet(values : entries, label: label)
+        return RadarChartDataSet(entries : entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/scatter/ScatterDataExtract.swift b/ios/ReactNativeCharts/scatter/ScatterDataExtract.swift
@@ -17,7 +17,7 @@ class ScatterDataExtract : DataExtract {
     }
 
     override func createDataSet(_ entries: [ChartDataEntry]?, label: String?) -> IChartDataSet {
-        return ScatterChartDataSet(values: entries, label: label)
+        return ScatterChartDataSet(entries: entries, label: label)
     }
 
     override func dataSetConfig(_ dataSet: IChartDataSet, config: JSON) {

diff --git a/ios/ReactNativeCharts/utils/BridgeUtils.swift b/ios/ReactNativeCharts/utils/BridgeUtils.swift
@@ -303,15 +303,15 @@ class BridgeUtils {
 //      NSLog("this label position %@", iosEnumString)
       switch iosEnumString {
       case "rightBottom":
-        return .rightBottom
+        return .bottomRight
       case "leftBottom":
-        return .leftBottom
+        return .bottomLeft
       case "rightTop":
-        return .rightTop
+        return .topRight
       case "leftTop":
-        return .leftTop
+        return .topLeft
       default:
-        return .rightTop
+        return .topRight
       }
     }
 }