diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index a0f85f435..65b5d4444 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -925,6 +925,7 @@ 84F9EAE4213660A100CF2DE4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Vendor/Sparkle.framework; sourceTree = SOURCE_ROOT; }; 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconURLFinder.swift; sourceTree = ""; }; + D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_safariextension_target.xcconfig; sourceTree = ""; }; D553737C20186C1F006D8857 /* Article+Scriptability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Article+Scriptability.swift"; sourceTree = ""; }; D57BE6DF204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSScriptCommand+NetNewsWire.swift"; sourceTree = ""; }; D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_project_release.xcconfig; sourceTree = ""; }; @@ -1848,6 +1849,7 @@ D5907CDE2002F0BE005947E5 /* NetNewsWire_project.xcconfig */, D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */, D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */, + D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */, 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */, ); path = xcconfig; @@ -1978,7 +1980,7 @@ ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 6581C73220CED60000F4AD34 = { - DevelopmentTeam = M8L2WTLA8W; + DevelopmentTeam = DY2XQRVWN9; ProvisioningStyle = Automatic; }; 840D617B2029031C009BC708 = { @@ -1993,6 +1995,7 @@ }; 849C645F1ED37A5D003D8FC0 = { CreatedOnToolsVersion = 8.2.1; + DevelopmentTeam = DY2XQRVWN9; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.HardenedRuntime = { @@ -2002,7 +2005,7 @@ }; 849C64701ED37A5D003D8FC0 = { CreatedOnToolsVersion = 8.2.1; - DevelopmentTeam = M8L2WTLA8W; + DevelopmentTeam = DY2XQRVWN9; ProvisioningStyle = Automatic; TestTargetID = 849C645F1ED37A5D003D8FC0; }; @@ -2759,31 +2762,15 @@ /* Begin XCBuildConfiguration section */ 6581C74720CED60100F4AD34 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */; + baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_ENTITLEMENTS = Mac/SafariExtension/Subscribe_to_Feed.entitlements; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = Mac/SafariExtension/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.Subscribe-to-Feed"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; }; name = Debug; }; 6581C74820CED60100F4AD34 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */; + baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_ENTITLEMENTS = Mac/SafariExtension/Subscribe_to_Feed.entitlements; - ENABLE_HARDENED_RUNTIME = YES; - INFOPLIST_FILE = Mac/SafariExtension/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.Subscribe-to-Feed"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; }; name = Release; }; @@ -2791,26 +2778,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = DY2XQRVWN9; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - IPHONEOS_DEPLOYMENT_TARGET = 12.2; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -2818,20 +2785,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = DY2XQRVWN9; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; - MTL_ENABLE_DEBUG_INFO = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -2853,15 +2806,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements; - CODE_SIGN_IDENTITY = "-"; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = Mac/Resources/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.14.4; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen"; - PRODUCT_NAME = NetNewsWire; }; name = Debug; }; @@ -2869,16 +2813,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements; - CODE_SIGN_IDENTITY = "Mac Developer"; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = YES; - INFOPLIST_FILE = Mac/Resources/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.14.4; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen"; - PRODUCT_NAME = NetNewsWire; }; name = Release; }; @@ -2886,8 +2820,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = NetNewsWireTests; }; name = Debug; }; @@ -2895,7 +2827,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */; buildSettings = { - PRODUCT_NAME = NetNewsWireTests; }; name = Release; }; diff --git a/xcconfig/NetNewsWireTests_target.xcconfig b/xcconfig/NetNewsWireTests_target.xcconfig index d62f4e2a9..b5e519c75 100644 --- a/xcconfig/NetNewsWireTests_target.xcconfig +++ b/xcconfig/NetNewsWireTests_target.xcconfig @@ -1,4 +1,5 @@ DEVELOPMENT_TEAM = 9C84TZ7Q6Z +CODE_SIGN_IDENTITY = -; CODE_SIGN_STYLE = Automatic // See the notes in NetNewsWire_target.xcconfig on why the @@ -12,5 +13,5 @@ COMBINE_HIDPI_IMAGES = YES INFOPLIST_FILE = Tests/NetNewsWireTests/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWireTests -PRODUCT_NAME = $(TARGET_NAME) +PRODUCT_NAME = NetNewsWireTests TEST_HOST = $(BUILT_PRODUCTS_DIR)/NetNewsWire.app/Contents/MacOS/NetNewsWire diff --git a/xcconfig/NetNewsWire_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_iOSapp_target.xcconfig index a931faac3..1e9bb253f 100644 --- a/xcconfig/NetNewsWire_iOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_iOSapp_target.xcconfig @@ -1,6 +1,6 @@ CODE_SIGN_IDENTITY = Developer ID Application -DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Manual +DEVELOPMENT_TEAM = DY2XQRVWN9 +CODE_SIGN_STYLE = Automatic PROVISIONING_PROFILE_SPECIFIER = // developers can locally override the Xcode settings for code signing @@ -32,11 +32,18 @@ PROVISIONING_PROFILE_SPECIFIER = ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; +CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + COMBINE_HIDPI_IMAGES = YES FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor +GCC_C_LANGUAGE_STANDARD = gnu11; + IPHONEOS_DEPLOYMENT_TARGET = 13.0 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks INFOPLIST_FILE = iOS/Resources/Info.plist PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.iOS PRODUCT_NAME = NetNewsWire SDKROOT = iphoneos; +TARGETED_DEVICE_FAMILY = 1,2 diff --git a/xcconfig/NetNewsWire_macapp_target.xcconfig b/xcconfig/NetNewsWire_macapp_target.xcconfig index 1d8e62e04..758816a6f 100644 --- a/xcconfig/NetNewsWire_macapp_target.xcconfig +++ b/xcconfig/NetNewsWire_macapp_target.xcconfig @@ -1,5 +1,6 @@ -CODE_SIGN_IDENTITY = Developer ID Application -DEVELOPMENT_TEAM = M8L2WTLA8W +CODE_SIGN_IDENTITY = Mac Developer +// CODE_SIGN_IDENTITY[debug] = - +DEVELOPMENT_TEAM = CODE_SIGN_STYLE = Manual PROVISIONING_PROFILE_SPECIFIER = @@ -30,11 +31,13 @@ PROVISIONING_PROFILE_SPECIFIER = #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements COMBINE_HIDPI_IMAGES = YES FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor -INFOPLIST_FILE = NetNewsWire/Info.plist +INFOPLIST_FILE = Mac/Resources/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks +MACOSX_DEPLOYMENT_TARGET = 10.14.4 PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen -PRODUCT_NAME = $(TARGET_NAME) +PRODUCT_NAME = NetNewsWire diff --git a/xcconfig/NetNewsWire_project_debug.xcconfig b/xcconfig/NetNewsWire_project_debug.xcconfig index 97b270b28..bc5e7dc11 100644 --- a/xcconfig/NetNewsWire_project_debug.xcconfig +++ b/xcconfig/NetNewsWire_project_debug.xcconfig @@ -1,12 +1,12 @@ #include "./NetNewsWire_project.xcconfig" -ONLY_ACTIVE_ARCH = YES DEBUG_INFORMATION_FORMAT = dwarf ENABLE_TESTABILITY = YES GCC_DYNAMIC_NO_PIC = NO GCC_OPTIMIZATION_LEVEL = 0 GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) MTL_ENABLE_DEBUG_INFO = YES +ONLY_ACTIVE_ARCH = YES OTHER_SWIFT_FLAGS = -DDEBUG SWIFT_OPTIMIZATION_LEVEL = -Onone SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG diff --git a/xcconfig/NetNewsWire_project_release.xcconfig b/xcconfig/NetNewsWire_project_release.xcconfig index df0701857..f4d9e6289 100644 --- a/xcconfig/NetNewsWire_project_release.xcconfig +++ b/xcconfig/NetNewsWire_project_release.xcconfig @@ -1,8 +1,10 @@ #include "./NetNewsWire_project.xcconfig" +COPY_PHASE_STRIP = NO DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_HARDENED_RUNTIME = YES ENABLE_NS_ASSERTIONS = NO MTL_ENABLE_DEBUG_INFO = NO OTHER_SWIFT_FLAGS = -DRELEASE SWIFT_OPTIMIZATION_LEVEL = -Owholemodule - +VALIDATE_PRODUCT = YES diff --git a/xcconfig/NetNewsWire_safariextension_target.xcconfig b/xcconfig/NetNewsWire_safariextension_target.xcconfig new file mode 100644 index 000000000..ae90907a7 --- /dev/null +++ b/xcconfig/NetNewsWire_safariextension_target.xcconfig @@ -0,0 +1,44 @@ +CODE_SIGN_IDENTITY = Mac Developer +// CODE_SIGN_IDENTITY[debug] = - +DEVELOPMENT_TEAM = +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" + +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +CODE_SIGN_ENTITLEMENTS = Mac/SafariExtension/Subscribe_to_Feed.entitlements +COMBINE_HIDPI_IMAGES = YES +FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor +INFOPLIST_FILE = Mac/SafariExtension/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks +MACOSX_DEPLOYMENT_TARGET = 10.14.4 +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.Subscribe-to-Feed +PRODUCT_NAME = $(TARGET_NAME) +SDKROOT = macosx