chore: update swift 5

Extension.xcodeproj/project.pbxproj

@@ -19,7 +19,6 @@
 		CE0F0CE822C8B17300F72849 /* NSAttributedString+Content.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0C9E22C8B17200F72849 /* NSAttributedString+Content.swift */; };
 		CE0F0CEB22C8B17300F72849 /* Array+UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0C9F22C8B17200F72849 /* Array+UIImage.swift */; };
 		CE0F0CEE22C8B17300F72849 /* UINavigationController+Autorotate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0CA022C8B17200F72849 /* UINavigationController+Autorotate.swift */; };
-		CE0F0CF122C8B17300F72849 /* UIWebView+JavaScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0CA122C8B17200F72849 /* UIWebView+JavaScript.swift */; };
 		CE0F0CF422C8B17300F72849 /* Image+pdf.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0CA222C8B17200F72849 /* Image+pdf.swift */; };
 		CE0F0CF722C8B17300F72849 /* Image+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0CA322C8B17200F72849 /* Image+CoreGraphics.swift */; };
 		CE0F0CFA22C8B17300F72849 /* Image+Process.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F0CA422C8B17200F72849 /* Image+Process.swift */; };
@@ -84,7 +83,6 @@
 		CE0F0C9E22C8B17200F72849 /* NSAttributedString+Content.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+Content.swift"; sourceTree = "<group>"; };
 		CE0F0C9F22C8B17200F72849 /* Array+UIImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+UIImage.swift"; sourceTree = "<group>"; };
 		CE0F0CA022C8B17200F72849 /* UINavigationController+Autorotate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Autorotate.swift"; sourceTree = "<group>"; };
-		CE0F0CA122C8B17200F72849 /* UIWebView+JavaScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWebView+JavaScript.swift"; sourceTree = "<group>"; };
 		CE0F0CA222C8B17200F72849 /* Image+pdf.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Image+pdf.swift"; sourceTree = "<group>"; };
 		CE0F0CA322C8B17200F72849 /* Image+CoreGraphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Image+CoreGraphics.swift"; sourceTree = "<group>"; };
 		CE0F0CA422C8B17200F72849 /* Image+Process.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Image+Process.swift"; sourceTree = "<group>"; };
@@ -189,7 +187,6 @@
 				CE940DDB22DD933D00BC38B5 /* UIFont+SymbolicTraits.swift */,
 				CE0F0CA022C8B17200F72849 /* UINavigationController+Autorotate.swift */,
 				CE0F0C9D22C8B17200F72849 /* UITableView+UIImage.swift */,
-				CE0F0CA122C8B17200F72849 /* UIWebView+JavaScript.swift */,
 			);
 			path = UIKit;
 			sourceTree = "<group>";
@@ -459,7 +456,6 @@
 				CE0F0D1E22C8B17300F72849 /* URL+Cookie.swift in Sources */,
 				CE0F0D4222C8B17300F72849 /* Color.swift in Sources */,
 				CE0F0D3922C8B17300F72849 /* Color+components.swift in Sources */,
-				CE0F0CF122C8B17300F72849 /* UIWebView+JavaScript.swift in Sources */,
 				CEBC590522ED46FC00FA3182 /* SCNetworkReachability+flags.swift in Sources */,
 				CE0F0D5D22C8B17300F72849 /* Swift+Association.swift in Sources */,
 				CE0F0D5A22C8B17300F72849 /* Swift+log.swift in Sources */,

Package.swift

@@ -17,6 +17,6 @@ let package = Package(
         .target(name: "Extension", path: "Sources")
     ],
     swiftLanguageVersions: [
-        .version("5.0.0")
+        .version("5")
     ]
 )

Sources/Common/Color/Color+components.swift

@@ -1,11 +1,9 @@
 //  Created by Songwen on 2018/11/7.
 //  Copyright © 2018 DingSoung. All rights reserved.
 
-#if canImport(CoreGraphics)
-import CoreGraphics
-#endif
+#if canImport(UIKit)
+import UIKit
 
