diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index e3f6ec147..d2a3b2d43 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -926,7 +926,6 @@ 55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AccountsReaderAPI.xib; sourceTree = ""; }; 55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsReaderAPIWindowController.swift; sourceTree = ""; }; 5F323808231DF9F000706F6B /* VibrantTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VibrantTableViewCell.swift; sourceTree = ""; }; - 6538135B2680E3A9007A082C /* NetNewsWire_shareextension_target_macappstore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_shareextension_target_macappstore.xcconfig; sourceTree = ""; }; 6543108B2322D90900658221 /* common */ = {isa = PBXFileReference; lastKnownFileType = folder; path = common; sourceTree = ""; }; 6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Subscribe to Feed.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; 6581C73420CED60100F4AD34 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -938,8 +937,6 @@ 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ToolbarItemIcon.pdf; sourceTree = ""; }; 6581C74320CED60100F4AD34 /* Subscribe_to_Feed.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Subscribe_to_Feed.entitlements; sourceTree = ""; }; 65ED409F235DEFF00081F399 /* container-migration.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "container-migration.plist"; sourceTree = ""; }; - 65ED40F2235DF5E00081F399 /* NetNewsWire_macapp_target_macappstore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_macapp_target_macappstore.xcconfig; sourceTree = ""; }; - 65ED4186235E045B0081F399 /* NetNewsWire_safariextension_target_macappstore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_safariextension_target_macappstore.xcconfig; sourceTree = ""; }; 769F2D3643779DB02786278E /* NewsBlurAccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewsBlurAccountViewController.swift; sourceTree = ""; }; 8405DD892213E0E3008CE1BF /* DetailContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailContainerView.swift; sourceTree = ""; }; 8405DD9822153B6B008CE1BF /* TimelineContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineContainerView.swift; sourceTree = ""; }; @@ -2293,14 +2290,11 @@ 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */, 1768140A2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig */, 518B2EE92351B4C200400001 /* NetNewsWire_iOSTests_target.xcconfig */, - 65ED40F2235DF5E00081F399 /* NetNewsWire_macapp_target_macappstore.xcconfig */, D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */, D5907CDD2002F0BE005947E5 /* NetNewsWire_project_debug.xcconfig */, D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */, D5907CDE2002F0BE005947E5 /* NetNewsWire_project.xcconfig */, - 65ED4186235E045B0081F399 /* NetNewsWire_safariextension_target_macappstore.xcconfig */, D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */, - 6538135B2680E3A9007A082C /* NetNewsWire_shareextension_target_macappstore.xcconfig */, 510C418724E5D2E3008226FD /* NetNewsWire_shareextension_target.xcconfig */, D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */, ); diff --git a/xcconfig/NetNewsWire_macapp_target_macappstore.xcconfig b/xcconfig/NetNewsWire_macapp_target_macappstore.xcconfig deleted file mode 100644 index af610480c..000000000 --- a/xcconfig/NetNewsWire_macapp_target_macappstore.xcconfig +++ /dev/null @@ -1,37 +0,0 @@ -CODE_SIGN_IDENTITY[config=Release] = 3rd Party Mac Developer Application -CODE_SIGN_IDENTITY[config=Debug] = - -DEVELOPMENT_TEAM[config=Release] = M8L2WTLA8W -CODE_SIGN_STYLE = Manual -PROVISIONING_PROFILE_SPECIFIER = - -// developers can locally override the Xcode settings for code signing -// by creating a DeveloperSettings.xcconfig file locally at the appropriate path -// This allows a pristine project to have code signing set up with the appropriate -// developer ID and certificates, and for dev to be able to have local settings -// without needing to check in anything into source control -// -// As an example, make a ../../SharedXcodeSettings/DeveloperSettings.xcconfig file and -// give it the contents -// -// CODE_SIGN_IDENTITY[sdk=macosx*] = Mac Developer -// CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -// CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer -// DEVELOPMENT_TEAM = -// CODE_SIGN_STYLE = Automatic -// PROVISIONING_PROFILE_SPECIFIER = -// -// And you should be able to build without code signing errors and without modifying -// the NetNewsWire Xcode project. -// -// Example: if your NetNewsWire Xcode project file is at -// /Users/Shared/git/NetNewsWire/NetNewsWire.xcodeproj -// create your DeveloperSettings.xcconfig file at -// /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig -// - -#include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" -#include "./common/NetNewsWire_macapp_target_common.xcconfig" - -CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements -PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS -OTHER_SWIFT_FLAGS = -DMAC_APP_STORE $(inherited) diff --git a/xcconfig/NetNewsWire_safariextension_target_macappstore.xcconfig b/xcconfig/NetNewsWire_safariextension_target_macappstore.xcconfig deleted file mode 100644 index d1b419d6a..000000000 --- a/xcconfig/NetNewsWire_safariextension_target_macappstore.xcconfig +++ /dev/null @@ -1,44 +0,0 @@ -CODE_SIGN_IDENTITY[config=Release] = 3rd Party Mac Developer Application -CODE_SIGN_IDENTITY[config=Debug] = - -DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Manual -ORGANIZATION_IDENTIFIER = com.ranchero -PROVISIONING_PROFILE_SPECIFIER = - -// developers can locally override the Xcode settings for code signing -// by creating a DeveloperSettings.xcconfig file locally at the appropriate path -// This allows a pristine project to have code signing set up with the appropriate -// developer ID and certificates, and for dev to be able to have local settings -// without needing to check in anything into source control -// -// As an example, make a ../../SharedXcodeSettings/DeveloperSettings.xcconfig file and -// give it the contents -// -// CODE_SIGN_IDENTITY[sdk=macosx*] = Mac Developer -// CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -// CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer -// DEVELOPMENT_TEAM = -// ORGANIZATION_IDENTIFIER = -// CODE_SIGN_STYLE = Automatic -// PROVISIONING_PROFILE_SPECIFIER = -// -// And you should be able to build without code signing errors and without modifying -// the NetNewsWire Xcode project. -// -// Example: if your NetNewsWire Xcode project file is at -// /Users/Shared/git/NetNewsWire/NetNewsWire.xcodeproj -// create your DeveloperSettings.xcconfig file at -// /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig -// - -#include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" -#include "./common/NetNewsWire_mac_target_common.xcconfig" - -CODE_SIGN_ENTITLEMENTS = Mac/SafariExtension/Subscribe_to_Feed.entitlements -INFOPLIST_FILE = Mac/SafariExtension/Info.plist -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks -PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS.SubscribeToFeed -PRODUCT_NAME = $(TARGET_NAME) -OTHER_SWIFT_FLAGS = -DMAC_APP_STORE $(inherited) - -SDKROOT = macosx diff --git a/xcconfig/NetNewsWire_shareextension_target_macappstore.xcconfig b/xcconfig/NetNewsWire_shareextension_target_macappstore.xcconfig deleted file mode 100644 index f6a360712..000000000 --- a/xcconfig/NetNewsWire_shareextension_target_macappstore.xcconfig +++ /dev/null @@ -1,45 +0,0 @@ -CODE_SIGN_IDENTITY = Developer ID Application -DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Manual -ORGANIZATION_IDENTIFIER = com.ranchero -PROVISIONING_PROFILE_SPECIFIER = NetNewsWire Mac Share Extension -DEVELOPER_ENTITLEMENTS = - -// developers can locally override the Xcode settings for code signing -// by creating a DeveloperSettings.xcconfig file locally at the appropriate path -// This allows a pristine project to have code signing set up with the appropriate -// developer ID and certificates, and for dev to be able to have local settings -// without needing to check in anything into source control -// -// As an example, make a ../../SharedXcodeSettings/DeveloperSettings.xcconfig file and -// give it the contents -// -// CODE_SIGN_IDENTITY[sdk=macosx*] = Mac Developer -// CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -// CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer -// DEVELOPMENT_TEAM = -// ORGANIZATION_IDENTIFIER = -// CODE_SIGN_STYLE = Automatic -// PROVISIONING_PROFILE_SPECIFIER = -// -// And you should be able to build without code signing errors and without modifying -// the NetNewsWire Xcode project. -// -// Example: if your NetNewsWire Xcode project file is at -// /Users/Shared/git/NetNewsWire/NetNewsWire.xcodeproj -// create your DeveloperSettings.xcconfig file at -// /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig -// - -#include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" -#include "./common/NetNewsWire_mac_target_common.xcconfig" - -CODE_SIGN_ENTITLEMENTS = Mac/ShareExtension/ShareExtension.entitlements -INFOPLIST_FILE = Mac/ShareExtension/Info.plist -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks -PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS.ShareExtension -PRODUCT_NAME = $(TARGET_NAME) -ASSETCATALOG_COMPILER_APPICON_NAME = -OTHER_SWIFT_FLAGS = -DMAC_APP_STORE $(inherited) - -SDKROOT = macosx