Merge pull request #2 from EFPrefix/ef

0.9.3
EFPrefix · Oct 6, 2019 · 7d18be9 · 7d18be9
2 parents c4f5644 + c619f32
commit 7d18be9
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 -----
 
+## [0.9.3](https://github.com/EFPrefix/EFFoundation/releases/tag/0.9.3) (2019-10-06)
+
+- Use canImport instead of platform.
+
+---
+
+## [0.9.2](https://github.com/EFPrefix/EFFoundation/releases/tag/0.9.2) (2019-09-28)
+
+- Fix.
+
+---
+
 ## [0.9.1](https://github.com/EFPrefix/EFFoundation/releases/tag/0.9.1) (2019-09-28)
 
 - Add support for the new September 2019 devices.

diff --git a/EFFoundation.podspec b/EFFoundation.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'EFFoundation'
-  s.version          = '0.9.2'
+  s.version          = '0.9.3'
   s.summary          = 'EFFoundation.'
 
   s.description      = <<-DESC

diff --git a/EFFoundation/Core/CGColor+.swift b/EFFoundation/Core/CGColor+.swift
@@ -7,23 +7,23 @@
 
 import CoreGraphics
 
-#if os(iOS) || os(tvOS) || os(macOS)
+#if canImport(CoreImage)
 import CoreImage
 #endif
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 #endif
 
 public extension CGColor {
 
-    #if os(iOS) || os(tvOS) || os(macOS)
+    #if canImport(CoreImage)
     var ciColor: CIColor {
         return CIColor(cgColor: self)
     }
     #endif
 
-    #if os(iOS) || os(tvOS) || os(watchOS)
+    #if canImport(UIKit)
     var uiColor: UIColor {
         return UIColor(cgColor: self)
     }

diff --git a/EFFoundation/Core/CGFloat+.swift b/EFFoundation/Core/CGFloat+.swift
@@ -6,6 +6,7 @@
 //
 
 import CoreGraphics
+
 #if os(iOS)
 import UIKit
 #endif

diff --git a/EFFoundation/Core/CGImage.swift b/EFFoundation/Core/CGImage.swift
@@ -7,23 +7,23 @@
 
 import CoreGraphics
 
-#if os(iOS) || os(tvOS) || os(macOS)
+#if canImport(CoreImage)
 import CoreImage
 #endif
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 #endif
 
 public extension CGImage {
 
-    #if os(iOS) || os(tvOS) || os(macOS)
+    #if canImport(CoreImage)
     func ciImage() -> CIImage {
         return CIImage(cgImage: self)
     }
     #endif
 
-    #if os(iOS) || os(tvOS) || os(watchOS)
+    #if canImport(UIKit)
     func uiImage() -> UIImage {
         return UIImage(cgImage: self)
     }

diff --git a/EFFoundation/Core/CIColor+.swift b/EFFoundation/Core/CIColor+.swift
@@ -5,10 +5,10 @@
 //  Created by EyreFree on 2019/8/28.
 //
 
-#if os(iOS) || os(tvOS) || os(macOS)
+#if canImport(CoreImage)
 import CoreImage
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 #endif
 
@@ -18,7 +18,7 @@ public extension CIColor {
         return CGColor(colorSpace: colorSpace, components: components)
     }
 
-    #if os(iOS) || os(tvOS) || os(watchOS)
+    #if canImport(UIKit)
     var uiColor: UIColor {
         return UIColor(ciColor: self)
     }

diff --git a/EFFoundation/Core/CIImage+.swift b/EFFoundation/Core/CIImage+.swift
@@ -5,37 +5,25 @@
 //  Created by EyreFree on 2019/8/28.
 //
 
-#if os(iOS) || os(tvOS) || os(macOS)
+#if canImport(CoreImage)
 import CoreImage
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 #endif
 
 public extension CIImage {
 
     func cgImage() -> CGImage? {
-        #if os(iOS)
-        if #available(iOS 10, *) {
+        if #available(iOS 10, macOS 10.12, tvOS 10, watchOS 2, *) {
             if let cgImage = cgImage {
                 return cgImage
             }
         }
-        #elseif os(tvOS)
-        if #available(tvOS 10, *) {
-            if let cgImage = cgImage {
-                return cgImage
-            }
-        }
-        #elseif os(watchOS)
-        if let cgImage = cgImage {
-            return cgImage
-        }
-        #endif
         return CIContext().createCGImage(self, from: extent)
     }
 
-    #if os(iOS) || os(tvOS) || os(watchOS)
+    #if canImport(UIKit)
     func uiImage() -> UIImage {
         return UIImage(ciImage: self)
     }

diff --git a/EFFoundation/Core/UIColor+.swift b/EFFoundation/Core/UIColor+.swift
@@ -5,7 +5,7 @@
 //  Created by EyreFree on 2019/8/15.
 //
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 import CoreGraphics
 

diff --git a/EFFoundation/Core/UIFont+.swift b/EFFoundation/Core/UIFont+.swift
@@ -5,7 +5,7 @@
 //  Created by EyreFree on 2019/8/15.
 //
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 import CoreGraphics
 

diff --git a/EFFoundation/Core/UIImage+.swift b/EFFoundation/Core/UIImage+.swift
@@ -5,12 +5,15 @@
 //  Created by EyreFree on 2019/8/15.
 //
 
-#if os(iOS)
+
 import CoreGraphics
-import CoreImage
+import ImageIO
 
+#if canImport(UIKit)
 import UIKit
-import ImageIO
+
+#if canImport(CoreImage)
+import CoreImage
 
 public extension UIImage {
 
@@ -22,7 +25,9 @@ public extension UIImage {
         return cgImage ?? ciImage()?.cgImage()
     }
 }
+#endif
 
+#if os(iOS)
 public extension UIImage {
 
     static let appIcon: UIImage? = {
@@ -243,3 +248,4 @@ public extension UIImage {
     }
 }
 #endif
+#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     //
     import CoreGraphics
     #if os(iOS)
     import UIKit
     #endif
@@ Expand Down @@