Merge pull request #17 from Dimillian/main

Add VisionOS support
divadretlaw · Dec 7, 2023 · bb1fd02 · bb1fd02
2 parents 13f8ce5 + ef6fdb5
commit bb1fd02
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 11 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,7 +9,7 @@ let package = Package(
         .iOS(.v15),
         .macOS(.v12),
         .tvOS(.v15),
-        .watchOS(.v8)
+        .visionOS(.v1),
     ],
     products: [
         .library(

diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift
@@ -0,0 +1,30 @@
+// swift-tools-version: 5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "EmojiText",
+    platforms: [
+        .iOS(.v15),
+        .macOS(.v12),
+        .tvOS(.v15)
+    ],
+    products: [
+        .library(
+            name: "EmojiText",
+            targets: ["EmojiText"]
+        )
+    ],
+    dependencies: [
+         .package(url: "https://github.com/kean/Nuke", from: "12.0.0")
+    ],
+    targets: [
+        .target(
+            name: "EmojiText",
+            dependencies: [
+                .product(name: "Nuke", package: "Nuke")
+            ]
+        )
+    ]
+)
diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift
@@ -0,0 +1,30 @@
+// swift-tools-version: 5.8
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "EmojiText",
+    platforms: [
+        .iOS(.v15),
+        .macOS(.v12),
+        .tvOS(.v15)
+    ],
+    products: [
+        .library(
+            name: "EmojiText",
+            targets: ["EmojiText"]
+        )
+    ],
+    dependencies: [
+         .package(url: "https://github.com/kean/Nuke", from: "12.0.0")
+    ],
+    targets: [
+        .target(
+            name: "EmojiText",
+            dependencies: [
+                .product(name: "Nuke", package: "Nuke")
+            ]
+        )
+    ]
+)
diff --git a/Sources/EmojiText/CADisplayLinkPublisher.swift b/Sources/EmojiText/CADisplayLinkPublisher.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(visionOS)
 extension CADisplayLink {
     @MainActor
     struct CADisplayLinkPublisher {

diff --git a/Sources/EmojiText/EmojiText.swift b/Sources/EmojiText/EmojiText.swift
@@ -77,7 +77,7 @@ public struct EmojiText: View {
 
                 guard shouldAnimateIfNeeded, needsAnimation else { return }
 
-                #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS)
+                #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(visionOS)
                 for await event in CADisplayLink.publish(mode: .common, stopOnLowPowerMode: emojiAnimatedMode.disabledOnLowPower).values {
                     renderTime = event.targetTimestamp
                 }

diff --git a/Sources/EmojiText/Extensions/Font+Extensions.swift b/Sources/EmojiText/Extensions/Font+Extensions.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(visionOS)
 import UIKit
 
 extension UIFont {

diff --git a/Sources/EmojiText/Extensions/Image+Extensions.swift b/Sources/EmojiText/Extensions/Image+Extensions.swift
@@ -10,15 +10,15 @@ import ImageIO
 
 extension Image {
     init(emojiImage: EmojiImage) {
-        #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS)
+        #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS) || os(visionOS)
         self.init(uiImage: emojiImage)
         #else
         self.init(nsImage: emojiImage)
         #endif
     }
 }
 
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS) || os(visionOS)
 import UIKit
 
 extension UIImage {

diff --git a/Sources/EmojiText/Extensions/UIContentSizeCategory+Extensions.swift b/Sources/EmojiText/Extensions/UIContentSizeCategory+Extensions.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(visionOS)
 import UIKit
 
 extension UIContentSizeCategory {

diff --git a/Sources/EmojiText/RenderedImage.swift b/Sources/EmojiText/RenderedImage.swift
@@ -16,7 +16,7 @@ struct RenderedImage: Hashable, Equatable {
     init(image: EmojiImage, animated: Bool, targetHeight: CGFloat) {
         self.systemName = nil
         self.platformImage = image.scalePreservingAspectRatio(targetHeight: targetHeight)
-        #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS)
+        #if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS) || os(visionOS)
         if animated {
             self.animationImages = image.images?.map { $0.scalePreservingAspectRatio(targetHeight: targetHeight) }
         } else {

diff --git a/Sources/EmojiText/Typealiases.swift b/Sources/EmojiText/Typealiases.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(watchOS) || os(visionOS)
 import UIKit
 
 /// Platform indepdendent image alias. Will be `UIImage`.

diff --git a/Test/Tests/Snapshotting+Extensions.swift b/Test/Tests/Snapshotting+Extensions.swift
@@ -10,7 +10,7 @@ import SnapshotTesting
 import SwiftUI
 import GraphicsRenderer
 
-#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS)
+#if os(iOS) || targetEnvironment(macCatalyst) || os(tvOS) || os(visionOS)
 extension Snapshotting where Value: View, Format == UIImage {
     static func rendered(size: CGSize, delay: UInt64 = 0) -> Snapshotting {
         SimplySnapshotting