.gitignore

@@ -52,7 +52,7 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
-Carthage/Build
+Carthage/
 
 # fastlane
 #

.swift-version

@@ -1 +1 @@
-4.0
+4.2

Cartfile

@@ -1 +1 @@
-github "SnapKit/SnapKit" ~> 3.2.0
+github "SnapKit/SnapKit" ~> 4.2.0

Cartfile.resolved

@@ -1 +1 @@
-github "SnapKit/SnapKit" "3.2.0"
+github "SnapKit/SnapKit" "4.2.0"

README.md

@@ -3,7 +3,7 @@
 ![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)
 [![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/VeinGuo/VGPlayer/blob/master/LICENSE)
 [![Platform](https://img.shields.io/cocoapods/p/Pastel.svg?style=flat)](https://github.com/VeinGuo/VGPlayer)
-[![Cocoapod](https://img.shields.io/badge/pod-v0.1.5-blue.svg)](http://cocoadocs.org/docsets/VGPlayer/0.1.5/)
+[![Cocoapod](https://img.shields.io/badge/pod-v0.2.0-blue.svg)](http://cocoadocs.org/docsets/VGPlayer/0.2.0/)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 ![Banners](https://github.com/VeinGuo/VGPlayer/blob/master/Image/Banners.png)
@@ -54,7 +54,9 @@ Swift developed based on AVPlayer iOS player,support horizontal gestures Fast fo
 - 2017-9-6 v0.1.5
 	- fix url param praser
 	- fix pause play error 
-
+- 2017-9-21 v0.2.0
+	- clean code
+	- convert to swift4
 
 ## Usage
 ### Play Video
@@ -196,14 +198,22 @@ self.player.backgroundMode = .proceed
 ## Installation
 - Download VGPlayer. Move to your project.
 
-- Cocoapods
+### Cocoapods
+
 
+**Swift 4**
 ```
-platform :ios, '8.0'
 use_frameworks!
-pod 'VGPlayer'
+pod 'VGPlayer', '~> 0.2.0'
+```
+
+**Swift 3**
 ```
-- Carthage
+use_frameworks!
+pod 'VGPlayer', '~> 0.1.5'
+```
+
+### Carthage
 
 ```
 github "VeinGuo/VGPlayer"

VGPlayer.podspec

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "VGPlayer"
-  s.version      = "0.1.5"
+  s.version      = "0.2.0"
   s.summary      = "A simple iOS video player in Swift"
   s.description  = "A simple iOS video player in Swift by Vein."
 
@@ -15,13 +15,13 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.platform     = :ios, "8.0"
-  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
 
   s.source       = { :git => "https://github.com/VeinGuo/VGPlayer.git", :tag => s.version }
   s.source_files = 'VGPlayer/Classes/*.*', 'VGPlayer/Classes/**/*.*'
   s.resources    = 'VGPlayer/*.xcassets'
   s.requires_arc = true
-  s.dependency 'SnapKit', '~> 4.0.0'
+  s.dependency 'SnapKit', '~> 4.2.0'
   s.frameworks   = 'UIKit', 'AVFoundation', 'Foundation'
 
 end

VGPlayer.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		336DDBC71EE5075A004BDE6F /* VGPlayerLoadingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336DDBC61EE5075A004BDE6F /* VGPlayerLoadingIndicator.swift */; };
-		33A448371F09F15C002103B4 /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33A448361F09F15C002103B4 /* SnapKit.framework */; };
 		33B36A9C1EE5327500F9BC2B /* VGPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B36A9B1EE5327500F9BC2B /* VGPlayerView.swift */; };
 		33D264DA1EEE74A800A42DDA /* Timer+VGPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33D264D91EEE74A800A42DDA /* Timer+VGPlayer.swift */; };
 		8001CB2F1EDD7D4E00C6C9D2 /* VGPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8001CB2E1EDD7D4E00C6C9D2 /* VGPlayer.swift */; };
@@ -29,6 +28,7 @@
 		807A46EF1EDC706100A99141 /* VGPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 807A46E51EDC706100A99141 /* VGPlayer.framework */; };
 		807A46F41EDC706100A99141 /* VGPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 807A46F31EDC706100A99141 /* VGPlayerTests.swift */; };
 		807A46F61EDC706100A99141 /* VGPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A46E81EDC706100A99141 /* VGPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		80AF1E3C2191EC1F00A73925 /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33A448361F09F15C002103B4 /* SnapKit.framework */; };
 		80B21B411EF5489C009E00EA /* VGSubtitles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80B21B401EF5489C009E00EA /* VGSubtitles.swift */; };
 		80D923A21EE4368600564FFD /* VGPlayerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D923A01EE4368600564FFD /* VGPlayerError.swift */; };
 		80D923A31EE4368600564FFD /* VGPlayerSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D923A11EE4368600564FFD /* VGPlayerSlider.swift */; };
@@ -84,7 +84,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				33A448371F09F15C002103B4 /* SnapKit.framework in Frameworks */,
+				80AF1E3C2191EC1F00A73925 /* SnapKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -240,7 +240,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = Vein;
 				TargetAttributes = {
 					807A46E41EDC706100A99141 = {
@@ -250,6 +250,7 @@
 					};
 					807A46ED1EDC706100A99141 = {
 						CreatedOnToolsVersion = 8.3;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -349,15 +350,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -403,15 +412,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -461,7 +478,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -486,7 +503,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.Vein.VGPlayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
@@ -499,7 +516,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Vein.VGPlayerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -511,7 +529,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Vein.VGPlayerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

VGPlayer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

VGPlayer.xcodeproj/xcshareddata/xcschemes/VGPlayer.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

VGPlayer/Classes/MediaCache/VGPlayerCacheManager.swift

@@ -21,12 +21,12 @@ open class VGPlayerCacheManager: NSObject {
     static public let VGPlayerCacheErrorKey: String = "VGPlayerCacheErrorKey"
     static public let VGPlayerCleanCacheKey: String = "VGPlayerCleanCacheKey"
 
-    open static var mediaCacheNotifyInterval = 0.1
+    public static var mediaCacheNotifyInterval = 0.1
 
     fileprivate let ioQueue = DispatchQueue(label: "com.vgplayer.ioQueue")
     fileprivate var fileManager: FileManager!
 
-    open static let shared = VGPlayerCacheManager()
+    public static let shared = VGPlayerCacheManager()
     open private(set) var cacheConfig = VGPlayerCacheConfiguration()
 
     public override init() {

VGPlayer/Classes/MediaCache/VGPlayerCacheMediaWorker.swift

@@ -185,7 +185,7 @@ open class VGPlayerCacheMediaWorker: NSObject {
 
     open func startWritting() {
         if !isWritting {
-            NotificationCenter.default.addObserver(self, selector: #selector(applicationDidEnterBackground(_:)), name: .UIApplicationDidEnterBackground, object: nil)
+            NotificationCenter.default.addObserver(self, selector: #selector(applicationDidEnterBackground(_:)), name:UIApplication.didEnterBackgroundNotification , object: nil)
         }
         isWritting = true
         starWriteDate = NSDate()

VGPlayer/Classes/Timer+VGPlayer.swift

@@ -10,7 +10,7 @@
 import Foundation
 
 extension Timer {
-    class func vgPlayer_scheduledTimerWithTimeInterval(_ timeInterval: TimeInterval, block: ()->(), repeats: Bool) -> Timer {
+    class func vgPlayer_scheduledTimerWithTimeInterval(_ timeInterval: TimeInterval, block: @escaping ()->(), repeats: Bool) -> Timer {
         return self.scheduledTimer(timeInterval: timeInterval, target:
             self, selector: #selector(self.vgPlayer_blcokInvoke(_:)), userInfo: block, repeats: repeats)
     }

VGPlayer/Classes/UIButton+VGPlayer.swift

@@ -23,7 +23,7 @@ extension UIButton {
         let largerFrame = self.bounds.insetBy(dx: -widthToAdd / 2, dy: -heightToAdd / 2)
 
         // perform hit test on larger frame
-        return (largerFrame.contains(point)) ? self : nil
+        return (largerFrame.contains(point)) ? super.hitTest(point, with: event) : nil
     }
 
 }

VGPlayer/Classes/VGPlayer.swift

@@ -197,7 +197,7 @@ open class VGPlayer: NSObject {
     internal func addPlayerObservers() {
         timeObserver = player?.addPeriodicTimeObserver(forInterval: .init(value: 1, timescale: 1), queue: DispatchQueue.main, using: { [weak self] time in
             guard let strongSelf = self else { return }
-            if let currentTime = strongSelf.player?.currentTime().seconds, let totalDuration = strongSelf.player?.currentItem?.duration.seconds{
+            if let currentTime = strongSelf.player?.currentTime().seconds, let totalDuration = strongSelf.player?.currentItem?.duration.seconds {
                 strongSelf.currentDuration = currentTime
                 strongSelf.delegate?.vgPlayer(strongSelf, playerDurationDidChange: currentTime, totalDuration: totalDuration)
                 strongSelf.displayView.playerDurationDidChange(currentTime, totalDuration: totalDuration)
@@ -275,7 +275,7 @@ extension VGPlayer {
             guard let strongSelf = self else { return }
             strongSelf.seeking = true
             strongSelf.startPlayerBuffering()
-            strongSelf.playerItem?.seek(to: CMTimeMakeWithSeconds(time, Int32(NSEC_PER_SEC)), completionHandler: { (finished) in
+            strongSelf.playerItem?.seek(to: CMTimeMakeWithSeconds(time, preferredTimescale: Int32(NSEC_PER_SEC)), completionHandler: { (finished) in
                 DispatchQueue.main.async {
                     strongSelf.seeking = false
                     strongSelf.stopPlayerBuffering()
@@ -327,8 +327,8 @@ extension VGPlayer {
 
     internal func addPlayerNotifications() {
         NotificationCenter.default.addObserver(self, selector: .playerItemDidPlayToEndTime, name: .AVPlayerItemDidPlayToEndTime, object: nil)
-        NotificationCenter.default.addObserver(self, selector: .applicationWillEnterForeground, name: .UIApplicationWillEnterForeground, object: nil)
-        NotificationCenter.default.addObserver(self, selector: .applicationDidEnterBackground, name: .UIApplicationDidEnterBackground, object: nil)
+        NotificationCenter.default.addObserver(self, selector: .applicationWillEnterForeground, name: UIApplication.willEnterForegroundNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: .applicationDidEnterBackground, name: UIApplication.didEnterBackgroundNotification, object: nil)
     }
 
     internal func removePlayerItemObservers() {
@@ -339,8 +339,8 @@ extension VGPlayer {
 
     internal func removePlayerNotifations() {
         NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: nil)
-        NotificationCenter.default.removeObserver(self, name: .UIApplicationWillEnterForeground, object: nil)
-        NotificationCenter.default.removeObserver(self, name: .UIApplicationDidEnterBackground, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UIApplication.willEnterForegroundNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UIApplication.didEnterBackgroundNotification, object: nil)
     }
 
 
@@ -390,19 +390,19 @@ extension VGPlayer {
         if (context == &playerItemContext) {
 
             if keyPath == #keyPath(AVPlayerItem.status) {
-                let status: AVPlayerItemStatus
+                let status: AVPlayerItem.Status
                 if let statusNumber = change?[.newKey] as? NSNumber {
-                    status = AVPlayerItemStatus(rawValue: statusNumber.intValue)!
+                    status = AVPlayerItem.Status(rawValue: statusNumber.intValue)!
                 } else {
                     status = .unknown
                 }
 
                 switch status {
-                case AVPlayerItemStatus.unknown:
+                case .unknown:
                     startPlayerBuffering()
-                case AVPlayerItemStatus.readyToPlay:
+                case .readyToPlay:
                     bufferState = .readyToPlay
-                case AVPlayerItemStatus.failed:
+                case .failed:
                     state = .error
                     collectPlayerErrorLogEvent()
                     stopPlayerBuffering()

VGPlayer/Classes/VGPlayerLoadingIndicator.swift

@@ -37,16 +37,16 @@ open class VGPlayerLoadingIndicator: UIView {
     }
 
    internal func commonInit(){
-        timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+    timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
         setupIndicatorLayer()
     }
 
    internal func setupIndicatorLayer() {
         indicatorLayer.strokeColor = UIColor.white.cgColor
         indicatorLayer.fillColor = nil
         indicatorLayer.lineWidth = 2.0
-        indicatorLayer.lineJoin = kCALineJoinRound;
-        indicatorLayer.lineCap = kCALineCapRound;
+        indicatorLayer.lineJoin = CAShapeLayerLineJoin.round;
+        indicatorLayer.lineCap = CAShapeLayerLineCap.round;
         layer.addSublayer(indicatorLayer)
         updateIndicatorLayerPath()
     }