Add the Xcode project to support Carthage. Fix the build issue on macOS/tvOS/watchOS

Author: dreampiggy

.gitignore

@@ -23,8 +23,7 @@ DerivedData
 .bundle
 
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
 
 # We recommend against adding the Pods directory to your .gitignore. However

Cartfile

@@ -0,0 +1 @@
+github "SDWebImage/SDWebImage" ~> 5.1

Cartfile.resolved

@@ -0,0 +1 @@
+github "SDWebImage/SDWebImage" "5.1.0"

SDWebImageSwiftUI.xcodeproj/project.pbxproj

@@ -1,51 +1,83 @@
 //
-//  Image+WebCache.swift
-//  SDWebImageSwiftUIDemo
+//  AnimatedImage.swift
+//  SDWebImageSwiftUI
 //
-//  Created by lizhuoli on 2019/7/26.
+//  Created by lizhuoli on 2019/8/9.
 //  Copyright © 2019 lizhuoli. All rights reserved.
 //
 
 import SwiftUI
 import SDWebImage
 
-public struct AnimatedImage: UIViewRepresentable {
+#if !os(watchOS)
+
+public struct AnimatedImage: ViewRepresentable {
     var url: URL?
     var name: String?
     var bundle: Bundle?
     var data: Data?
     var scale: Length = 0
 
-    public init(url: URL, placeholder: Image? = nil, options: SDWebImageOptions = [], context: [SDWebImageContextOption : Any]? = nil) {
-        self.url = url
+    #if os(macOS)
+    public typealias NSViewType = SDAnimatedImageView
+    #else
+    public typealias UIViewType = SDAnimatedImageView
+    #endif
+    
+    #if os(macOS)
+    public func makeNSView(context: NSViewRepresentableContext<AnimatedImage>) -> SDAnimatedImageView {
+        makeView(context: context)
     }
 
-    public init(name: String, bundle: Bundle? = nil) {
-        self.name = name
-        self.bundle = bundle
+    public func updateNSView(_ nsView: SDAnimatedImageView, context: NSViewRepresentableContext<AnimatedImage>) {
+        updateView(nsView, context: context)
+    }
+    #else
+    public func makeUIView(context: UIViewRepresentableContext<AnimatedImage>) -> SDAnimatedImageView {
+        makeView(context: context)
     }
 
-    public init(data: Data, scale: Length = 0) {
-        self.data = data
-        self.scale = scale
+    public func updateUIView(_ uiView: SDAnimatedImageView, context: UIViewRepresentableContext<AnimatedImage>) {
+        updateView(uiView, context: context)
     }
+    #endif
 
-    public func makeUIView(context: UIViewRepresentableContext<AnimatedImage>) -> SDAnimatedImageView {
+    func makeView(context: ViewRepresentableContext<AnimatedImage>) -> SDAnimatedImageView {
         SDAnimatedImageView()
     }
 
-    public func updateUIView(_ uiView: SDAnimatedImageView, context: UIViewRepresentableContext<AnimatedImage>) {
+    func updateView(_ view: SDAnimatedImageView, context: ViewRepresentableContext<AnimatedImage>) {
         if let url = url {
-            uiView.sd_setImage(with: url)
+            view.sd_setImage(with: url)
             return
         }
         if let name = name {
-            uiView.image = SDAnimatedImage(named: name, in: bundle, compatibleWith: nil)
+            #if os(macOS)
+            view.image = SDAnimatedImage(named: name, in: bundle)
+            #else
+            view.image = SDAnimatedImage(named: name, in: bundle, compatibleWith: nil)
+            #endif
             return
         }
         if let data = data {
-            uiView.image = SDAnimatedImage(data: data, scale: scale)
+            view.image = SDAnimatedImage(data: data, scale: scale)
             return
         }
     }
+    
+    public init(url: URL, placeholder: Image? = nil, options: SDWebImageOptions = [], context: [SDWebImageContextOption : Any]? = nil) {
+        self.url = url
+    }
+    
+    public init(name: String, bundle: Bundle? = nil) {
+        self.name = name
+        self.bundle = bundle
+    }
+    
+    public init(data: Data, scale: Length = 0) {
+        self.data = data
+        self.scale = scale
+    }
 }
+
+#endif

SDWebImageSwiftUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,8 +1,9 @@
 //
 //  ImageManager.swift
-//  Pods-SDWebImageSwiftUIDemo
+//  SDWebImageSwiftUI
 //
-//  Created by lizhuoli on 2019/8/7.
+//  Created by lizhuoli on 2019/8/9.
+//  Copyright © 2019 lizhuoli. All rights reserved.
 //
 
 import SwiftUI
@@ -16,7 +17,7 @@ class ImageManager : BindableObject {
     private var manager = SDWebImageManager.shared
     private weak var currentOperation: SDWebImageOperation? = nil
 
-    var image: UIImage? {
+    var image: Image? {
         willSet {
             willChange.send(self)
         }
@@ -37,7 +38,13 @@ class ImageManager : BindableObject {
 
     func load() {
         currentOperation = manager.loadImage(with: url, options: options, context: context, progress: nil) { (image, data, error, cacheType, _, _) in
-            self.image = image
+            if let image = image {
+                #if os(macOS)
+                self.image = Image(nsImage: image)
+                #else
+                self.image = Image(uiImage: image)
+                #endif
+            }
         }
     }
 

SDWebImageSwiftUI/Classes/AnimatedImage.swift

@@ -0,0 +1,22 @@
+//
+//  SDWebImageSwiftUI.swift
+//  SDWebImageSwiftUI
+//
+//  Created by lizhuoli on 2019/8/9.
+//  Copyright © 2019 lizhuoli. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+
+#if !os(watchOS)
+
+#if os(macOS)
+typealias ViewRepresentable = NSViewRepresentable
+typealias ViewRepresentableContext = NSViewRepresentableContext
+#else
+typealias ViewRepresentable = UIViewRepresentable
+typealias ViewRepresentableContext = UIViewRepresentableContext
+#endif
+
+#endif

SDWebImageSwiftUI/Classes/ImageManager.swift

@@ -1,8 +1,8 @@
 //
 //  WebImage.swift
-//  SDWebImageSwiftUIDemo
+//  SDWebImageSwiftUI
 //
-//  Created by lizhuoli on 2019/7/26.
+//  Created by lizhuoli on 2019/8/9.
 //  Copyright © 2019 lizhuoli. All rights reserved.
 //
 
@@ -27,7 +27,7 @@ public struct WebImage : View {
 
     public var body: some View {
         if let image = imageManager.image {
-            return Image(uiImage: image)
+            return image
                 .resizable()
                 .onAppear {}
                 .onDisappear {}
@@ -37,7 +37,12 @@ public struct WebImage : View {
                     .onAppear { self.imageManager.load() }
                     .onDisappear { self.imageManager.cancel() }
         } else {
-            return Image(uiImage: UIImage())
+            #if os(macOS)
+            let emptyImage = Image(nsImage: NSImage())
+            #else
+            let emptyImage = Image(uiImage: UIImage())
+            #endif
+            return emptyImage
                 .resizable()
                 .onAppear { self.imageManager.load() }
                 .onDisappear { self.imageManager.cancel() }

SDWebImageSwiftUI/Classes/SDWebImageSwiftUI.swift

@@ -0,0 +1,22 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>