Updated the Swift example apps with Swift 3.0 changes in Xcode 8 beta 4.

eskroch · eskroch · commit fe93e08aee3a · 2016-08-07T20:41:47.000-04:00
diff --git a/examples/CPTTestApp-iPhone/CPTTestApp-iPhone.xcodeproj/project.pbxproj b/examples/CPTTestApp-iPhone/CPTTestApp-iPhone.xcodeproj/project.pbxproj
@@ -249,6 +249,11 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0800;
+				TargetAttributes = {
+					1D6058900D05DD3D006BFB54 = {
+						LastSwiftMigration = 0800;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CPTTestApp-iPhone" */;
 			compatibilityVersion = "Xcode 6.3";
@@ -394,6 +399,7 @@
 				PRODUCT_NAME = "CPTTestApp-iPhone";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "CPTTestApp-iPhone-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../../framework\"/**";
 			};
 			name = Debug;
@@ -422,6 +428,7 @@
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "CPTTestApp-iPhone-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../../framework\"/**";
 			};
 			name = Release;
diff --git a/examples/CPTTestApp-iPhone/Classes/BarChartController.swift b/examples/CPTTestApp-iPhone/Classes/BarChartController.swift
@@ -49,8 +49,8 @@ class BarChartController : UIViewController, CPTBarPlotDataSource {
         let titleRange1 = NSRange(location: 0, length: lineOne.utf16.count)
         let titleRange2 = NSRange(location: lineOne.utf16.count + 1, length: lineTwo.utf16.count)
 
-        graphTitle.addAttribute(NSForegroundColorAttributeName, value:UIColor.white(), range:titleRange1)
-        graphTitle.addAttribute(NSForegroundColorAttributeName, value:UIColor.gray(), range:titleRange2)
+        graphTitle.addAttribute(NSForegroundColorAttributeName, value:UIColor.white, range:titleRange1)
+        graphTitle.addAttribute(NSForegroundColorAttributeName, value:UIColor.gray, range:titleRange2)
         graphTitle.addAttribute(NSParagraphStyleAttributeName, value:paragraphStyle, range:NSRange(location: 0, length: graphTitle.length))
         graphTitle.addAttribute(NSFontAttributeName, value:line1Font!, range:titleRange1)
         graphTitle.addAttribute(NSFontAttributeName, value:line2Font!, range:titleRange2)
diff --git a/examples/CPTTestApp-iPhone/Classes/PieChartController.swift b/examples/CPTTestApp-iPhone/Classes/PieChartController.swift
@@ -83,7 +83,7 @@ class PieChartController : UIViewController, CPTPieChartDataSource, CPTPieChartD
         return label
     }
 
-    func radialOffsetForPieChart(piePlot: CPTPieChart, recordIndex: UInt) -> CGFloat
+    func radialOffset(for piePlot: CPTPieChart, record recordIndex: UInt) -> CGFloat
     {
         var offset: CGFloat = 0.0
 
@@ -96,7 +96,7 @@ class PieChartController : UIViewController, CPTPieChartDataSource, CPTPieChartD
 
     // MARK: - Delegate Methods
     
-    private func pieChart(plot: CPTPlot, sliceWasSelectedAtRecordIndex recordIndex: UInt)
+    private func pieChart(_ plot: CPTPlot, sliceWasSelectedAtRecordIndex recordIndex: UInt)
     {
         self.pieGraph?.title = "Selected index: \(recordIndex)"
     }
diff --git a/examples/CPTTestApp-iPhone/Classes/ScatterPlotController.swift b/examples/CPTTestApp-iPhone/Classes/ScatterPlotController.swift
@@ -151,7 +151,7 @@ class ScatterPlotController : UIViewController, CPTScatterPlotDataSource, CPTAxi
 
     // MARK: - Axis Delegate Methods
 
-    private func axis(axis: CPTAxis, shouldUpdateAxisLabelsAtLocations locations: NSSet!) -> Bool
+    private func axis(_ axis: CPTAxis, shouldUpdateAxisLabelsAtLocations locations: NSSet!) -> Bool
     {
         if let formatter = axis.labelFormatter {
             let labelOffset = axis.labelOffset
diff --git a/examples/DatePlot/DatePlot.xcodeproj/project.pbxproj b/examples/DatePlot/DatePlot.xcodeproj/project.pbxproj
@@ -262,6 +262,11 @@
 				BuildIndependentTargetsInParallel = NO;
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0800;
+				TargetAttributes = {
+					8D1107260486CEB800E47090 = {
+						LastSwiftMigration = 0800;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DatePlot" */;
 			compatibilityVersion = "Xcode 6.3";
@@ -416,6 +421,7 @@
 				PRODUCT_NAME = DatePlot;
 				SWIFT_OBJC_BRIDGING_HEADER = "DatePlot-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -440,6 +446,7 @@
 				PRODUCT_NAME = DatePlot;
 				SWIFT_OBJC_BRIDGING_HEADER = "DatePlot-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class PieChartController : UIViewController, CPTPieChartDataSource, CPTPieChartD`
`83`	`83`	`return label`
`84`	`84`	`}`
`85`	`85`
`86`		`- func radialOffsetForPieChart(piePlot: CPTPieChart, recordIndex: UInt) -> CGFloat`
	`86`	`+ func radialOffset(for piePlot: CPTPieChart, record recordIndex: UInt) -> CGFloat`
`87`	`87`	`{`
`88`	`88`	`var offset: CGFloat = 0.0`
`89`	`89`
`@@ -96,7 +96,7 @@ class PieChartController : UIViewController, CPTPieChartDataSource, CPTPieChartD`
`96`	`96`
`97`	`97`	`// MARK: - Delegate Methods`
`98`	`98`
`99`		`- private func pieChart(plot: CPTPlot, sliceWasSelectedAtRecordIndex recordIndex: UInt)`
	`99`	`+ private func pieChart(_ plot: CPTPlot, sliceWasSelectedAtRecordIndex recordIndex: UInt)`
`100`	`100`	`{`
`101`	`101`	`self.pieGraph?.title = "Selected index: \(recordIndex)"`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ class ScatterPlotController : UIViewController, CPTScatterPlotDataSource, CPTAxi`
`151`	`151`
`152`	`152`	`// MARK: - Axis Delegate Methods`
`153`	`153`
`154`		`- private func axis(axis: CPTAxis, shouldUpdateAxisLabelsAtLocations locations: NSSet!) -> Bool`
	`154`	`+ private func axis(_ axis: CPTAxis, shouldUpdateAxisLabelsAtLocations locations: NSSet!) -> Bool`
`155`	`155`	`{`
`156`	`156`	`if let formatter = axis.labelFormatter {`
`157`	`157`	`let labelOffset = axis.labelOffset`