Update AttributedText dependency and fix macCatalyst builds

gonzalezreal · gonzalezreal · commit f8ccb6f9e921 · 2021-01-08T12:24:17.000+01:00
diff --git a/Examples/MarkdownUIDemo/MarkdownUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/MarkdownUIDemo/MarkdownUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ test:
 	xcodebuild test \
 			-scheme MarkdownUI-Package \
 			-destination '$(DESTINATION_MAC)'
-	xcodebuild \
+	xcodebuild test \
 			-scheme MarkdownUI-Package \
 			-destination '$(DESTINATION_CATALYST)'
 	xcodebuild test \
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -34,7 +34,7 @@ let package = Package(
         .package(
             name: "AttributedText",
             url: "https://github.com/gonzalezreal/AttributedText",
-            from: "0.2.0"
+            from: "0.2.1"
         ),
         .package(
             name: "NetworkImage",
diff --git a/Sources/MarkdownUI/Shared/Markdown+Environment.swift b/Sources/MarkdownUI/Shared/Markdown+Environment.swift
@@ -1,4 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
 
     import SwiftUI
 
diff --git a/Sources/MarkdownUI/Shared/Markdown.swift b/Sources/MarkdownUI/Shared/Markdown.swift
@@ -1,4 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
 
     import AttributedText
     import CommonMark
diff --git a/Sources/MarkdownUI/Shared/MarkdownStore.swift b/Sources/MarkdownUI/Shared/MarkdownStore.swift
@@ -1,4 +1,4 @@
-#if canImport(Combine) && !os(watchOS)
+#if canImport(Combine) && !os(watchOS) && !targetEnvironment(macCatalyst)
 
     import Combine
     import CommonMark
diff --git a/Tests/MarkdownUITests/MarkdownTests.swift b/Tests/MarkdownUITests/MarkdownTests.swift
@@ -1,4 +1,4 @@
-#if canImport(SwiftUI) && !os(macOS)
+#if canImport(SwiftUI) && !os(macOS) && !targetEnvironment(macCatalyst)
 
     import SnapshotTesting
     import SwiftUI

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if canImport(SwiftUI) && !os(watchOS)`
	`1`	`+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)`
`2`	`2`
`3`	`3`	`import SwiftUI`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if canImport(Combine) && !os(watchOS)`
	`1`	`+#if canImport(Combine) && !os(watchOS) && !targetEnvironment(macCatalyst)`
`2`	`2`
`3`	`3`	`import Combine`
`4`	`4`	`import CommonMark`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if canImport(SwiftUI) && !os(macOS)`
	`1`	`+#if canImport(SwiftUI) && !os(macOS) && !targetEnvironment(macCatalyst)`
`2`	`2`
`3`	`3`	`import SnapshotTesting`
`4`	`4`	`import SwiftUI`