From 1a3bffdac8dd0dfd7561b5f81129bcaf04e72261 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 21 Jun 2021 11:07:55 -0400 Subject: [PATCH] Get the NetNewsWire MAS target building again. --- NetNewsWire.xcodeproj/project.pbxproj | 113 +++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index ae079a99a..2357a447d 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -801,6 +801,30 @@ 65082A2F24C72AC8009FA994 /* SettingsCredentialsAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65082A2E24C72AC8009FA994 /* SettingsCredentialsAccountView.swift */; }; 65082A5224C72B88009FA994 /* SettingsCredentialsAccountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65082A5124C72B88009FA994 /* SettingsCredentialsAccountModel.swift */; }; 65082A5424C73D2F009FA994 /* AccountCredentialsError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65082A5324C73D2F009FA994 /* AccountCredentialsError.swift */; }; + 653813182680E152007A082C /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; }; + 653813192680E15B007A082C /* CacheCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5108F6B52375E612001ABC45 /* CacheCleaner.swift */; }; + 6538131A2680E16C007A082C /* ExportOPMLWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C78912362AB04009A71E4 /* ExportOPMLWindowController.swift */; }; + 6538131B2680E176007A082C /* IconImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516AE9DE2372269A007DEEAA /* IconImage.swift */; }; + 6538131C2680E17F007A082C /* UserInfoKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511B9805237DCAC90028BCAA /* UserInfoKey.swift */; }; + 6538131E2680E1CA007A082C /* Account in Frameworks */ = {isa = PBXBuildFile; productRef = 6538131D2680E1CA007A082C /* Account */; }; + 6538131F2680E1CA007A082C /* Account in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 6538131D2680E1CA007A082C /* Account */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813212680E1D0007A082C /* Articles in Frameworks */ = {isa = PBXBuildFile; productRef = 653813202680E1D0007A082C /* Articles */; }; + 653813222680E1D0007A082C /* Articles in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 653813202680E1D0007A082C /* Articles */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813242680E1D6007A082C /* ArticlesDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 653813232680E1D6007A082C /* ArticlesDatabase */; }; + 653813252680E1D6007A082C /* ArticlesDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 653813232680E1D6007A082C /* ArticlesDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813262680E1E4007A082C /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4DAEC2425F6940091EB5B /* CloudKit.framework */; }; + 653813282680E1EC007A082C /* CrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 653813272680E1EC007A082C /* CrashReporter */; }; + 6538132D2680E205007A082C /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 6538132C2680E205007A082C /* RSDatabase */; }; + 6538132E2680E205007A082C /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 6538132C2680E205007A082C /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813302680E20C007A082C /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 6538132F2680E20C007A082C /* RSParser */; }; + 653813312680E20C007A082C /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 6538132F2680E20C007A082C /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813332680E220007A082C /* RSTree in Frameworks */ = {isa = PBXBuildFile; productRef = 653813322680E220007A082C /* RSTree */; }; + 653813342680E220007A082C /* RSTree in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 653813322680E220007A082C /* RSTree */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813362680E224007A082C /* RSWeb in Frameworks */ = {isa = PBXBuildFile; productRef = 653813352680E224007A082C /* RSWeb */; }; + 653813372680E224007A082C /* RSWeb in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 653813352680E224007A082C /* RSWeb */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 653813392680E22B007A082C /* Secrets in Frameworks */ = {isa = PBXBuildFile; productRef = 653813382680E22B007A082C /* Secrets */; }; + 6538133A2680E22B007A082C /* Secrets in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 653813382680E22B007A082C /* Secrets */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 6538133B2680E28D007A082C /* Subscribe to Feed MAS.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 65ED409D235DEF770081F399 /* Subscribe to Feed MAS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 653A4E7924BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A4E7824BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift */; }; 65422D1724B75CD1008A2FA2 /* SettingsAddAccountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65422D1624B75CD1008A2FA2 /* SettingsAddAccountModel.swift */; }; 6581C73820CED60100F4AD34 /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */; }; @@ -979,7 +1003,6 @@ 65ED406C235DEF6C0081F399 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 84C9FC8922629E8F00D921D6 /* Credits.rtf */; }; 65ED406D235DEF6C0081F399 /* Inspector.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84BBB12B20142A4700F054F5 /* Inspector.storyboard */; }; 65ED406E235DEF6C0081F399 /* AddWebFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848363002262A3BC00DA1D35 /* AddWebFeedSheet.xib */; }; - 65ED407C235DEF6C0081F399 /* Subscribe to Feed.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 65ED4092235DEF770081F399 /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */; }; 65ED4093235DEF770081F399 /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */; }; 65ED4096235DEF770081F399 /* ToolbarItemIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */; }; @@ -1217,6 +1240,13 @@ remoteGlobalIDString = 840D617B2029031C009BC708; remoteInfo = "NetNewsWire-iOS"; }; + 6538133C2680E28D007A082C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 65ED4090235DEF770081F399; + remoteInfo = "Subscribe to Feed MAS"; + }; 65ED41C4235E61550081F399 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; @@ -1393,6 +1423,14 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 653813372680E224007A082C /* RSWeb in Embed Frameworks */, + 653813312680E20C007A082C /* RSParser in Embed Frameworks */, + 6538132E2680E205007A082C /* RSDatabase in Embed Frameworks */, + 6538133A2680E22B007A082C /* Secrets in Embed Frameworks */, + 653813252680E1D6007A082C /* ArticlesDatabase in Embed Frameworks */, + 653813342680E220007A082C /* RSTree in Embed Frameworks */, + 653813222680E1D0007A082C /* Articles in Embed Frameworks */, + 6538131F2680E1CA007A082C /* Account in Embed Frameworks */, 5102AE6A24D17F7C0050839C /* RSCore in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -1404,7 +1442,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 65ED407C235DEF6C0081F399 /* Subscribe to Feed.appex in Embed App Extensions */, + 6538133B2680E28D007A082C /* Subscribe to Feed MAS.appex in Embed App Extensions */, ); name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -2174,8 +2212,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 653813392680E22B007A082C /* Secrets in Frameworks */, + 653813362680E224007A082C /* RSWeb in Frameworks */, + 653813302680E20C007A082C /* RSParser in Frameworks */, + 6538131E2680E1CA007A082C /* Account in Frameworks */, + 653813282680E1EC007A082C /* CrashReporter in Frameworks */, 5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */, 5102AE6924D17F7C0050839C /* RSCore in Frameworks */, + 653813332680E220007A082C /* RSTree in Frameworks */, + 6538132D2680E205007A082C /* RSDatabase in Frameworks */, + 653813262680E1E4007A082C /* CloudKit.framework in Frameworks */, + 653813242680E1D6007A082C /* ArticlesDatabase in Frameworks */, + 653813212680E1D0007A082C /* Articles in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3955,11 +4003,21 @@ ); dependencies = ( 65ED41C7235E615E0081F399 /* PBXTargetDependency */, + 6538133D2680E28D007A082C /* PBXTargetDependency */, ); name = "NetNewsWire MAS"; packageProductDependencies = ( 5102AE6824D17F7C0050839C /* RSCore */, 5102AE6B24D17F7C0050839C /* RSCoreResources */, + 6538131D2680E1CA007A082C /* Account */, + 653813202680E1D0007A082C /* Articles */, + 653813232680E1D6007A082C /* ArticlesDatabase */, + 653813272680E1EC007A082C /* CrashReporter */, + 6538132C2680E205007A082C /* RSDatabase */, + 6538132F2680E20C007A082C /* RSParser */, + 653813322680E220007A082C /* RSTree */, + 653813352680E224007A082C /* RSWeb */, + 653813382680E22B007A082C /* Secrets */, ); productName = NetNewsWire; productReference = 65ED4083235DEF6C0081F399 /* NetNewsWire.app */; @@ -5132,12 +5190,14 @@ 65ED3FE7235DEF6C0081F399 /* SendToMicroBlogCommand.swift in Sources */, 65ED3FE8235DEF6C0081F399 /* ArticleStyle.swift in Sources */, 65ED3FE9235DEF6C0081F399 /* FaviconURLFinder.swift in Sources */, + 6538131C2680E17F007A082C /* UserInfoKey.swift in Sources */, 65ED3FEA235DEF6C0081F399 /* SidebarViewController+ContextualMenus.swift in Sources */, 65ED3FEC235DEF6C0081F399 /* RSHTMLMetadata+Extension.swift in Sources */, 518C3194237B00DA004D740F /* DetailIconSchemeHandler.swift in Sources */, 65ED3FED235DEF6C0081F399 /* SendToMarsEditCommand.swift in Sources */, 514A89A6244FD6640085E65D /* AddTwitterFeedWindowController.swift in Sources */, 65ED3FEE235DEF6C0081F399 /* UserNotificationManager.swift in Sources */, + 653813182680E152007A082C /* AccountType+Helpers.swift in Sources */, 65ED3FEF235DEF6C0081F399 /* ScriptingObjectContainer.swift in Sources */, 65ED3FF0235DEF6C0081F399 /* ArticleStylesManager.swift in Sources */, 65ED3FF1235DEF6C0081F399 /* DetailContainerView.swift in Sources */, @@ -5195,6 +5255,7 @@ 65ED401E235DEF6C0081F399 /* TimelineCellData.swift in Sources */, 65ED401F235DEF6C0081F399 /* BuiltinSmartFeedInspectorViewController.swift in Sources */, 65ED4020235DEF6C0081F399 /* AppDelegate+Scriptability.swift in Sources */, + 6538131A2680E16C007A082C /* ExportOPMLWindowController.swift in Sources */, 65ED4021235DEF6C0081F399 /* NNW3Document.swift in Sources */, 65ED4022235DEF6C0081F399 /* ScriptingObject.swift in Sources */, 65ED4023235DEF6C0081F399 /* Folder+Scriptability.swift in Sources */, @@ -5215,9 +5276,11 @@ 65ED402E235DEF6C0081F399 /* MainWindowController+Scriptability.swift in Sources */, 65ED402F235DEF6C0081F399 /* PreferencesWindowController.swift in Sources */, 65ED4030235DEF6C0081F399 /* SmallIconProvider.swift in Sources */, + 653813192680E15B007A082C /* CacheCleaner.swift in Sources */, 510C417E24E5D1AE008226FD /* ExtensionFeedAddRequest.swift in Sources */, 65ED4031235DEF6C0081F399 /* ArticleExtractor.swift in Sources */, 51868BF2254386630011A17B /* SidebarDeleteItemsAlert.swift in Sources */, + 6538131B2680E176007A082C /* IconImage.swift in Sources */, 65ED4032235DEF6C0081F399 /* FetchRequestQueue.swift in Sources */, 65ED4033235DEF6C0081F399 /* SidebarKeyboardDelegate.swift in Sources */, 65ED4034235DEF6C0081F399 /* AccountsPreferencesViewController.swift in Sources */, @@ -5666,6 +5729,11 @@ target = 840D617B2029031C009BC708 /* NetNewsWire-iOS */; targetProxy = 518B2ED72351B3DD00400001 /* PBXContainerItemProxy */; }; + 6538133D2680E28D007A082C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 65ED4090235DEF770081F399 /* Subscribe to Feed MAS */; + targetProxy = 6538133C2680E28D007A082C /* PBXContainerItemProxy */; + }; 65ED41C5235E61550081F399 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 6581C73220CED60000F4AD34 /* Subscribe to Feed */; @@ -6486,6 +6554,47 @@ package = 519CA8E325841DB700EB079A /* XCRemoteSwiftPackageReference "plcrashreporter" */; productName = CrashReporter; }; + 6538131D2680E1CA007A082C /* Account */ = { + isa = XCSwiftPackageProductDependency; + productName = Account; + }; + 653813202680E1D0007A082C /* Articles */ = { + isa = XCSwiftPackageProductDependency; + productName = Articles; + }; + 653813232680E1D6007A082C /* ArticlesDatabase */ = { + isa = XCSwiftPackageProductDependency; + productName = ArticlesDatabase; + }; + 653813272680E1EC007A082C /* CrashReporter */ = { + isa = XCSwiftPackageProductDependency; + package = 519CA8E325841DB700EB079A /* XCRemoteSwiftPackageReference "plcrashreporter" */; + productName = CrashReporter; + }; + 6538132C2680E205007A082C /* RSDatabase */ = { + isa = XCSwiftPackageProductDependency; + package = 51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */; + productName = RSDatabase; + }; + 6538132F2680E20C007A082C /* RSParser */ = { + isa = XCSwiftPackageProductDependency; + package = 51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */; + productName = RSParser; + }; + 653813322680E220007A082C /* RSTree */ = { + isa = XCSwiftPackageProductDependency; + package = 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */; + productName = RSTree; + }; + 653813352680E224007A082C /* RSWeb */ = { + isa = XCSwiftPackageProductDependency; + package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */; + productName = RSWeb; + }; + 653813382680E22B007A082C /* Secrets */ = { + isa = XCSwiftPackageProductDependency; + productName = Secrets; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 849C64581ED37A5D003D8FC0 /* Project object */;