From 2cba6191bdc02e450637fb607d0e80a7edf60e7d Mon Sep 17 00:00:00 2001
From: Daniel Jalkut <jalkut@red-sweater.com>
Date: Mon, 21 Oct 2019 10:31:38 -0400
Subject: [PATCH] Cleaning up some loose ends.

---
 NetNewsWire copy-Info.plist                   | 69 -------------------
 Subscribe to Feed copy-Info.plist             | 64 -----------------
 .../NetNewsWire_mac_target_common.xcconfig    |  2 +-
 .../NetNewsWire_macapp_target_common.xcconfig |  2 +-
 4 files changed, 2 insertions(+), 135 deletions(-)
 delete mode 100644 NetNewsWire copy-Info.plist
 delete mode 100644 Subscribe to Feed copy-Info.plist

diff --git a/NetNewsWire copy-Info.plist b/NetNewsWire copy-Info.plist
deleted file mode 100644
index a9c54ee1d..000000000
--- a/NetNewsWire copy-Info.plist	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>CFBundleURLName</key>
-			<string>RSS Feed</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>feed</string>
-				<string>feeds</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.news</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>com.ranchero.NetNewsWire.ReadArticle</string>
-	</array>
-	<key>NSAppleEventsUsageDescription</key>
-	<string>NetNewsWire communicates with other apps on your Mac when you choose to share an article.</string>
-	<key>NSAppleScriptEnabled</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2002-2019 Brent Simmons. All rights reserved.</string>
-	<key>NSMainStoryboardFile</key>
-	<string>Main</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>OSAScriptingDefinition</key>
-	<string>NetNewsWire.sdef</string>
-	<key>SUFeedURL</key>
-	<string>https://ranchero.com/downloads/netnewswire-release.xml</string>
-	<key>FeedURLForTestBuilds</key>
-	<string>https://ranchero.com/downloads/netnewswire-beta.xml</string>
-	<key>UserAgent</key>
-	<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
-</dict>
-</plist>
diff --git a/Subscribe to Feed copy-Info.plist b/Subscribe to Feed copy-Info.plist
deleted file mode 100644
index 5f4fa8c03..000000000
--- a/Subscribe to Feed copy-Info.plist	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Subscribe to Feed</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.Safari.extension</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>$(PRODUCT_MODULE_NAME).SafariExtensionHandler</string>
-		<key>SFSafariContentScript</key>
-		<array>
-			<dict>
-				<key>Script</key>
-				<string>netnewswire-subscribe-to-feed.js</string>
-			</dict>
-		</array>
-		<key>SFSafariToolbarItem</key>
-		<dict>
-			<key>Action</key>
-			<string>Command</string>
-			<key>Identifier</key>
-			<string>Button</string>
-			<key>Image</key>
-			<string>ToolbarItemIcon.pdf</string>
-			<key>Label</key>
-			<string>Subscribe to Feed</string>
-		</dict>
-		<key>SFSafariWebsiteAccess</key>
-		<dict>
-			<key>Allowed Domains</key>
-			<array>
-				<string>*.*</string>
-			</array>
-			<key>Level</key>
-			<string>All</string>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 Ranchero Software. All rights reserved.</string>
-	<key>NSHumanReadableDescription</key>
-	<string>This extension adds a Safari toolbar button for easily subscribing to the syndication feed for the current page.</string>
-</dict>
-</plist>
diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
index b2da183e4..88658dd6d 100644
--- a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
@@ -1,3 +1,4 @@
+#include "./NetNewsWire_target_common.xcconfig"
 
 // High Level Settings common to both the Mac application and any extensions we bundle with it
 MARKETING_VERSION = 5.0.1d1
@@ -6,5 +7,4 @@ CURRENT_PROJECT_VERSION = 2611
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 COMBINE_HIDPI_IMAGES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor
 MACOSX_DEPLOYMENT_TARGET = 10.14.4
diff --git a/xcconfig/common/NetNewsWire_macapp_target_common.xcconfig b/xcconfig/common/NetNewsWire_macapp_target_common.xcconfig
index 56d45456d..bfdbc8d94 100644
--- a/xcconfig/common/NetNewsWire_macapp_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_macapp_target_common.xcconfig
@@ -1,8 +1,8 @@
+#include "./NetNewsWire_mac_target_common.xcconfig"
 
 // Settings common to both the Mac Direct and Mac App Store targets
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 INFOPLIST_FILE = Mac/Resources/Info.plist
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks
 PRODUCT_NAME = NetNewsWire
 SWIFT_OBJC_BRIDGING_HEADER = Mac/NetNewsWire-Bridging-Header.h