FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove explicit dependencies and fix iOS sync database dependency

This commit is contained in:
Maurice Parker 2019-10-07 10:53:05 -05:00
parent 72f95c6fab
commit 590b2d5874
3 changed files with 22 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Frameworks/Account/Account.xcodeproj/project.pbxproj
View File

@ -38,6 +38,8 @@
51D5875B227F630B00900287 /* tags_add.json in Resources */ = {isa = PBXBuildFile; fileRef = 51D58758227F630B00900287 /* tags_add.json */; }; 51D5875B227F630B00900287 /* tags_add.json in Resources */ = {isa = PBXBuildFile; fileRef = 51D58758227F630B00900287 /* tags_add.json */; };
51D5875C227F630B00900287 /* tags_initial.json in Resources */ = {isa = PBXBuildFile; fileRef = 51D58759227F630B00900287 /* tags_initial.json */; }; 51D5875C227F630B00900287 /* tags_initial.json in Resources */ = {isa = PBXBuildFile; fileRef = 51D58759227F630B00900287 /* tags_initial.json */; };
51D5875E227F643C00900287 /* AccountFolderSyncTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D5875D227F643C00900287 /* AccountFolderSyncTest.swift */; }; 51D5875E227F643C00900287 /* AccountFolderSyncTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D5875D227F643C00900287 /* AccountFolderSyncTest.swift */; };
51E148EC234B8FFC0004F7A5 /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E148EB234B8FFC0004F7A5 /* SyncDatabase.framework */; };
51E148ED234B8FFC0004F7A5 /* SyncDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51E148EB234B8FFC0004F7A5 /* SyncDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
51E3EB41229AF61B00645299 /* AccountError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E3EB40229AF61B00645299 /* AccountError.swift */; }; 51E3EB41229AF61B00645299 /* AccountError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E3EB40229AF61B00645299 /* AccountError.swift */; };
51E490362288C37100C791F0 /* FeedbinDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E490352288C37100C791F0 /* FeedbinDate.swift */; }; 51E490362288C37100C791F0 /* FeedbinDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E490352288C37100C791F0 /* FeedbinDate.swift */; };
51E59599228C77BC00FCC42B /* FeedbinUnreadEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */; }; 51E59599228C77BC00FCC42B /* FeedbinUnreadEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */; };
@ -160,6 +162,20 @@
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
51E148EE234B8FFC0004F7A5 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
51E148ED234B8FFC0004F7A5 /* SyncDatabase.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
5107A098227DE42E00C7C3C5 /* AccountCredentialsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCredentialsTest.swift; sourceTree = "<group>"; }; 5107A098227DE42E00C7C3C5 /* AccountCredentialsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCredentialsTest.swift; sourceTree = "<group>"; };
5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAccountManager.swift; sourceTree = "<group>"; }; 5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAccountManager.swift; sourceTree = "<group>"; };
@ -192,6 +208,7 @@
51D58758227F630B00900287 /* tags_add.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = tags_add.json; sourceTree = "<group>"; }; 51D58758227F630B00900287 /* tags_add.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = tags_add.json; sourceTree = "<group>"; };
51D58759227F630B00900287 /* tags_initial.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = tags_initial.json; sourceTree = "<group>"; }; 51D58759227F630B00900287 /* tags_initial.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = tags_initial.json; sourceTree = "<group>"; };
51D5875D227F643C00900287 /* AccountFolderSyncTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountFolderSyncTest.swift; sourceTree = "<group>"; }; 51D5875D227F643C00900287 /* AccountFolderSyncTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountFolderSyncTest.swift; sourceTree = "<group>"; };
51E148EB234B8FFC0004F7A5 /* SyncDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SyncDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
51E3EB40229AF61B00645299 /* AccountError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountError.swift; sourceTree = "<group>"; }; 51E3EB40229AF61B00645299 /* AccountError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountError.swift; sourceTree = "<group>"; };
51E490352288C37100C791F0 /* FeedbinDate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinDate.swift; sourceTree = "<group>"; }; 51E490352288C37100C791F0 /* FeedbinDate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinDate.swift; sourceTree = "<group>"; };
51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinUnreadEntry.swift; sourceTree = "<group>"; }; 51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinUnreadEntry.swift; sourceTree = "<group>"; };
@ -286,6 +303,7 @@
844B2981210CE3BF004020B3 /* RSWeb.framework in Frameworks */, 844B2981210CE3BF004020B3 /* RSWeb.framework in Frameworks */,
841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */, 841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */,
841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */, 841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */,
51E148EC234B8FFC0004F7A5 /* SyncDatabase.framework in Frameworks */,
841973FE1F6DD1BC006346C4 /* RSCore.framework in Frameworks */, 841973FE1F6DD1BC006346C4 /* RSCore.framework in Frameworks */,
841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */, 841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
); );
@ -402,6 +420,7 @@
8469F80F1F6DC3C10084783E /* Frameworks */ = { 8469F80F1F6DC3C10084783E /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
51E148EB234B8FFC0004F7A5 /* SyncDatabase.framework */,
84EAC4812148CC6300F154AB /* RSDatabase.framework */, 84EAC4812148CC6300F154AB /* RSDatabase.framework */,
844B2980210CE3BF004020B3 /* RSWeb.framework */, 844B2980210CE3BF004020B3 /* RSWeb.framework */,
841D4D712106B40A00DD04E6 /* Articles.framework */, 841D4D712106B40A00DD04E6 /* Articles.framework */,
@ -599,6 +618,7 @@
848934F21F62484F00CEBD24 /* Frameworks */, 848934F21F62484F00CEBD24 /* Frameworks */,
848934F31F62484F00CEBD24 /* Headers */, 848934F31F62484F00CEBD24 /* Headers */,
848934F41F62484F00CEBD24 /* Resources */, 848934F41F62484F00CEBD24 /* Resources */,
51E148EE234B8FFC0004F7A5 /* Embed Frameworks */,
); );
buildRules = ( buildRules = (
); );

