Fixed build errors and warnings for Xcode 7 and Swift 2

mnatsakanov · cbguder · commit bf31a291e68c · 2015-09-17T11:17:43.000-07:00
Signed-off-by: Can Berk Güder &lt;cbguder@pivotal.io&gt;
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotateMultiple.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotateMultiple.swift
@@ -14,7 +14,6 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
         let bigCircleSize: CGFloat = size.width
         let smallCircleSize: CGFloat = size.width / 2
         let longDuration: CFTimeInterval = 1
-        let shortDuration: CFTimeInterval = 0.5
         let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
         
         circleOf(shape: .RingTwoHalfHorizontal,
@@ -31,7 +30,7 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
             color: color, reverse: true)
     }
     
-    func createAnimationIn(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, reverse: Bool) -> CAAnimation {
+    func createAnimationIn(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, reverse: Bool) -> CAAnimation {
         // Scale animation
         let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
         
@@ -63,7 +62,7 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
         return animation
     }
     
-    func circleOf(# shape: NVActivityIndicatorShape, duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGFloat, color: UIColor, reverse: Bool) {
+    func circleOf(shape shape: NVActivityIndicatorShape, duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGFloat, color: UIColor, reverse: Bool) {
         let circle = shape.createLayerWith(size: CGSize(width: size, height: size), color: color)
         let frame = CGRect(x: (layer.bounds.size.width - size) / 2,
             y: (layer.bounds.size.height - size) / 2,
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotatePulse.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotatePulse.swift
@@ -18,7 +18,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat
         bigCircleWith(duration: duration, timingFunction: timingFunction, layer: layer, size: size, color: color)
     }
     
-    func smallCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
+    func smallCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
         // Animation
         let animation = CAKeyframeAnimation(keyPath:"transform.scale")
         
@@ -42,7 +42,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat
         layer.addSublayer(circle)
     }
     
-    func bigCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
+    func bigCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
         // Scale animation
         let scaleAnimation = CAKeyframeAnimation(keyPath:"transform.scale")
         
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseRise.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseRise.swift
@@ -39,7 +39,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel
         }
     }
     
-    func oddAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
+    func oddAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
         // Scale animation
         let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
         
@@ -66,7 +66,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel
         return animation
     }
     
-    func evenAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
+    func evenAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
         // Scale animation
         let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
         
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallSpinFadeLoader.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallSpinFadeLoader.swift
@@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationBallSpinFadeLoader: NVActivityIndicatorAnimati
         }
     }
     
-    func circleAt(# angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
+    func circleAt(angle angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
         let radius = containerSize.width / 2
         let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: CGSize(width: size, height: size), color: color)
         let frame = CGRect(
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZag.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZag.swift
@@ -45,7 +45,7 @@ class NVActivityIndicatorAnimationBallZigZag: NVActivityIndicatorAnimationDelega
         circleAt(frame: frame, layer: layer, size: CGSize(width: circleSize, height: circleSize), color: color, animation: animation)
     }
     
-    func circleAt(# frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
+    func circleAt(frame frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
         let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: size, color: color)
         
         circle.frame = frame
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZagDeflect.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZagDeflect.swift
@@ -45,7 +45,7 @@ class NVActivityIndicatorAnimationBallZigZagDeflect: NVActivityIndicatorAnimatio
         circleAt(frame: frame, layer: layer, size: CGSize(width: circleSize, height: circleSize), color: color, animation: animation)
     }
     
-    func circleAt(# frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
+    func circleAt(frame frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
         let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: size, color: color)
         
         circle.frame = frame
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationLineSpinFadeLoader.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationLineSpinFadeLoader.swift
@@ -44,7 +44,7 @@ class NVActivityIndicatorAnimationLineSpinFadeLoader: NVActivityIndicatorAnimati
         }
     }
     
