Swift 4

EyreFree · Oct 1, 2017 · 76a8f58 · 76a8f58
1 parent 774fb45
commit 76a8f58
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
-osx_image: xcode8.3
+
+osx_image: xcode9.0
 language: objective-c
 
 cache: cocoapods

diff --git a/README.md b/README.md
@@ -27,8 +27,10 @@ VSCAM 是一款图片分享应用，此处为使用 Swift 编写的 iOS 版本
 
 ## 开发环境
 
-- XCode 8.1+
-- Swift 3.0.1+
+| Version | Needs                                |
+|:--------|:-------------------------------------|
+| 1.x     | XCode 8.0+<br>Swift 3.0+<br>iOS 9.0+ |
+| 4.x     | XCode 9.0+<br>Swift 4.0+<br>iOS 9.0+ |
 
 ## 构建
 

diff --git a/VSCAM/Function.swift b/VSCAM/Function.swift
@@ -134,7 +134,7 @@ class Function: NSObject {
 
             controller.present(shareVC, animated: true) {
                 //分享完成回调
-                print("分享内容[\(title)][\(url)]")
+                print("分享内容[\(title ?? "")][\(url)]")
             }
         }
     }

diff --git a/VSCAM/LoadingView.swift b/VSCAM/LoadingView.swift
@@ -47,7 +47,7 @@ class MUGProgressIndicator: JGProgressHUDIndicatorView {
         rotateView.layer.contents = UIImage(named: "fadai")?.cgImage
 
         let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
-        rotationAnimation.toValue = NSNumber(value: M_PI * 2.0)
+        rotationAnimation.toValue = NSNumber(value: Double.pi * 2.0)
         //rotationAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
         rotationAnimation.duration = 1
         rotationAnimation.repeatCount = Float.infinity