Set platform requirements and bump dependencies

gonzalezreal · Aug 29, 2021 · 66abfa9 · 66abfa9
1 parent bf076de
commit 66abfa9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 24 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing",
         "state": {
           "branch": null,
-          "revision": "c466812aa2e22898f27557e2e780d3aad7a27203",
-          "version": "1.8.2"
+          "revision": "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
+          "version": "1.9.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -6,9 +6,9 @@ import PackageDescription
 let package = Package(
     name: "AttributedText",
     platforms: [
-        .macOS(.v10_12),
-        .iOS(.v11),
-        .tvOS(.v11),
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
     ],
     products: [
         .library(
@@ -20,7 +20,7 @@ let package = Package(
         .package(
             name: "SnapshotTesting",
             url: "https://github.com/pointfreeco/swift-snapshot-testing",
-            from: "1.8.2"
+            from: "1.9.0"
         ),
     ],
     targets: [

diff --git a/Sources/AttributedText/AttributedText.swift b/Sources/AttributedText/AttributedText.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
-
+#if !os(watchOS)
     import SwiftUI
 
     @available(macOS 11.0, iOS 14.0, tvOS 14.0, *)
@@ -34,5 +33,4 @@
             size.width - safeAreaInsets.leading - safeAreaInsets.trailing
         }
     }
-
 #endif
diff --git a/Sources/AttributedText/NSLineBreakMode+TruncationMode.swift b/Sources/AttributedText/NSLineBreakMode+TruncationMode.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
-
+#if !os(watchOS)
     import SwiftUI
 
     extension NSLineBreakMode {
@@ -17,5 +16,4 @@
             }
         }
     }
-
 #endif
diff --git a/Sources/AttributedText/TextViewStore.swift b/Sources/AttributedText/TextViewStore.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
-
+#if !os(watchOS)
     import SwiftUI
 
     @available(macOS 11.0, iOS 14.0, tvOS 14.0, *)
@@ -10,5 +9,4 @@
             intrinsicContentSize = textView.intrinsicContentSize
         }
     }
-
 #endif
diff --git a/Sources/AttributedText/TextViewWrapper+NSTextView.swift b/Sources/AttributedText/TextViewWrapper+NSTextView.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && os(macOS)
-
+#if os(macOS)
     import SwiftUI
 
     @available(macOS 11.0, *)
@@ -75,5 +74,4 @@
             Coordinator()
         }
     }
-
 #endif
diff --git a/Sources/AttributedText/TextViewWrapper+UITextView.swift b/Sources/AttributedText/TextViewWrapper+UITextView.swift
@@ -1,5 +1,4 @@
 #if canImport(UIKit) && !os(watchOS)
-
     import SwiftUI
 
     @available(iOS 14.0, tvOS 14.0, macCatalyst 14.0, *)
@@ -59,13 +58,11 @@
             uiView.textContainer.lineBreakMode = NSLineBreakMode(truncationMode: context.environment.truncationMode)
 
             context.coordinator.openURL = context.environment.openURL
-
             textViewStore.didUpdateTextView(uiView)
         }
 
         func makeCoordinator() -> Coordinator {
             Coordinator()
         }
     }
-
 #endif
diff --git a/Tests/AttributedTextTests/AttributedTextTests.swift b/Tests/AttributedTextTests/AttributedTextTests.swift
@@ -1,5 +1,4 @@
-#if canImport(SwiftUI) && !os(macOS) && !targetEnvironment(macCatalyst)
-
+#if !os(macOS) && !targetEnvironment(macCatalyst)
     import SnapshotTesting
     import SwiftUI
     import XCTest
@@ -55,5 +54,4 @@
         result.addAttributes([.font: UIFont.preferredFont(forTextStyle: .body)], range: NSRange(location: 33, length: 192))
         return result
     }
-
 #endif