2
Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj
View File

@ -184,6 +184,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */; baseConfigurationReference = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */;
buildSettings = { buildSettings = {
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
}; };
name = Debug; name = Debug;
}; };
@ -191,6 +192,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */; baseConfigurationReference = 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */;
buildSettings = { buildSettings = {
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
}; };
name = Release; name = Release;
}; };

130
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -407,13 +407,6 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
513C5CEE232571C2003D4054 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 513C5CE5232571C2003D4054;
remoteInfo = "NetNewsWire iOS Share Extension";
};
51554C00228B6EB50055115A /* PBXContainerItemProxy */ = { 51554C00228B6EB50055115A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 51554BFC228B6EB50055115A /* SyncDatabase.xcodeproj */; containerPortal = 51554BFC228B6EB50055115A /* SyncDatabase.xcodeproj */;
@ -428,13 +421,6 @@
remoteGlobalIDString = 51554BEA228B6E8F0055115A; remoteGlobalIDString = 51554BEA228B6E8F0055115A;
remoteInfo = SyncDatabase; remoteInfo = SyncDatabase;
}; };
51554C32228B71A10055115A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 51554BFC228B6EB50055115A /* SyncDatabase.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 51554BEA228B6E8F0055115A;
remoteInfo = SyncDatabase;
};
51C451AB226377C300C03939 /* PBXContainerItemProxy */ = { 51C451AB226377C300C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */; containerPortal = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
@ -456,62 +442,6 @@
remoteGlobalIDString = 848934F51F62484F00CEBD24; remoteGlobalIDString = 848934F51F62484F00CEBD24;
remoteInfo = Account; remoteInfo = Account;
}; };
51C451D42264C7F200C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 849C08D41E0CACA3006B03FA;
remoteInfo = RSWebiOS;
};
51C451E22264C7F900C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8F20DD8CFD00CA8CF5 /* RSTree.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 842A0BE01CFCB9BC00BF746C;
remoteInfo = RSTree;
};
51C451E62264C80600C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 84FF5F831EFA285800C15A01;
remoteInfo = RSParser;
};
51C451EA2264C81000C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8400ABF61E0CFBD800AA7C57;
remoteInfo = RSDatabaseiOS;
};
51C451EE2264C81B00C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F7A20DD8CF200CA8CF5 /* RSCore.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 842DD7BB1E14993900E061EB;
remoteInfo = RSCoreiOS;
};
51C451F22264C83100C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 844BEE361F0AB3AA004AB7CD;
remoteInfo = ArticlesDatabase;
};
51C451F62264C83900C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 841D4D542106B3D500DD04E6 /* Articles.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 844BEE5A1F0AB3C8004AB7CD;
remoteInfo = Articles;
};
51C451FA2264C83E00C03939 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 846E77301F6EF5D600A165E2 /* Account.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 848934F51F62484F00CEBD24;
remoteInfo = Account;
};
840716692262A60D00344432 /* PBXContainerItemProxy */ = { 840716692262A60D00344432 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 846E77301F6EF5D600A165E2 /* Account.xcodeproj */; containerPortal = 846E77301F6EF5D600A165E2 /* Account.xcodeproj */;
@ -2203,16 +2133,6 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
51C451D52264C7F200C03939 /* PBXTargetDependency */,
51C451E32264C7F900C03939 /* PBXTargetDependency */,
51C451E72264C80600C03939 /* PBXTargetDependency */,
51C451EB2264C81000C03939 /* PBXTargetDependency */,
51C451EF2264C81B00C03939 /* PBXTargetDependency */,
51C451F32264C83100C03939 /* PBXTargetDependency */,
51C451F72264C83900C03939 /* PBXTargetDependency */,
51C451FB2264C83E00C03939 /* PBXTargetDependency */,
51554C33228B71A10055115A /* PBXTargetDependency */,
513C5CEF232571C2003D4054 /* PBXTargetDependency */,
); );
name = "NetNewsWire-iOS"; name = "NetNewsWire-iOS";
productName = "NetNewsWire-iOS"; productName = "NetNewsWire-iOS";
@ -3078,21 +2998,11 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
513C5CEF232571C2003D4054 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 513C5CE5232571C2003D4054 /* NetNewsWire iOS Share Extension */;
targetProxy = 513C5CEE232571C2003D4054 /* PBXContainerItemProxy */;
};
51554C27228B71910055115A /* PBXTargetDependency */ = { 51554C27228B71910055115A /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = SyncDatabase; name = SyncDatabase;
targetProxy = 51554C26228B71910055115A /* PBXContainerItemProxy */; targetProxy = 51554C26228B71910055115A /* PBXContainerItemProxy */;
}; };
51554C33228B71A10055115A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = SyncDatabase;
targetProxy = 51554C32228B71A10055115A /* PBXContainerItemProxy */;
};
51C451AC226377C300C03939 /* PBXTargetDependency */ = { 51C451AC226377C300C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = ArticlesDatabase; name = ArticlesDatabase;
@ -3108,46 +3018,6 @@
name = Account; name = Account;
targetProxy = 51C451BF226377D000C03939 /* PBXContainerItemProxy */; targetProxy = 51C451BF226377D000C03939 /* PBXContainerItemProxy */;
}; };
51C451D52264C7F200C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSWebiOS;
targetProxy = 51C451D42264C7F200C03939 /* PBXContainerItemProxy */;
};
51C451E32264C7F900C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSTree;
targetProxy = 51C451E22264C7F900C03939 /* PBXContainerItemProxy */;
};
51C451E72264C80600C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSParser;
targetProxy = 51C451E62264C80600C03939 /* PBXContainerItemProxy */;
};
51C451EB2264C81000C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSDatabaseiOS;
targetProxy = 51C451EA2264C81000C03939 /* PBXContainerItemProxy */;
};
51C451EF2264C81B00C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSCoreiOS;
targetProxy = 51C451EE2264C81B00C03939 /* PBXContainerItemProxy */;
};
51C451F32264C83100C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ArticlesDatabase;
targetProxy = 51C451F22264C83100C03939 /* PBXContainerItemProxy */;
};
51C451F72264C83900C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Articles;
targetProxy = 51C451F62264C83900C03939 /* PBXContainerItemProxy */;
};
51C451FB2264C83E00C03939 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Account;
targetProxy = 51C451FA2264C83E00C03939 /* PBXContainerItemProxy */;
};
849C64731ED37A5D003D8FC0 /* PBXTargetDependency */ = { 849C64731ED37A5D003D8FC0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 849C645F1ED37A5D003D8FC0 /* NetNewsWire */; target = 849C645F1ED37A5D003D8FC0 /* NetNewsWire */;