Convert To Swift 2.0, Fucking Waterfall

liushuaikobe · Sep 27, 2015 · 22e2019 · 22e2019
1 parent 7af5ac5
commit 22e2019
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 517 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "onevcat/Kingfisher" == 1.4.5
-github "Alamofire/Alamofire" == 1.3.1 
+github "onevcat/Kingfisher" >= 1.6
+github "Alamofire/Alamofire" ~> 2.0 
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "1.3.1"
-github "onevcat/Kingfisher" "1.4.5"
+github "Alamofire/Alamofire" "2.0.2"
+github "onevcat/Kingfisher" "1.6.0"
diff --git a/beauties/BeautyCollectionViewCell.swift b/beauties/BeautyCollectionViewCell.swift
@@ -20,7 +20,7 @@ class BeautyCollectionViewCell: UICollectionViewCell {
         commonInit()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         imageView = UIImageView()
         super.init(coder: aDecoder)
         commonInit()
@@ -41,7 +41,7 @@ class BeautyCollectionViewCell: UICollectionViewCell {
 
         self.imageView.clipsToBounds = true
         self.imageView.frame = self.bounds
-        self.imageView.autoresizingMask = .FlexibleWidth | .FlexibleHeight
+        self.imageView.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
         self.imageView.contentMode = .ScaleAspectFill
         self.addSubview(self.imageView)
     }

diff --git a/beauties/BeautyCollectionViewFooter.swift b/beauties/BeautyCollectionViewFooter.swift
@@ -19,7 +19,7 @@ class BeautyCollectionViewFooter: UICollectionReusableView {
         self.commonInit()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         loadingIndicator = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
         super.init(coder: aDecoder)
         self.commonInit()

diff --git a/beauties/BeautyImageEntity.swift b/beauties/BeautyImageEntity.swift
@@ -21,7 +21,7 @@ class BeautyImageEntity: NSObject, NSCoding {
 
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         imageUrl = aDecoder.decodeObjectForKey("imageUrl") as? String
         imageHeight = aDecoder.decodeObjectForKey("imageHeight") as? Int
         imageWidth = aDecoder.decodeObjectForKey("imageWidth") as? Int

diff --git a/beauties/BlurView.swift b/beauties/BlurView.swift
@@ -11,8 +11,8 @@ import UIKit
 
 extension UIView {
     func applyBlurEffect() -> Void {
-        var blurEffect = UIBlurEffect(style: .Light)
-        var visualEffectView = UIVisualEffectView(effect: blurEffect)
+        let blurEffect = UIBlurEffect(style: .Light)
+        let visualEffectView = UIVisualEffectView(effect: blurEffect)
         visualEffectView.frame = self.bounds
         self.addSubview(visualEffectView)
     }