From eb02568409e14308f89b295a34e6597564700655 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 16 Apr 2020 11:15:39 -0500 Subject: [PATCH] Made Feed Providers part of the Account project --- .../Account/Account.xcodeproj/project.pbxproj | 36 ++- .../FeedProvider/FeedProvider.swift | 0 .../Twitter/TwitterFeedProvider.swift | 0 .../FeedProvider.xcodeproj/project.pbxproj | 287 ------------------ Frameworks/FeedProvider/Info.plist | 26 -- .../xcconfig/FeedProvider_project.xcconfig | 61 ---- .../FeedProvider_project_debug.xcconfig | 15 - .../FeedProvider_project_release.xcconfig | 9 - .../FeedProvider_project_test.xcconfig | 3 - .../xcconfig/FeedProvider_target.xcconfig | 13 - NetNewsWire.xcodeproj/project.pbxproj | 40 --- .../ExtensionPointIdentifer.swift | 2 +- .../ExtensionPointManager.swift | 2 +- .../TwitterFeedProvider-Extensions.swift | 7 +- 14 files changed, 33 insertions(+), 468 deletions(-) rename Frameworks/{ => Account}/FeedProvider/FeedProvider.swift (100%) rename Frameworks/{ => Account}/FeedProvider/Twitter/TwitterFeedProvider.swift (100%) delete mode 100644 Frameworks/FeedProvider/FeedProvider.xcodeproj/project.pbxproj delete mode 100644 Frameworks/FeedProvider/Info.plist delete mode 100644 Frameworks/FeedProvider/xcconfig/FeedProvider_project.xcconfig delete mode 100644 Frameworks/FeedProvider/xcconfig/FeedProvider_project_debug.xcconfig delete mode 100644 Frameworks/FeedProvider/xcconfig/FeedProvider_project_release.xcconfig delete mode 100644 Frameworks/FeedProvider/xcconfig/FeedProvider_project_test.xcconfig delete mode 100644 Frameworks/FeedProvider/xcconfig/FeedProvider_target.xcconfig diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index d9958c367..751767700 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -33,10 +33,11 @@ 5107A09D227DE77700C7C3C5 /* TestTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A09C227DE77700C7C3C5 /* TestTransport.swift */; }; 510BD111232C3801002692E4 /* AccountMetadataFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BD110232C3801002692E4 /* AccountMetadataFile.swift */; }; 510BD113232C3E9D002692E4 /* WebFeedMetadataFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BD112232C3E9D002692E4 /* WebFeedMetadataFile.swift */; }; - 511076F5243BD96D00D97C8C /* FeedProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 511076F4243BD96D00D97C8C /* FeedProvider.framework */; }; 511B9804237CD4270028BCAA /* FeedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511B9803237CD4270028BCAA /* FeedIdentifier.swift */; }; 512DD4CB2431000600C17B1F /* CKRecord+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512DD4CA2431000600C17B1F /* CKRecord+Extensions.swift */; }; 512DD4CD2431098700C17B1F /* CloudKitAccountZoneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512DD4CC2431098700C17B1F /* CloudKitAccountZoneDelegate.swift */; }; + 5132AAC42448BAD90077840A /* FeedProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5132AAC12448BAD90077840A /* FeedProvider.swift */; }; + 5132AAC52448BAD90077840A /* TwitterFeedProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5132AAC32448BAD90077840A /* TwitterFeedProvider.swift */; }; 513323082281070D00C30F19 /* AccountFeedbinSyncTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513323072281070C00C30F19 /* AccountFeedbinSyncTest.swift */; }; 5133230A2281082F00C30F19 /* subscriptions_initial.json in Resources */ = {isa = PBXBuildFile; fileRef = 513323092281082F00C30F19 /* subscriptions_initial.json */; }; 5133230C2281088A00C30F19 /* subscriptions_add.json in Resources */ = {isa = PBXBuildFile; fileRef = 5133230B2281088A00C30F19 /* subscriptions_add.json */; }; @@ -272,6 +273,8 @@ 511B9803237CD4270028BCAA /* FeedIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedIdentifier.swift; sourceTree = ""; }; 512DD4CA2431000600C17B1F /* CKRecord+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CKRecord+Extensions.swift"; sourceTree = ""; }; 512DD4CC2431098700C17B1F /* CloudKitAccountZoneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitAccountZoneDelegate.swift; sourceTree = ""; }; + 5132AAC12448BAD90077840A /* FeedProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedProvider.swift; sourceTree = ""; }; + 5132AAC32448BAD90077840A /* TwitterFeedProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TwitterFeedProvider.swift; sourceTree = ""; }; 513323072281070C00C30F19 /* AccountFeedbinSyncTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountFeedbinSyncTest.swift; sourceTree = ""; }; 513323092281082F00C30F19 /* subscriptions_initial.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = subscriptions_initial.json; sourceTree = ""; }; 5133230B2281088A00C30F19 /* subscriptions_add.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = subscriptions_add.json; sourceTree = ""; }; @@ -456,7 +459,6 @@ buildActionMask = 2147483647; files = ( 84EAC4822148CC6300F154AB /* RSDatabase.framework in Frameworks */, - 511076F5243BD96D00D97C8C /* FeedProvider.framework in Frameworks */, 844B2981210CE3BF004020B3 /* RSWeb.framework in Frameworks */, 841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */, 841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */, @@ -545,6 +547,23 @@ path = Feedbin; sourceTree = ""; }; + 5132AABB2448BA5B0077840A /* FeedProvider */ = { + isa = PBXGroup; + children = ( + 5132AAC12448BAD90077840A /* FeedProvider.swift */, + 5132AAC22448BAD90077840A /* Twitter */, + ); + path = FeedProvider; + sourceTree = ""; + }; + 5132AAC22448BAD90077840A /* Twitter */ = { + isa = PBXGroup; + children = ( + 5132AAC32448BAD90077840A /* TwitterFeedProvider.swift */, + ); + path = Twitter; + sourceTree = ""; + }; 5165D71F22835E9800D9D53D /* FeedFinder */ = { isa = PBXGroup; children = ( @@ -690,18 +709,19 @@ 84B2D4CE2238C13D00498ADA /* WebFeedMetadata.swift */, 510BD112232C3E9D002692E4 /* WebFeedMetadataFile.swift */, 5165D71F22835E9800D9D53D /* FeedFinder */, + 5132AABB2448BA5B0077840A /* FeedProvider */, 8419742B1F6DDE84006346C4 /* LocalAccount */, - 84245C7D1FDDD2580074AFBB /* Feedbin */, - 3B826D9D2385C81C00FC1ADB /* FeedWrangler */, - 552032EA229D5D5A009559E0 /* ReaderAPI */, - 9EA31339231E368100268BA0 /* Feedly */, 5103A9D7242253DC00410853 /* CloudKit */, + 84245C7D1FDDD2580074AFBB /* Feedbin */, + 9EA31339231E368100268BA0 /* Feedly */, + 3B826D9D2385C81C00FC1ADB /* FeedWrangler */, + 769F2630AF8DC873D4A73567 /* NewsBlur */, + 552032EA229D5D5A009559E0 /* ReaderAPI */, 848935031F62484F00CEBD24 /* AccountTests */, 848934F71F62484F00CEBD24 /* Products */, 8469F80F1F6DC3C10084783E /* Frameworks */, D511EEB4202422BB00712EC3 /* xcconfig */, 848934FA1F62484F00CEBD24 /* Info.plist */, - 769F2630AF8DC873D4A73567 /* NewsBlur */, ); sourceTree = ""; usesTabs = 1; @@ -1084,6 +1104,7 @@ 9EA643D5239306AC0018A28C /* FeedlyFeedsSearchResponse.swift in Sources */, 9EAEC60E2332FEC20085D7C9 /* FeedlyFeed.swift in Sources */, 5144EA4E227B829A00D19003 /* FeedbinAccountDelegate.swift in Sources */, + 5132AAC52448BAD90077840A /* TwitterFeedProvider.swift in Sources */, 519E84AC2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift in Sources */, 512DD4CB2431000600C17B1F /* CKRecord+Extensions.swift in Sources */, 3B826DAF2385C81C00FC1ADB /* FeedWranglerGenericResult.swift in Sources */, @@ -1146,6 +1167,7 @@ 846E77501F6EF9C400A165E2 /* LocalAccountRefresher.swift in Sources */, 9EA643CF2391D3560018A28C /* FeedlyAddExistingFeedOperation.swift in Sources */, 55203300229D5D5A009559E0 /* ReaderAPICaller.swift in Sources */, + 5132AAC42448BAD90077840A /* FeedProvider.swift in Sources */, 9E1D154F233371DD00F4944C /* FeedlyGetCollectionsOperation.swift in Sources */, 9EAEC626233318400085D7C9 /* FeedlyStream.swift in Sources */, 9E5DE60E23C3F4B70064DA30 /* FeedlyFetchIdsForMissingArticlesOperation.swift in Sources */, diff --git a/Frameworks/FeedProvider/FeedProvider.swift b/Frameworks/Account/FeedProvider/FeedProvider.swift similarity index 100% rename from Frameworks/FeedProvider/FeedProvider.swift rename to Frameworks/Account/FeedProvider/FeedProvider.swift diff --git a/Frameworks/FeedProvider/Twitter/TwitterFeedProvider.swift b/Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift similarity index 100% rename from Frameworks/FeedProvider/Twitter/TwitterFeedProvider.swift rename to Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift diff --git a/Frameworks/FeedProvider/FeedProvider.xcodeproj/project.pbxproj b/Frameworks/FeedProvider/FeedProvider.xcodeproj/project.pbxproj deleted file mode 100644 index b0e51298e..000000000 --- a/Frameworks/FeedProvider/FeedProvider.xcodeproj/project.pbxproj +++ /dev/null @@ -1,287 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - 5102FD7D244009CF00534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7C244009CF00534F17 /* Secrets.framework */; }; - 5110769B243BCF3A00D97C8C /* FeedProvider_target.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */; }; - 5110769C243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51107697243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig */; }; - 5110769D243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51107698243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig */; }; - 5110769E243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51107699243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig */; }; - 5110769F243BCF3A00D97C8C /* FeedProvider_project.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 5110769A243BCF3A00D97C8C /* FeedProvider_project.xcconfig */; }; - 511076EE243BD82A00D97C8C /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 511076ED243BD82A00D97C8C /* Articles.framework */; }; - 51107722243BE0DA00D97C8C /* FeedProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51107721243BE0DA00D97C8C /* FeedProvider.swift */; }; - 51107724243BE11800D97C8C /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51107723243BE11800D97C8C /* RSParser.framework */; }; - 51107728243BE15D00D97C8C /* RSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51107727243BE15D00D97C8C /* RSCore.framework */; }; - 515A5105243D0C6B0089E588 /* TwitterFeedProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 515A5104243D0C6B0089E588 /* TwitterFeedProvider.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 5102FD7C244009CF00534F17 /* Secrets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Secrets.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5110765F243BCE0400D97C8C /* FeedProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FeedProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 51107663243BCE0400D97C8C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeedProvider_target.xcconfig; sourceTree = ""; }; - 51107697243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeedProvider_project_test.xcconfig; sourceTree = ""; }; - 51107698243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeedProvider_project_release.xcconfig; sourceTree = ""; }; - 51107699243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeedProvider_project_debug.xcconfig; sourceTree = ""; }; - 5110769A243BCF3A00D97C8C /* FeedProvider_project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeedProvider_project.xcconfig; sourceTree = ""; }; - 511076ED243BD82A00D97C8C /* Articles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Articles.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 51107721243BE0DA00D97C8C /* FeedProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedProvider.swift; sourceTree = ""; }; - 51107723243BE11800D97C8C /* RSParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSParser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 51107727243BE15D00D97C8C /* RSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 515A5104243D0C6B0089E588 /* TwitterFeedProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterFeedProvider.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 5110765C243BCE0400D97C8C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 51107728243BE15D00D97C8C /* RSCore.framework in Frameworks */, - 51107724243BE11800D97C8C /* RSParser.framework in Frameworks */, - 5102FD7D244009CF00534F17 /* Secrets.framework in Frameworks */, - 511076EE243BD82A00D97C8C /* Articles.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 51107655243BCE0400D97C8C = { - isa = PBXGroup; - children = ( - 51107721243BE0DA00D97C8C /* FeedProvider.swift */, - 515A5103243D0C230089E588 /* Twitter */, - 51107689243BCEB300D97C8C /* xcconfig */, - 51107663243BCE0400D97C8C /* Info.plist */, - 51107660243BCE0400D97C8C /* Products */, - 511076EC243BD82A00D97C8C /* Frameworks */, - ); - sourceTree = ""; - }; - 51107660243BCE0400D97C8C /* Products */ = { - isa = PBXGroup; - children = ( - 5110765F243BCE0400D97C8C /* FeedProvider.framework */, - ); - name = Products; - sourceTree = ""; - }; - 51107689243BCEB300D97C8C /* xcconfig */ = { - isa = PBXGroup; - children = ( - 5110769A243BCF3A00D97C8C /* FeedProvider_project.xcconfig */, - 51107699243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig */, - 51107698243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig */, - 51107697243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig */, - 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */, - ); - path = xcconfig; - sourceTree = ""; - }; - 511076EC243BD82A00D97C8C /* Frameworks */ = { - isa = PBXGroup; - children = ( - 5102FD7C244009CF00534F17 /* Secrets.framework */, - 51107727243BE15D00D97C8C /* RSCore.framework */, - 51107723243BE11800D97C8C /* RSParser.framework */, - 511076ED243BD82A00D97C8C /* Articles.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 515A5103243D0C230089E588 /* Twitter */ = { - isa = PBXGroup; - children = ( - 515A5104243D0C6B0089E588 /* TwitterFeedProvider.swift */, - ); - path = Twitter; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 5110765A243BCE0400D97C8C /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 5110765E243BCE0400D97C8C /* FeedProvider */ = { - isa = PBXNativeTarget; - buildConfigurationList = 51107667243BCE0400D97C8C /* Build configuration list for PBXNativeTarget "FeedProvider" */; - buildPhases = ( - 5110765A243BCE0400D97C8C /* Headers */, - 5110765B243BCE0400D97C8C /* Sources */, - 5110765C243BCE0400D97C8C /* Frameworks */, - 5110765D243BCE0400D97C8C /* Resources */, - 511076A2243BD2E600D97C8C /* Run Script: Verfiy No Build Settings */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = FeedProvider; - productName = FeedProvider; - productReference = 5110765F243BCE0400D97C8C /* FeedProvider.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 51107656243BCE0400D97C8C /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1140; - ORGANIZATIONNAME = "Ranchero Software, LLC"; - TargetAttributes = { - 5110765E243BCE0400D97C8C = { - CreatedOnToolsVersion = 11.4; - LastSwiftMigration = 1140; - }; - }; - }; - buildConfigurationList = 51107659243BCE0400D97C8C /* Build configuration list for PBXProject "FeedProvider" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 51107655243BCE0400D97C8C; - productRefGroup = 51107660243BCE0400D97C8C /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 5110765E243BCE0400D97C8C /* FeedProvider */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 5110765D243BCE0400D97C8C /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5110769D243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig in Resources */, - 5110769F243BCF3A00D97C8C /* FeedProvider_project.xcconfig in Resources */, - 5110769E243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig in Resources */, - 5110769B243BCF3A00D97C8C /* FeedProvider_target.xcconfig in Resources */, - 5110769C243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 511076A2243BD2E600D97C8C /* Run Script: Verfiy No Build Settings */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Script: Verfiy No Build Settings"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n\nif [ $? -ne 0 ]\nthen\n echo \"error: Build Setting were found in the project.pbxproj file. Most likely you didn't intend to change this file and should revert it.\"\n exit 1\nfi\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 5110765B243BCE0400D97C8C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 515A5105243D0C6B0089E588 /* TwitterFeedProvider.swift in Sources */, - 51107722243BE0DA00D97C8C /* FeedProvider.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 51107665243BCE0400D97C8C /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107699243BCF3A00D97C8C /* FeedProvider_project_debug.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 51107666243BCE0400D97C8C /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107698243BCF3A00D97C8C /* FeedProvider_project_release.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 51107668243BCE0400D97C8C /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 51107669243BCE0400D97C8C /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 511076A0243BD20A00D97C8C /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107697243BCF3A00D97C8C /* FeedProvider_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 511076A1243BD20A00D97C8C /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51107696243BCF3A00D97C8C /* FeedProvider_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 51107659243BCE0400D97C8C /* Build configuration list for PBXProject "FeedProvider" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 51107665243BCE0400D97C8C /* Debug */, - 511076A0243BD20A00D97C8C /* Test */, - 51107666243BCE0400D97C8C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 51107667243BCE0400D97C8C /* Build configuration list for PBXNativeTarget "FeedProvider" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 51107668243BCE0400D97C8C /* Debug */, - 511076A1243BD20A00D97C8C /* Test */, - 51107669243BCE0400D97C8C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 51107656243BCE0400D97C8C /* Project object */; -} diff --git a/Frameworks/FeedProvider/Info.plist b/Frameworks/FeedProvider/Info.plist deleted file mode 100644 index 187bfef6d..000000000 --- a/Frameworks/FeedProvider/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2020 Ranchero Software, LLC. All rights reserved. - NSPrincipalClass - - - diff --git a/Frameworks/FeedProvider/xcconfig/FeedProvider_project.xcconfig b/Frameworks/FeedProvider/xcconfig/FeedProvider_project.xcconfig deleted file mode 100644 index 573284972..000000000 --- a/Frameworks/FeedProvider/xcconfig/FeedProvider_project.xcconfig +++ /dev/null @@ -1,61 +0,0 @@ -CODE_SIGN_IDENTITY = Developer ID Application -DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Manual -PROVISIONING_PROFILE_SPECIFIER = - -// See the notes in NetNewsWire_target.xcconfig on why the -// DeveloperSettings.xcconfig is #included here - -#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" - -SDKROOT = macosx -MACOSX_DEPLOYMENT_TARGET = 10.14 -IPHONEOS_DEPLOYMENT_TARGET = 13.0 -SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator - -CLANG_ENABLE_OBJC_WEAK = YES -SWIFT_VERSION = 5.1 -COMBINE_HIDPI_IMAGES = YES - -COPY_PHASE_STRIP = NO -ALWAYS_SEARCH_USER_PATHS = NO -CURRENT_PROJECT_VERSION = 1 -VERSION_INFO_PREFIX = -VERSIONING_SYSTEM = apple-generic -GCC_NO_COMMON_BLOCKS = YES -GCC_C_LANGUAGE_STANDARD = gnu99 -CLANG_CXX_LANGUAGE_STANDARD = gnu++0x -CLANG_CXX_LIBRARY = libc++ -CLANG_ENABLE_MODULES = YES -CLANG_ENABLE_OBJC_ARC = YES -ENABLE_STRICT_OBJC_MSGSEND = YES -CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES -CLANG_WARN_DOCUMENTATION_COMMENTS = YES -CLANG_WARN_EMPTY_BODY = YES -CLANG_WARN_BOOL_CONVERSION = YES -CLANG_WARN_CONSTANT_CONVERSION = YES -GCC_WARN_64_TO_32_BIT_CONVERSION = YES -CLANG_WARN_ENUM_CONVERSION = YES -CLANG_WARN_INT_CONVERSION = YES -CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES -CLANG_WARN_INFINITE_RECURSION = YES -GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR -CLANG_WARN_STRICT_PROTOTYPES = YES -CLANG_WARN_COMMA = YES -CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE -GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE -CLANG_WARN_UNREACHABLE_CODE = YES -GCC_WARN_UNUSED_FUNCTION = YES -GCC_WARN_UNUSED_VARIABLE = YES -CLANG_WARN_RANGE_LOOP_ANALYSIS = YES -CLANG_WARN_SUSPICIOUS_MOVE = YES -CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR -CLANG_WARN__DUPLICATE_METHOD_MATCH = YES -CLANG_WARN_OBJC_LITERAL_CONVERSION = YES -CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES -GCC_WARN_UNDECLARED_SELECTOR = YES -CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR -CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES -CLANG_ANALYZER_NONNULL = YES -CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE -SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_debug.xcconfig b/Frameworks/FeedProvider/xcconfig/FeedProvider_project_debug.xcconfig deleted file mode 100644 index beca2742a..000000000 --- a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_debug.xcconfig +++ /dev/null @@ -1,15 +0,0 @@ -#include "./FeedProvider_project.xcconfig" - -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 -SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG -SWIFT_COMPILATION_MODE = singlefile -SWIFT_OPTIMIZATION_LEVEL = -Onone -ONLY_ACTIVE_ARCH = YES - - diff --git a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_release.xcconfig b/Frameworks/FeedProvider/xcconfig/FeedProvider_project_release.xcconfig deleted file mode 100644 index 781ad3437..000000000 --- a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_release.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -#include "./FeedProvider_project.xcconfig" - -DEBUG_INFORMATION_FORMAT = dwarf-with-dsym -ENABLE_NS_ASSERTIONS = NO - -MTL_ENABLE_DEBUG_INFO = NO -SWIFT_OPTIMIZATION_LEVEL = -O - -SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_test.xcconfig b/Frameworks/FeedProvider/xcconfig/FeedProvider_project_test.xcconfig deleted file mode 100644 index 5f9ae96a0..000000000 --- a/Frameworks/FeedProvider/xcconfig/FeedProvider_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./FeedProvider_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/Frameworks/FeedProvider/xcconfig/FeedProvider_target.xcconfig b/Frameworks/FeedProvider/xcconfig/FeedProvider_target.xcconfig deleted file mode 100644 index ece936457..000000000 --- a/Frameworks/FeedProvider/xcconfig/FeedProvider_target.xcconfig +++ /dev/null @@ -1,13 +0,0 @@ -INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks -SKIP_INSTALL = YES -DYLIB_COMPATIBILITY_VERSION = 1 -DYLIB_CURRENT_VERSION = 1 -DYLIB_INSTALL_NAME_BASE = @rpath -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks -DEFINES_MODULE = YES -FRAMEWORK_VERSION = A -INFOPLIST_FILE = Info.plist -PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.FeedProvider -PRODUCT_NAME = $(TARGET_NAME) -CLANG_ENABLE_MODULES = YES -APPLICATION_EXTENSION_API_ONLY = YES diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index dc73b5941..5686e21bf 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -45,10 +45,6 @@ 510C43F7243D035C009F70C3 /* ExtensionPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510C43F6243D035C009F70C3 /* ExtensionPoint.swift */; }; 510C43F8243D035C009F70C3 /* ExtensionPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510C43F6243D035C009F70C3 /* ExtensionPoint.swift */; }; 51102165233A7D6C0007A5F7 /* ArticleExtractorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51102164233A7D6C0007A5F7 /* ArticleExtractorButton.swift */; }; - 511076F7243BDA8100D97C8C /* FeedProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; }; - 511076F8243BDA8200D97C8C /* FeedProvider.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 511076F9243BDA9600D97C8C /* FeedProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; }; - 511076FA243BDA9600D97C8C /* FeedProvider.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51107746243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51107745243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift */; }; 51107747243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51107745243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift */; }; 5110C37D2373A8D100A9C04F /* InspectorIconHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5110C37C2373A8D100A9C04F /* InspectorIconHeaderView.swift */; }; @@ -187,8 +183,6 @@ 51938DF3231AFC660055A1A0 /* SearchTimelineFeedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51938DF1231AFC660055A1A0 /* SearchTimelineFeedDelegate.swift */; }; 519B8D332143397200FA689C /* SharingServiceDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519B8D322143397200FA689C /* SharingServiceDelegate.swift */; }; 519E743D22C663F900A78E47 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E743422C663F900A78E47 /* SceneDelegate.swift */; }; - 519ED43F24482629007F8E94 /* FeedProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; }; - 519ED44024482629007F8E94 /* FeedProvider.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51107672243BCE0500D97C8C /* FeedProvider.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 519ED456244828C3007F8E94 /* AddExtensionPointViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519ED455244828C3007F8E94 /* AddExtensionPointViewController.swift */; }; 519ED47A24482AEB007F8E94 /* EnableExtensionPointViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519ED47924482AEB007F8E94 /* EnableExtensionPointViewController.swift */; }; 519ED47C24488C6F007F8E94 /* ExtensionInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519ED47B24488C6F007F8E94 /* ExtensionInspectorViewController.swift */; }; @@ -750,13 +744,6 @@ remoteGlobalIDString = 514BB41A243FFA640023B621; remoteInfo = Secrets; }; - 51107671243BCE0500D97C8C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5110766A243BCE0400D97C8C /* FeedProvider.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 5110765F243BCE0400D97C8C; - remoteInfo = FeedProvider; - }; 5131463C235A7BBE00387FDC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; @@ -1280,7 +1267,6 @@ 51C451F92264C83E00C03939 /* Account.framework in Embed Frameworks */, 51C451F12264C83100C03939 /* ArticlesDatabase.framework in Embed Frameworks */, 517A757C24451C1500B553B9 /* OAuthSwift.framework in Embed Frameworks */, - 519ED44024482629007F8E94 /* FeedProvider.framework in Embed Frameworks */, 51C451F52264C83900C03939 /* Articles.framework in Embed Frameworks */, 51C451E92264C81000C03939 /* RSDatabase.framework in Embed Frameworks */, 51554C31228B71A10055115A /* SyncDatabase.framework in Embed Frameworks */, @@ -1316,7 +1302,6 @@ 65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */, 65ED4077235DEF6C0081F399 /* Articles.framework in Embed Frameworks */, 65ED4078235DEF6C0081F399 /* RSParser.framework in Embed Frameworks */, - 511076FA243BDA9600D97C8C /* FeedProvider.framework in Embed Frameworks */, 65ED4079235DEF6C0081F399 /* SyncDatabase.framework in Embed Frameworks */, 5102FD9C244009FA00534F17 /* Secrets.framework in Embed Frameworks */, 65ED407A235DEF6C0081F399 /* RSCore.framework in Embed Frameworks */, @@ -1356,7 +1341,6 @@ dstSubfolderSpec = 10; files = ( 84C37FAA20DD8D9000CA8CF5 /* RSWeb.framework in Embed Frameworks */, - 511076F8243BDA8200D97C8C /* FeedProvider.framework in Embed Frameworks */, 5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */, 84C37FC620DD8E1D00CA8CF5 /* RSDatabase.framework in Embed Frameworks */, 84C37FAE20DD8D9900CA8CF5 /* RSTree.framework in Embed Frameworks */, @@ -1403,7 +1387,6 @@ 510C43F2243C11FE009F70C3 /* ExtensionPointAddTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionPointAddTableCellView.swift; sourceTree = ""; }; 510C43F6243D035C009F70C3 /* ExtensionPoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionPoint.swift; sourceTree = ""; }; 51102164233A7D6C0007A5F7 /* ArticleExtractorButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleExtractorButton.swift; sourceTree = ""; }; - 5110766A243BCE0400D97C8C /* FeedProvider.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FeedProvider.xcodeproj; path = Frameworks/FeedProvider/FeedProvider.xcodeproj; sourceTree = SOURCE_ROOT; }; 51107745243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionPointPreferencesViewController.swift; sourceTree = ""; }; 5110C37C2373A8D100A9C04F /* InspectorIconHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorIconHeaderView.swift; sourceTree = ""; }; 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = NetNewsWire_iOSapp_target.xcconfig; sourceTree = ""; }; @@ -1863,7 +1846,6 @@ 65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */, 65ED4048235DEF6C0081F399 /* Account.framework in Frameworks */, 65ED4049235DEF6C0081F399 /* Articles.framework in Frameworks */, - 511076F9243BDA9600D97C8C /* FeedProvider.framework in Frameworks */, 65ED404A235DEF6C0081F399 /* RSCore.framework in Frameworks */, 5102FD9B244009FA00534F17 /* Secrets.framework in Frameworks */, 65ED404B235DEF6C0081F399 /* SyncDatabase.framework in Frameworks */, @@ -1892,7 +1874,6 @@ 51C451E82264C81000C03939 /* RSDatabase.framework in Frameworks */, 51E4DB082425F9EB0091EB5B /* CloudKit.framework in Frameworks */, 51C451EC2264C81B00C03939 /* RSCore.framework in Frameworks */, - 519ED43F24482629007F8E94 /* FeedProvider.framework in Frameworks */, 51554C30228B71A10055115A /* SyncDatabase.framework in Frameworks */, 51C451E42264C80600C03939 /* RSParser.framework in Frameworks */, ); @@ -1904,7 +1885,6 @@ files = ( 65ED42DE235E74230081F399 /* Sparkle.framework in Frameworks */, 65ED42D9235E740D0081F399 /* Sparkle.framework in Frameworks */, - 511076F7243BDA8100D97C8C /* FeedProvider.framework in Frameworks */, 84C37FA920DD8D9000CA8CF5 /* RSWeb.framework in Frameworks */, 84C37FC520DD8E1D00CA8CF5 /* RSDatabase.framework in Frameworks */, 84C37FAD20DD8D9900CA8CF5 /* RSTree.framework in Frameworks */, @@ -1951,14 +1931,6 @@ path = ExtensionPoints; sourceTree = ""; }; - 5110766B243BCE0400D97C8C /* Products */ = { - isa = PBXGroup; - children = ( - 51107672243BCE0500D97C8C /* FeedProvider.framework */, - ); - name = Products; - sourceTree = ""; - }; 51107744243BEDD300D97C8C /* ExtensionPoints */ = { isa = PBXGroup; children = ( @@ -2776,7 +2748,6 @@ isa = PBXGroup; children = ( 846E77301F6EF5D600A165E2 /* Account.xcodeproj */, - 5110766A243BCE0400D97C8C /* FeedProvider.xcodeproj */, 5102FD72244008A700534F17 /* Secrets.xcodeproj */, 841D4D542106B3D500DD04E6 /* Articles.xcodeproj */, 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */, @@ -3356,10 +3327,6 @@ ProductGroup = 8407167A2262A61100344432 /* Products */; ProjectRef = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */; }, - { - ProductGroup = 5110766B243BCE0400D97C8C /* Products */; - ProjectRef = 5110766A243BCE0400D97C8C /* FeedProvider.xcodeproj */; - }, { ProductGroup = 517A754524451BD500B553B9 /* Products */; ProjectRef = 517A754424451BD500B553B9 /* OAuthSwift.xcodeproj */; @@ -3420,13 +3387,6 @@ remoteRef = 5102FD7A244008A700534F17 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 51107672243BCE0500D97C8C /* FeedProvider.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = FeedProvider.framework; - remoteRef = 51107671243BCE0500D97C8C /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 51554C01228B6EB50055115A /* SyncDatabase.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/Shared/ExtensionPoints/ExtensionPointIdentifer.swift b/Shared/ExtensionPoints/ExtensionPointIdentifer.swift index 0ecbe5ff7..4709ffd2b 100644 --- a/Shared/ExtensionPoints/ExtensionPointIdentifer.swift +++ b/Shared/ExtensionPoints/ExtensionPointIdentifer.swift @@ -7,7 +7,7 @@ // import Foundation -import FeedProvider +import Account import RSCore enum ExtensionPointIdentifer: Hashable { diff --git a/Shared/ExtensionPoints/ExtensionPointManager.swift b/Shared/ExtensionPoints/ExtensionPointManager.swift index 4cc3b7a41..f620a5b04 100644 --- a/Shared/ExtensionPoints/ExtensionPointManager.swift +++ b/Shared/ExtensionPoints/ExtensionPointManager.swift @@ -7,7 +7,7 @@ // import Foundation -import FeedProvider +import Account import RSCore import OAuthSwift diff --git a/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift b/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift index eee2b444a..aa014d7c0 100644 --- a/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift +++ b/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift @@ -7,10 +7,7 @@ // import Foundation -import FeedProvider -import RSCore -import OAuthSwift -import Secrets +import Account extension TwitterFeedProvider: ExtensionPoint { @@ -18,7 +15,7 @@ extension TwitterFeedProvider: ExtensionPoint { static var title = NSLocalizedString("Twitter", comment: "Twitter") static var templateImage = AppAssets.extensionPointTwitter static var description: NSAttributedString = { - return TwitterFeedProvider.makeAttrString("This extension enables you to subscribe to Twitter URL's as if they were RSS feeds.") + return TwitterFeedProvider.makeAttrString("This extension enables you to subscribe to Twitter URL's as if they were RSS feeds. It only works with \(Account.defaultLocalAccountName) or iCloud accounts.") }() var extensionPointID: ExtensionPointIdentifer {