-#if !os(Linux)
 extension Color {
     public struct FloatPath {
         var red: CGFloat

Sources/Common/Color/Color+css.swift

@@ -2,15 +2,9 @@
 //  Copyright © 2019 DingSoung. All rights reserved.
 //
 
-#if canImport(Foundation)
-import Foundation
-#endif
-
-#if canImport(CoreGraphics)
-import CoreGraphics
-#endif
+#if canImport(UIKit)
+import UIKit
 
-#if !os(Linux)
 extension Color {
     private static let map: [String: UInt] = [
         "black": 0x000000,
@@ -172,4 +166,5 @@ extension Color {
         }
     }
 }
+
 #endif

Sources/Common/Color/Color+hex.swift

@@ -1,15 +1,9 @@
 //  Created by Songwen on 2018/11/7.
 //  Copyright © 2018 DingSoung. All rights reserved.
 
-#if canImport(Foundation)
-import Foundation
-#endif
-
-#if canImport(CoreGraphics)
-import CoreGraphics
-#endif
+#if canImport(UIKit)
+import UIKit
 
-#if !os(Linux)
 extension Color {
     private static let association = Association<NSCache<NSString, Color>>()
     public class final var memoryCache: NSCache<NSString, Color> {

Sources/Common/Color/Color+rgba.swift

@@ -1,11 +1,9 @@
 //  Created by Songwen on 2018/11/7.
 //  Copyright © 2018 DingSoung. All rights reserved.
 
-#if canImport(CoreGraphics)
-import CoreGraphics
-#endif
+#if canImport(UIKit)
+import UIKit
 
-#if !os(Linux)
 extension Color {
     /// init color with RGBA Hex 0x00 ~ 0xFF
     public convenience init(red: UInt, green: UInt, blue: UInt, alpha: UInt) {

Sources/Common/Color/Color.swift

@@ -5,8 +5,3 @@
 import UIKit
 public typealias Color = UIColor
 #endif
-
-#if canImport(AppKit)
-import AppKit
-public typealias Color = NSColor
-#endif

Sources/Common/Image/Image.swift

@@ -8,11 +8,6 @@ import UIKit
 public typealias Image = UIImage
 #endif
 
-#if canImport(AppKit)
-import AppKit
-public typealias Image = NSImage
-#endif
-
 #if !os(watchOS)
 import CoreImage
 #endif

Sources/Common/View/View.swift

@@ -5,8 +5,3 @@
 import UIKit
 public typealias View = UIView
 #endif
-
-#if canImport(AppKit)
-import AppKit
-public typealias View = NSView
-#endif

Sources/Foundation/SCNetworkReachability/SCNetworkReachability+flags.swift

@@ -5,50 +5,15 @@
 import SystemConfiguration
 
 extension SCNetworkReachability {
-    private var flags: SCNetworkReachabilityFlags {
+    public var flags: SCNetworkReachabilityFlags {
         var networkReachabilityFlags: SCNetworkReachabilityFlags = []
         SCNetworkReachabilityGetFlags(self, &networkReachabilityFlags)
         return networkReachabilityFlags
     }
 
-    public var connectionRequired: Bool {
-        return flags.contains(.connectionRequired)
-    }
-
-    public var reachable: Bool {
-        return flags.contains(.reachable)
-    }
-
     public var isOnline: Bool {
-        let flags = self.flags
         return flags.contains(.reachable) && !flags.contains(.connectionRequired)
     }
-
-    public enum Status: Int {
-        case notReachable = 0
-        case reachableViaWiFi
-        case reachableViaWWAN
-    }
-
-    public var status: Status {
-        let flags = self.flags
-        guard flags.contains(.reachable) else {
-            return .notReachable
-        }
-        var ret: Status = .notReachable
-        if flags.contains(.connectionRequired) == false {
-            ret = .reachableViaWiFi
-        }
-        if flags.contains(.connectionOnDemand) || flags.contains(.connectionOnTraffic) {
-            if flags.contains(.interventionRequired) == false {
-                ret = .reachableViaWiFi
-            }
-        }
-        if flags.contains(SCNetworkReachabilityFlags.isWWAN) {
-            ret = .reachableViaWWAN
-        }
-        return ret
-    }
 }
 
 #endif