From 8e22c711bf0d4fb4d209ff9fdd452cc52b6472a7 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 3 Aug 2020 10:14:45 -0500 Subject: [PATCH] Remove SWIFTUI compiler directive now that Xcode 12 is required for work on main --- Shared/Article Rendering/ArticleRenderer.swift | 6 ++---- xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig | 2 -- xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift index 9cce8f8b4..9d3c1c3ab 100644 --- a/Shared/Article Rendering/ArticleRenderer.swift +++ b/Shared/Article Rendering/ArticleRenderer.swift @@ -266,10 +266,8 @@ private extension ArticleRenderer { func styleSubstitutions() -> [String: String] { var d = [String: String]() - #if SWIFTUI - let bodyFont = NSFont.preferredFont(forTextStyle: .body) - d["font-size"] = String(describing: Int(round(bodyFont.pointSize * 1.33))) - #endif + let bodyFont = NSFont.preferredFont(forTextStyle: .body) + d["font-size"] = String(describing: Int(round(bodyFont.pointSize * 1.33))) guard let linkColor = NSColor.controlAccentColor.usingColorSpace(.deviceRGB) else { return d diff --git a/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig index 662cad2c7..0880a7223 100644 --- a/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig @@ -46,5 +46,3 @@ PRODUCT_NAME = NetNewsWire IPHONEOS_DEPLOYMENT_TARGET = 14.0 SWIFT_SWIFT3_OBJC_INFERENCE = Off SWIFT_VERSION = 5.3 - -OTHER_SWIFT_FLAGS = -DSWIFTUI $(inherited) diff --git a/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig b/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig index b664f729a..8f1fc3a62 100644 --- a/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig @@ -44,5 +44,3 @@ PRODUCT_NAME = NetNewsWire MACOSX_DEPLOYMENT_TARGET = 10.16 SWIFT_SWIFT3_OBJC_INFERENCE = Off SWIFT_VERSION = 5.3 - -OTHER_SWIFT_FLAGS = -DSWIFTUI $(inherited)