Support Swift2.0

yoavlt · Sep 19, 2015 · 110b593 · 110b593
1 parent f0d0a2c
commit 110b593
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/Example/LiquidLoader.xcodeproj/project.pbxproj b/Example/LiquidLoader.xcodeproj/project.pbxproj
@@ -209,6 +209,8 @@
  607FACC81AFB9204008FA782 /* Project object */ = {
  isa = PBXProject;
  attributes = {
+ LastSwiftMigration = 0700;
+ LastSwiftUpdateCheck = 0700;
  LastUpgradeCheck = 0630;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Pod/Classes/ArrayEx.swift b/Pod/Classes/ArrayEx.swift
@@ -46,7 +46,7 @@ extension Array {
 
  func indexOf <U: Equatable> (item: U) -> Int? {
  if item is Element {
- return Swift.find(unsafeBitCast(self, [U].self), item)
+ return unsafeBitCast(self, [U].self).indexOf(item)
  }
 
  return nil

diff --git a/Pod/Classes/CircularGradientLayer.swift b/Pod/Classes/CircularGradientLayer.swift
@@ -17,14 +17,14 @@ class CircularGradientLayer : CALayer {
  setNeedsDisplay()
  }
 
- required init(coder aDecoder: NSCoder) {
+ required init?(coder aDecoder: NSCoder) {
  fatalError("init(coder:) has not been implemented")
  }
 
- override func drawInContext(ctx: CGContext!) {
+ override func drawInContext(ctx: CGContext) {
  var locations = CGMath.linSpace(0.0, to: 1.0, n: colors.count)
- locations = locations.map { 1.0 - $0 * $0 }.reverse()
+ locations = Array(locations.map { 1.0 - $0 * $0 }.reverse())
  let gradients = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), colors.map { $0.CGColor }, locations)
- CGContextDrawRadialGradient(ctx, gradients, self.frame.center, CGFloat(0.0), self.frame.center, max(self.frame.width, self.frame.height), 10)
+ CGContextDrawRadialGradient(ctx, gradients, self.frame.center, CGFloat(0.0), self.frame.center, max(self.frame.width, self.frame.height), .DrawsAfterEndLocation)
  }
 }
diff --git a/Pod/Classes/LiquidLoader.swift b/Pod/Classes/LiquidLoader.swift
@@ -43,7 +43,7 @@ public class LiquidLoader : UIView {
  self.effectDelegate = self.effect.setup(self)
  }
 
- public required init(coder aDecoder: NSCoder) {
+ public required init?(coder aDecoder: NSCoder) {
  self.effect = .Circle(UIColor.whiteColor())
  super.init(coder: aDecoder)
  self.effectDelegate = self.effect.setup(self)

diff --git a/Pod/Classes/LiquittableCircle.swift b/Pod/Classes/LiquittableCircle.swift
@@ -32,7 +32,7 @@ class LiquittableCircle : UIView {
  setup()
  }
 
- required init(coder aDecoder: NSCoder) {
+ required init?(coder aDecoder: NSCoder) {
  fatalError("init(coder:) has not been implemented")
  }
 

diff --git a/Pod/Classes/UIView+Grow.swift b/Pod/Classes/UIView+Grow.swift
@@ -18,7 +18,7 @@ extension UIView {
  let circleGradient = CircularGradientLayer(colors: [growColor, UIColor(white: 1.0, alpha: 0)])
  circleGradient.frame = CGRect(x: 0, y: 0, width: radius * 2.0, height: radius * 2.0)
  circleGradient.opacity = 0.25
- for sub in layer.sublayers {
+ for sub in layer.sublayers! {
  if let l = sub as? CAShapeLayer {
  l.fillColor = UIColor.clearColor().CGColor
  }