added tvOS 13 support; fixed mac catalyst support; fixed weird observable object related crash on macOS

Author: Christian Elies

Package.swift

@@ -7,7 +7,8 @@ let package = Package(
     name: "RemoteImage",
     platforms: [
         .iOS(.v13),
-        .macOS(.v10_15)
+        .macOS(.v10_15),
+        .tvOS(.v13)
     ],
     products: [
         .library(

Sources/RemoteImage/private/Models/RemoteImageState.swift

@@ -6,11 +6,11 @@
 //  Copyright © 2019 Christian Elies. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 enum RemoteImageState {
     case error(_ error: Error)
-    case image(_ image: UIImage)
+    case image(_ image: RemoteImageType)
     case loading
 }
 

Sources/RemoteImage/public/Models/RemoteImageType.swift

@@ -0,0 +1,19 @@
+//
+//  RemoteImageType.swift
+//  
+//
+//  Created by Christian Elies on 08.09.19.
+//
+
+import Foundation
+
+#if canImport(UIKit) && !targetEnvironment(macCatalyst)
+import UIKit
+public typealias RemoteImageType = UIImage
+#elseif targetEnvironment(macCatalyst)
+import AppKit
+public typealias RemoteImageType = NSImage
+#else
+import AppKit
+public typealias RemoteImageType = NSImage
+#endif

Sources/RemoteImage/public/Services/RemoteImageService.swift

@@ -7,9 +7,9 @@
 //
 
 import Combine
-import UIKit
+import Foundation
 
-public final class RemoteImageService: ObservableObject {
+public final class RemoteImageService: NSObject, ObservableObject {
     private var cancellable: AnyCancellable?
 
     var state: RemoteImageState = .loading {
@@ -18,7 +18,7 @@ public final class RemoteImageService: ObservableObject {
         }
     }
 
-    public static let cache = NSCache<NSURL, UIImage>()
+    public static let cache = NSCache<NSURL, RemoteImageType>()
 
     public let objectWillChange = PassthroughSubject<Void, Never>()
 
@@ -34,7 +34,7 @@ public final class RemoteImageService: ObservableObject {
         let urlRequest = URLRequest(url: url)
 
         cancellable = urlSession.dataTaskPublisher(for: urlRequest)
-            .map { UIImage(data: $0.data) }
+            .map { RemoteImageType(data: $0.data) }
             .receive(on: RunLoop.main)
             .sink(receiveCompletion: { completion in
                 switch completion {

Sources/RemoteImage/public/Views/RemoteImage.swift

@@ -23,9 +23,19 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
                     errorView(error)
                 )
             case .image(let image):
-                return AnyView(
-                    self.imageView(Image(uiImage: image))
-                )
+                #if canImport(UIKit) && !targetEnvironment(macCatalyst)
+                    return AnyView(
+                        self.imageView(Image(uiImage: image))
+                    )
+                #elseif targetEnvironment(macCatalyst)
+                    return AnyView(
+                        self.imageView(Image(nsImage: image))
+                    )
+                #else
+                    return AnyView(
+                        Text("Cannot render image: unsupported platform")
+                    )
+                #endif
             case .loading:
                 return AnyView(
                     loadingView()