NativeMarkText doesn't build on armv7 [#3] (#4)

* NativeMarkText doesn't build on armv7 [#3] # Problem As reported in #3, the NativeMarkText+UIKit doesn't build for device. Investigation showed that was because the enclosing projects were trying to build armv7 and SwiftUI doesn't include an armv7 binary. Therefore, it appeared like SwiftUI wasn't defined and compiling the file failed with undefined symbols. # Solution As a workaround, only build the NativeMarkText+UIKit.swift file for armv64 and x86_64. It is a bit fragile in that if new architectures appear, they'll have to be manually added. * Updating unrelated snapshot tests that changed when Github CI updated OS version
andyfinnell · Jan 6, 2021 · e8ef002 · e8ef002
1 parent c86db98
commit e8ef002
Show file tree

Hide file tree

Showing 27 changed files with 1 addition and 1 deletion.
diff --git a/Sources/NativeMarkKit/render/NativeMarkText+UIKit.swift b/Sources/NativeMarkKit/render/NativeMarkText+UIKit.swift
@@ -1,5 +1,5 @@
 import Foundation
-#if canImport(UIKit) && canImport(SwiftUI)
+#if canImport(UIKit) && canImport(SwiftUI) && (arch(arm64) || arch(x86_64))
 import UIKit
 import SwiftUI
 

diff --git a/Tests/NativeMarkKitTests/Fixtures/BlockQuotes.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/BlockQuotes.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/Codes.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/Codes.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocNoWrapping.iOS.png b/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocNoWrapping.iOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocNoWrapping.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocNoWrapping.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocWrapping.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/Draw_BasicDocWrapping.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/HeadingsAndParagraphs.iOS.png b/Tests/NativeMarkKitTests/Fixtures/HeadingsAndParagraphs.iOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/HeadingsAndParagraphs.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/HeadingsAndParagraphs.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/HorizontalRules.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/HorizontalRules.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/ImagesAndLinks.iOS.png b/Tests/NativeMarkKitTests/Fixtures/ImagesAndLinks.iOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/ImagesAndLinks.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/ImagesAndLinks.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LineHeight.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LineHeight.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LineSpacing.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LineSpacing.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LooseOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LooseOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LowercaseAlphaOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LowercaseAlphaOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LowercaseHexadecimalOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LowercaseHexadecimalOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/LowercaseRomanOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/LowercaseRomanOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/OctalOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/OctalOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/ParagraphIndents.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/ParagraphIndents.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/Paragraphs.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/Paragraphs.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/RightAlignment.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/RightAlignment.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/TextStyles2.iOS.png b/Tests/NativeMarkKitTests/Fixtures/TextStyles2.iOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/TextStyles2.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/TextStyles2.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/TightOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/TightOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/UppercaseAlphaOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/UppercaseAlphaOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/UppercaseHexadecimalOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/UppercaseHexadecimalOrderedList.tvOS.png
diff --git a/Tests/NativeMarkKitTests/Fixtures/UppercaseRomanOrderedList.tvOS.png b/Tests/NativeMarkKitTests/Fixtures/UppercaseRomanOrderedList.tvOS.png