From 4c5b184976f4888b5f39fd179039a950a888cb09 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 26 Oct 2019 14:19:35 -0400 Subject: [PATCH 1/3] Bump deployment target to 10.15 for Mac --- xcconfig/NetNewsWire_project.xcconfig | 2 +- xcconfig/common/NetNewsWire_mac_target_common.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xcconfig/NetNewsWire_project.xcconfig b/xcconfig/NetNewsWire_project.xcconfig index e093d1156..7450fcc47 100644 --- a/xcconfig/NetNewsWire_project.xcconfig +++ b/xcconfig/NetNewsWire_project.xcconfig @@ -39,7 +39,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE GCC_WARN_UNUSED_FUNCTION = YES GCC_WARN_UNUSED_VARIABLE = YES -MACOSX_DEPLOYMENT_TARGET = 10.14.4 +MACOSX_DEPLOYMENT_TARGET = 10.15 IPHONEOS_DEPLOYMENT_TARGET = 13.0 //SDKROOT = macosx SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig index 081ef96e7..74c6e10e2 100644 --- a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig @@ -5,4 +5,4 @@ CURRENT_PROJECT_VERSION = 2612 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon COMBINE_HIDPI_IMAGES = YES -MACOSX_DEPLOYMENT_TARGET = 10.14.4 +MACOSX_DEPLOYMENT_TARGET = 10.15 From 1fd55ab846eeee69db078b5f41c9ade9d4125e93 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 26 Oct 2019 14:21:00 -0400 Subject: [PATCH 2/3] Remove an unused outlet for enableWebInspectorMenuItem --- Mac/Base.lproj/Main.storyboard | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard index ba4a9a4de..a077b7153 100644 --- a/Mac/Base.lproj/Main.storyboard +++ b/Mac/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -606,7 +605,6 @@ - From 2903e4507b85614bbc6a7f4100cc734557dcdc6a Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 26 Oct 2019 14:23:44 -0400 Subject: [PATCH 3/3] Remove references to WebKit preferences that are not pertinent in 10.15. --- Mac/MainWindow/Detail/DetailWebViewController.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift index 9f2c08b12..4ebf7a697 100644 --- a/Mac/MainWindow/Detail/DetailWebViewController.swift +++ b/Mac/MainWindow/Detail/DetailWebViewController.swift @@ -61,9 +61,7 @@ final class DetailWebViewController: NSViewController, WKUIDelegate { let preferences = WKPreferences() preferences.minimumFontSize = 12.0 preferences.javaScriptCanOpenWindowsAutomatically = false - preferences.javaEnabled = false preferences.javaScriptEnabled = true - preferences.plugInsEnabled = false let configuration = WKWebViewConfiguration() configuration.preferences = preferences