fixed conditional directives for mac catalyst

Christian Elies · Christian Elies · commit a7d8b852f850 · 2019-09-08T21:33:23.000+02:00
diff --git a/Sources/RemoteImage/public/Models/RemoteImageType.swift b/Sources/RemoteImage/public/Models/RemoteImageType.swift
@@ -7,13 +7,10 @@
 
 import Foundation
 
-#if canImport(UIKit) && !targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 public typealias RemoteImageType = UIImage
-#elseif targetEnvironment(macCatalyst)
-import AppKit
-public typealias RemoteImageType = NSImage
-#else
+#elseif os(macOS)
 import AppKit
 public typealias RemoteImageType = NSImage
 #endif
diff --git a/Sources/RemoteImage/public/Views/RemoteImage.swift b/Sources/RemoteImage/public/Views/RemoteImage.swift
@@ -23,11 +23,11 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
                     errorView(error)
                 )
             case .image(let image):
-                #if canImport(UIKit) && !targetEnvironment(macCatalyst)
+                #if canImport(UIKit)
                     return AnyView(
                         self.imageView(Image(uiImage: image))
                     )
-                #elseif targetEnvironment(macCatalyst)
+                #elseif os(macOS)
                     return AnyView(
                         self.imageView(Image(nsImage: image))
                     )

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:`
`23`	`23`	`errorView(error)`
`24`	`24`	`)`
`25`	`25`	`case .image(let image):`
`26`		`- #if canImport(UIKit) && !targetEnvironment(macCatalyst)`
	`26`	`+ #if canImport(UIKit)`
`27`	`27`	`return AnyView(`
`28`	`28`	`self.imageView(Image(uiImage: image))`
`29`	`29`	`)`
`30`		`- #elseif targetEnvironment(macCatalyst)`
	`30`	`+ #elseif os(macOS)`
`31`	`31`	`return AnyView(`
`32`	`32`	`self.imageView(Image(nsImage: image))`
`33`	`33`	`)`