-    func lineAt(# angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
+    func lineAt(angle angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
         let radius = containerSize.width / 2
         let lineContainerSize = CGSize(width: max(size.width, size.height), height: max(size.width, size.height))
         let lineContainer = CALayer()
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationSquareSpin.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationSquareSpin.swift
@@ -41,15 +41,15 @@ class NVActivityIndicatorAnimationSquareSpin: NVActivityIndicatorAnimationDelega
         layer.addSublayer(square)
     }
     
-    func createRotateXTransform(# angle: CGFloat) -> CATransform3D {
+    func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {
         var transform = CATransform3DMakeRotation(angle, 1, 0, 0)
         
         transform.m34 = CGFloat(-1) / 100
         
         return transform
     }
     
-    func createRotateYTransform(# angle: CGFloat) -> CATransform3D {
+    func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {
         var transform = CATransform3DMakeRotation(angle, 0, 1, 0)
         
         transform.m34 = CGFloat(-1) / 100
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationTriangleSkewSpin.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationTriangleSkewSpin.swift
@@ -39,15 +39,15 @@ class NVActivityIndicatorAnimationTriangleSkewSpin: NVActivityIndicatorAnimation
         layer.addSublayer(triangle)
     }
     
-    func createRotateXTransform(# angle: CGFloat) -> CATransform3D {
+    func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {
         var transform = CATransform3DMakeRotation(angle, 1, 0, 0)
         
         transform.m34 = CGFloat(-1) / 100
         
         return transform
     }
     
-    func createRotateYTransform(# angle: CGFloat) -> CATransform3D {
+    func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {
         var transform = CATransform3DMakeRotation(angle, 0, 1, 0)
         
         transform.m34 = CGFloat(-1) / 100
diff --git a/NVActivityIndicatorView/NVActivityIndicatorShape.swift b/NVActivityIndicatorView/NVActivityIndicatorShape.swift
@@ -20,7 +20,7 @@ enum NVActivityIndicatorShape {
     case Line
     case Pacman
     
-    func createLayerWith(# size: CGSize, color: UIColor) -> CALayer {
+    func createLayerWith(size size: CGSize, color: UIColor) -> CALayer {
         let layer: CAShapeLayer = CAShapeLayer()
         var path: UIBezierPath = UIBezierPath()
         let lineWidth: CGFloat = 2
@@ -34,8 +34,6 @@ enum NVActivityIndicatorShape {
                 clockwise: false);
             layer.fillColor = color.CGColor
         case .CircleSemi:
-            let radius = CGFloat(size.width / 2)
-            
             path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
                 radius: size.width / 2,
                 startAngle: CGFloat(-M_PI / 6),
@@ -53,8 +51,6 @@ enum NVActivityIndicatorShape {
             layer.strokeColor = color.CGColor
             layer.lineWidth = lineWidth
         case .RingTwoHalfVertical:
-            let radius = CGFloat(size.width / 2)
-            
             path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
                 radius:size.width / 2,
                 startAngle:CGFloat(-3 * M_PI_4),
@@ -73,8 +69,6 @@ enum NVActivityIndicatorShape {
             layer.strokeColor = color.CGColor
             layer.lineWidth = lineWidth
         case .RingTwoHalfHorizontal:
-            let radius = size.width / 2
-            
             path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
                 radius:size.width / 2,
                 startAngle:CGFloat(3 * M_PI_4),
diff --git a/NVActivityIndicatorView/NVActivityIndicatorView.swift b/NVActivityIndicatorView/NVActivityIndicatorView.swift
@@ -127,7 +127,7 @@ public class NVActivityIndicatorView: UIView {
     
         :returns: The activity indicator view
     */
-    required public init(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         self.type = NVActivityIndicatorView.DEFAULT_TYPE
         self.color = NVActivityIndicatorView.DEFAULT_COLOR
         self.size = NVActivityIndicatorView.DEFAULT_SIZE
diff --git a/NVActivityIndicatorViewDemo.xcodeproj/project.pbxproj b/NVActivityIndicatorViewDemo.xcodeproj/project.pbxproj
@@ -268,7 +268,8 @@
 		239CAB181B5EBB2E0051DC06 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Nguyen Vinh";
 				TargetAttributes = {
 					239CAB1F1B5EBB2E0051DC06 = {
@@ -420,6 +421,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -486,6 +488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = NVActivityIndicatorViewDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.nvin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -496,6 +499,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = NVActivityIndicatorViewDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.nvin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -514,6 +518,7 @@
 				);
 				INFOPLIST_FILE = NVActivityIndicatorViewDemoTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.nvin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NVActivityIndicatorViewDemo.app/NVActivityIndicatorViewDemo";
 			};
@@ -529,6 +534,7 @@
 				);
 				INFOPLIST_FILE = NVActivityIndicatorViewDemoTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.nvin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NVActivityIndicatorViewDemo.app/NVActivityIndicatorViewDemo";
 			};
diff --git a/NVActivityIndicatorViewDemo/Info.plist b/NVActivityIndicatorViewDemo/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.nvin.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/NVActivityIndicatorViewDemoTests/Info.plist b/NVActivityIndicatorViewDemoTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.nvin.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat`
`18`	`18`	`bigCircleWith(duration: duration, timingFunction: timingFunction, layer: layer, size: size, color: color)`
`19`	`19`	`}`
`20`	`20`
`21`		`- func smallCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {`
	`21`	`+ func smallCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {`
`22`	`22`	`// Animation`
`23`	`23`	`let animation = CAKeyframeAnimation(keyPath:"transform.scale")`
`24`	`24`
`@@ -42,7 +42,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat`
`42`	`42`	`layer.addSublayer(circle)`
`43`	`43`	`}`
`44`	`44`
`45`		`- func bigCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {`
	`45`	`+ func bigCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {`
`46`	`46`	`// Scale animation`
`47`	`47`	`let scaleAnimation = CAKeyframeAnimation(keyPath:"transform.scale")`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- func oddAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {`
	`42`	`+ func oddAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {`
`43`	`43`	`// Scale animation`
`44`	`44`	`let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")`
`45`	`45`
`@@ -66,7 +66,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel`
`66`	`66`	`return animation`
`67`	`67`	`}`
`68`	`68`
`69`		`- func evenAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {`
	`69`	`+ func evenAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {`
`70`	`70`	`// Scale animation`
`71`	`71`	`let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationBallSpinFadeLoader: NVActivityIndicatorAnimati`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- func circleAt(# angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {`
	`59`	`+ func circleAt(angle angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {`
`60`	`60`	`let radius = containerSize.width / 2`
`61`	`61`	`let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: CGSize(width: size, height: size), color: color)`
`62`	`62`	`let frame = CGRect(`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class NVActivityIndicatorAnimationBallZigZag: NVActivityIndicatorAnimationDelega`
`45`	`45`	`circleAt(frame: frame, layer: layer, size: CGSize(width: circleSize, height: circleSize), color: color, animation: animation)`
`46`	`46`	`}`
`47`	`47`
`48`		`- func circleAt(# frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {`
	`48`	`+ func circleAt(frame frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {`
`49`	`49`	`let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: size, color: color)`
`50`	`50`
`51`	`51`	`circle.frame = frame`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class NVActivityIndicatorAnimationLineSpinFadeLoader: NVActivityIndicatorAnimati`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- func lineAt(# angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {`
	`47`	`+ func lineAt(angle angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {`
`48`	`48`	`let radius = containerSize.width / 2`
`49`	`49`	`let lineContainerSize = CGSize(width: max(size.width, size.height), height: max(size.width, size.height))`
`50`	`50`	`let lineContainer = CALayer()`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ class NVActivityIndicatorAnimationSquareSpin: NVActivityIndicatorAnimationDelega`
`41`	`41`	`layer.addSublayer(square)`
`42`	`42`	`}`
`43`	`43`
`44`		`- func createRotateXTransform(# angle: CGFloat) -> CATransform3D {`
	`44`	`+ func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {`
`45`	`45`	`var transform = CATransform3DMakeRotation(angle, 1, 0, 0)`
`46`	`46`
`47`	`47`	`transform.m34 = CGFloat(-1) / 100`
`48`	`48`
`49`	`49`	`return transform`
`50`	`50`	`}`
`51`	`51`
`52`		`- func createRotateYTransform(# angle: CGFloat) -> CATransform3D {`
	`52`	`+ func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {`
`53`	`53`	`var transform = CATransform3DMakeRotation(angle, 0, 1, 0)`
`54`	`54`
`55`	`55`	`transform.m34 = CGFloat(-1) / 100`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ class NVActivityIndicatorAnimationTriangleSkewSpin: NVActivityIndicatorAnimation`
`39`	`39`	`layer.addSublayer(triangle)`
`40`	`40`	`}`
`41`	`41`
`42`		`- func createRotateXTransform(# angle: CGFloat) -> CATransform3D {`
	`42`	`+ func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {`
`43`	`43`	`var transform = CATransform3DMakeRotation(angle, 1, 0, 0)`
`44`	`44`
`45`	`45`	`transform.m34 = CGFloat(-1) / 100`
`46`	`46`
`47`	`47`	`return transform`
`48`	`48`	`}`
`49`	`49`
`50`		`- func createRotateYTransform(# angle: CGFloat) -> CATransform3D {`
	`50`	`+ func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {`
`51`	`51`	`var transform = CATransform3DMakeRotation(angle, 0, 1, 0)`
`52`	`52`
`53`	`53`	`transform.m34 = CGFloat(-1) / 100`