Set platform requirements

gonzalezreal · Aug 29, 2021 · 29d9471 · 29d9471
1 parent 890d634
commit 29d9471
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 33 deletions.
diff --git a/MarkdownUI.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MarkdownUI.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/gonzalezreal/AttributedText",
         "state": {
           "branch": null,
-          "revision": "bf076de48dbb2172525486936d512e1bba062642",
-          "version": "0.3.0"
+          "revision": "c345033e22d5a1cd0e9fe0ec405cc809a8349586",
+          "version": "0.3.1"
         }
       },
       {
         "package": "combine-schedulers",
         "repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
         "state": {
           "branch": null,
-          "revision": "c37e5ae8012fb654af776cc556ff8ae64398c841",
-          "version": "0.5.0"
+          "revision": "6bde3b0063ba8e7537b43744948535ca7e9e0dad",
+          "version": "0.5.2"
         }
       },
       {
         "package": "NetworkImage",
         "repositoryURL": "https://github.com/gonzalezreal/NetworkImage",
         "state": {
           "branch": null,
-          "revision": "d7b018eadd0bbb3b9057cfb5245f26e741855ac6",
-          "version": "3.1.0"
+          "revision": "d45f014daf5c54ef73a7d8db87ac94b9bd3d31bd",
+          "version": "3.1.1"
         }
       },
       {
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "603974e3909ad4b48ba04aad7e0ceee4f077a518",
-          "version": "0.1.0"
+          "revision": "50a70a9d3583fe228ce672e8923010c8df2deddd",
+          "version": "0.2.1"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -5,10 +5,10 @@ import PackageDescription
 let package = Package(
     name: "MarkdownUI",
     platforms: [
-        .macOS(.v10_12),
-        .iOS(.v11),
-        .tvOS(.v11),
-        .watchOS(.v3),
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v6),
     ],
     products: [
         .library(
@@ -25,18 +25,18 @@ let package = Package(
         .package(
             name: "AttributedText",
             url: "https://github.com/gonzalezreal/AttributedText",
-            from: "0.3.0"
+            from: "0.3.1"
         ),
         .package(
             name: "NetworkImage",
             url: "https://github.com/gonzalezreal/NetworkImage",
-            from: "3.1.0"
+            from: "3.1.1"
         ),
-        .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.1.2"),
+        .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.5.2"),
         .package(
             name: "SnapshotTesting",
             url: "https://github.com/pointfreeco/swift-snapshot-testing",
-            from: "1.8.2"
+            from: "1.9.0"
         ),
     ],
     targets: [

diff --git a/Sources/MarkdownUI/AppKit/NSFont+Additions.swift b/Sources/MarkdownUI/AppKit/NSFont+Additions.swift
@@ -1,5 +1,4 @@
 #if os(macOS)
-
     import AppKit
 
     public extension NSFont {
@@ -76,5 +75,4 @@
             addingSymbolicTraits(.italic)
         }
     }
-
 #endif
diff --git a/Sources/MarkdownUI/Shared/ImageAttachment.swift b/Sources/MarkdownUI/Shared/ImageAttachment.swift
@@ -1,5 +1,4 @@
 #if !os(watchOS)
-
     #if os(macOS)
         import AppKit
     #elseif canImport(UIKit)
@@ -53,5 +52,4 @@
             }
         #endif
     }
-
 #endif
diff --git a/Sources/MarkdownUI/Shared/Markdown+Environment.swift b/Sources/MarkdownUI/Shared/Markdown+Environment.swift
@@ -1,5 +1,4 @@
 #if canImport(SwiftUI) && !os(watchOS)
-
     import CombineSchedulers
     import SwiftUI
 
@@ -50,5 +49,4 @@
     private struct MarkdownSchedulerKey: EnvironmentKey {
         static let defaultValue: AnySchedulerOf<DispatchQueue> = .main
     }
-
 #endif
diff --git a/Sources/MarkdownUI/Shared/Markdown.swift b/Sources/MarkdownUI/Shared/Markdown.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
-
+#if !os(watchOS)
     import AttributedText
     import CommonMark
     import NetworkImage
@@ -122,5 +121,4 @@
             }
         }
     }
-
 #endif
diff --git a/Sources/MarkdownUI/Shared/MarkdownStore.swift b/Sources/MarkdownUI/Shared/MarkdownStore.swift
@@ -1,5 +1,4 @@
-#if canImport(Combine) && !os(watchOS)
-
+#if !os(watchOS)
     import Combine
     import CombineSchedulers
     import CommonMark
@@ -113,5 +112,4 @@
                 .eraseToAnyPublisher()
         }
     }
-
 #endif
diff --git a/Sources/MarkdownUI/UIKit/UIFont+Additions.swift b/Sources/MarkdownUI/UIKit/UIFont+Additions.swift
@@ -1,5 +1,4 @@
 #if canImport(UIKit)
-
     import UIKit
 
     public extension UIFont {
@@ -90,5 +89,4 @@
             addingSymbolicTraits(.traitItalic)
         }
     }
-
 #endif
diff --git a/Tests/MarkdownUITests/MarkdownTests.swift b/Tests/MarkdownUITests/MarkdownTests.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(macOS) && !targetEnvironment(macCatalyst)
-
+#if !os(macOS) && !targetEnvironment(macCatalyst)
     import Combine
     import SnapshotTesting
     import SwiftUI
@@ -355,5 +354,4 @@
             assertSnapshot(matching: view, as: .image(layout: layout), named: platformName)
         }
     }
-
 #endif