From 0b5be9057fd9404448fa25d4898dcb5d6d0bb53e Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 10 Oct 2019 00:24:36 -0500 Subject: [PATCH] Correct build configuration for CI build --- Frameworks/Account/xcconfig/Account_project.xcconfig | 5 +++-- Frameworks/Articles/xcconfig/Articles_project.xcconfig | 5 +++-- Frameworks/Articles/xcconfig/Articles_target.xcconfig | 2 -- .../ArticlesDatabase.xcodeproj/project.pbxproj | 2 -- .../xcconfig/ArticlesDatabase_project.xcconfig | 5 +++-- .../xcconfig/ArticlesDatabase_target.xcconfig | 3 --- .../SyncDatabase/xcconfig/SyncDatabase_project.xcconfig | 5 +++-- .../SyncDatabase/xcconfig/SyncDatabase_target.xcconfig | 3 --- submodules/RSCore | 2 +- submodules/RSDatabase | 2 +- submodules/RSParser | 2 +- submodules/RSTree | 2 +- submodules/RSWeb | 2 +- xcconfig/NetNewsWire_safariextension_target.xcconfig | 2 +- 14 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Frameworks/Account/xcconfig/Account_project.xcconfig b/Frameworks/Account/xcconfig/Account_project.xcconfig index 75c4e7be6..f4011eb5f 100644 --- a/Frameworks/Account/xcconfig/Account_project.xcconfig +++ b/Frameworks/Account/xcconfig/Account_project.xcconfig @@ -1,6 +1,7 @@ -CODE_SIGN_IDENTITY = Mac Developer -CODE_SIGN_STYLE = Automatic +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W +CODE_SIGN_STYLE = Manual +PROVISIONING_PROFILE_SPECIFIER = NetNewsWire // See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here diff --git a/Frameworks/Articles/xcconfig/Articles_project.xcconfig b/Frameworks/Articles/xcconfig/Articles_project.xcconfig index 95eefa99f..66aa6cd86 100644 --- a/Frameworks/Articles/xcconfig/Articles_project.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project.xcconfig @@ -1,6 +1,7 @@ -CODE_SIGN_IDENTITY = Mac Developer -CODE_SIGN_STYLE = Automatic +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W +CODE_SIGN_STYLE = Manual +PROVISIONING_PROFILE_SPECIFIER = NetNewsWire // See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here diff --git a/Frameworks/Articles/xcconfig/Articles_target.xcconfig b/Frameworks/Articles/xcconfig/Articles_target.xcconfig index e12cc007b..709a677e3 100644 --- a/Frameworks/Articles/xcconfig/Articles_target.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_target.xcconfig @@ -1,5 +1,3 @@ -CODE_SIGN_IDENTITY = - INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks SKIP_INSTALL = YES DYLIB_COMPATIBILITY_VERSION = 1 diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj index aeb7db758..45fcc705a 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj @@ -538,7 +538,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEEA20242E0800712EC3 /* ArticlesDatabase_project_debug.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; @@ -548,7 +547,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEEB20242E0800712EC3 /* ArticlesDatabase_project_release.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig index 95eefa99f..66aa6cd86 100644 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig +++ b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig @@ -1,6 +1,7 @@ -CODE_SIGN_IDENTITY = Mac Developer -CODE_SIGN_STYLE = Automatic +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W +CODE_SIGN_STYLE = Manual +PROVISIONING_PROFILE_SPECIFIER = NetNewsWire // See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_target.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_target.xcconfig index d23843946..37bbd7197 100644 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_target.xcconfig +++ b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_target.xcconfig @@ -1,6 +1,3 @@ -CODE_SIGN_IDENTITY = -// DEVELOPMENT_TEAM = 9C84TZ7Q6Z - INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks SKIP_INSTALL = YES DYLIB_COMPATIBILITY_VERSION = 1 diff --git a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig index 12400df54..eed283696 100644 --- a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig +++ b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig @@ -1,6 +1,7 @@ -CODE_SIGN_IDENTITY = Mac Developer -CODE_SIGN_STYLE = Automatic +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W +CODE_SIGN_STYLE = Manual +PROVISIONING_PROFILE_SPECIFIER = NetNewsWire // See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here diff --git a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_target.xcconfig b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_target.xcconfig index d01ed698a..73bb31494 100644 --- a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_target.xcconfig +++ b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_target.xcconfig @@ -1,6 +1,3 @@ -CODE_SIGN_IDENTITY = -// DEVELOPMENT_TEAM = 9C84TZ7Q6Z - INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks SKIP_INSTALL = YES DYLIB_COMPATIBILITY_VERSION = 1 diff --git a/submodules/RSCore b/submodules/RSCore index 47ee7c6d0..260313635 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 47ee7c6d0d582b14d1ec1061eebbfd4de589e4b4 +Subproject commit 260313635b8c1f7b796477100b61d42aba7ad8b3 diff --git a/submodules/RSDatabase b/submodules/RSDatabase index 807bb445f..19c67ac53 160000 --- a/submodules/RSDatabase +++ b/submodules/RSDatabase @@ -1 +1 @@ -Subproject commit 807bb445f0bc692cb6b9210f66db82a85efe5c59 +Subproject commit 19c67ac53b9baf3cca388cd4eb57a0532b44239e diff --git a/submodules/RSParser b/submodules/RSParser index f01129d76..4da8a057c 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit f01129d762eba20cd11a680bbde651ca75639ef3 +Subproject commit 4da8a057c4f88e401412f84704f9e7a2d3d38fac diff --git a/submodules/RSTree b/submodules/RSTree index 7581b16d4..fcf805f49 160000 --- a/submodules/RSTree +++ b/submodules/RSTree @@ -1 +1 @@ -Subproject commit 7581b16d4e8f22fad183d34338d44af85d37b30d +Subproject commit fcf805f49caf1c3ae60b6e2d3ac5707186ca29af diff --git a/submodules/RSWeb b/submodules/RSWeb index ee1058e48..abed8a878 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit ee1058e48e7960c7fa69a17f602f1318249aaed5 +Subproject commit abed8a878831f58cae0644e20c6eb7e7af1c8972 diff --git a/xcconfig/NetNewsWire_safariextension_target.xcconfig b/xcconfig/NetNewsWire_safariextension_target.xcconfig index 8caead968..5d8a01942 100644 --- a/xcconfig/NetNewsWire_safariextension_target.xcconfig +++ b/xcconfig/NetNewsWire_safariextension_target.xcconfig @@ -2,7 +2,7 @@ CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W CODE_SIGN_STYLE = Manual ORGANIZATION_IDENTIFIER = com.ranchero -PROVISIONING_PROFILE_SPECIFIER = +PROVISIONING_PROFILE_SPECIFIER = NetNewsWire // developers can locally override the Xcode settings for code signing // by creating a DeveloperSettings.xcconfig file locally at the appropriate path