renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert RSDatabase into swift packages

Browse Source
This commit is contained in:
Maurice Parker
2020-07-29 19:48:54 -05:00
parent 9bd6f9e0fd
commit 2fbee1eb03
19 changed files with 159 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,8 @@
519E84A62433D49000D238B0 /* OPMLNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84A52433D49000D238B0 /* OPMLNormalizer.swift */; };
519E84A82434C5EF00D238B0 /* CloudKitArticlesZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84A72434C5EF00D238B0 /* CloudKitArticlesZone.swift */; };
519E84AC2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84AB2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift */; };
51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; };
51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B36305244B6135000DEF2A /* TwitterEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36304244B6135000DEF2A /* TwitterEntities.swift */; };
51B36307244B6234000DEF2A /* TwitterHashtag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36306244B6234000DEF2A /* TwitterHashtag.swift */; };
51B36309244B62A5000DEF2A /* TwitterURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36308244B62A5000DEF2A /* TwitterURL.swift */; };
@@ -137,7 +139,6 @@
84C8B3F41F89DE430053CCA6 /* DataExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */; };
84CAD7161FDF2E22000F0755 /* FeedbinEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CAD7151FDF2E22000F0755 /* FeedbinEntry.swift */; };
84D09623217418DC00D77525 /* FeedbinTagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D09622217418DC00D77525 /* FeedbinTagging.swift */; };
84EAC4822148CC6300F154AB /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAC4812148CC6300F154AB /* RSDatabase.framework */; };
84F1F06E2243524700DA0616 /* AccountMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AF4EA3222CFDD100F6A800 /* AccountMetadata.swift */; };
84F73CF1202788D90000BCEF /* ArticleFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F73CF0202788D80000BCEF /* ArticleFetcher.swift */; };
9E03C11C235D921400FB6D9E /* FeedlyOperationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E03C11B235D921400FB6D9E /* FeedlyOperationTests.swift */; };
@@ -280,6 +281,7 @@
files = (
51383A4724D1FF160027E272 /* RSWeb in Embed Frameworks */,
51383A4424D1FF030027E272 /* RSCore in Embed Frameworks */,
51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -533,10 +535,10 @@
buildActionMask = 2147483647;
files = (
51383A4624D1FF160027E272 /* RSWeb in Frameworks */,
84EAC4822148CC6300F154AB /* RSDatabase.framework in Frameworks */,
841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */,
841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */,
51383A4324D1FF030027E272 /* RSCore in Frameworks */,
51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */,
51E148EC234B8FFC0004F7A5 /* SyncDatabase.framework in Frameworks */,
841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
5102FD80244009E000534F17 /* Secrets.framework in Frameworks */,
@@ -1034,6 +1036,7 @@
packageProductDependencies = (
51383A4224D1FF030027E272 /* RSCore */,
51383A4524D1FF160027E272 /* RSWeb */,
51B0DF1A24D24F12000AD99E /* RSDatabase */,
);
productName = Account;
productReference = 848934F61F62484F00CEBD24 /* Account.framework */;
@@ -1089,6 +1092,7 @@
packageReferences = (
5102AE8024D180A80050839C /* XCRemoteSwiftPackageReference "RSCore" */,
51383A3E24D1FE9A0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */,
51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
);
productRefGroup = 848934F71F62484F00CEBD24 /* Products */;
projectDirPath = "";
@@ -1509,6 +1513,14 @@
minimumVersion = "1.0.0-beta2";
};
};
51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "1.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@@ -1522,6 +1534,11 @@
package = 51383A3E24D1FE9A0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */;
productName = RSWeb;
};
51B0DF1A24D24F12000AD99E /* RSDatabase */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 848934ED1F62484F00CEBD24 /* Project object */;

21
Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
View File

@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
5102AE8C24D181080050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE8B24D181080050839C /* RSCore */; };
5102AE8D24D181080050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE8B24D181080050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; };
51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51C451FE2264CF2100C03939 /* RSParser.framework */; };
84116B8923E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84116B8823E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift */; };
841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D732106B59F00DD04E6 /* Articles.framework */; };
@@ -24,7 +26,6 @@
8455807A1F0AF67D003CCFA1 /* ArticleStatus+Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845580791F0AF67D003CCFA1 /* ArticleStatus+Database.swift */; };
84611DCC23E62FE200BC630C /* FetchUnreadCountsForFeedsOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84611DCB23E62FE200BC630C /* FetchUnreadCountsForFeedsOperation.swift */; };
8477ACBC2221E76F00DF7F37 /* SearchTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477ACBB2221E76F00DF7F37 /* SearchTable.swift */; };
848E3EBD20FBCFDE0004B7ED /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 848E3EBC20FBCFDE0004B7ED /* RSDatabase.framework */; };
84C242C923DEB45C00C50516 /* FetchAllUnreadCountsOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C242C823DEB45C00C50516 /* FetchAllUnreadCountsOperation.swift */; };
84E156EA1F0AB80500F8CC05 /* ArticlesDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E156E91F0AB80500F8CC05 /* ArticlesDatabase.swift */; };
84E156EC1F0AB80E00F8CC05 /* ArticlesTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E156EB1F0AB80E00F8CC05 /* ArticlesTable.swift */; };
@@ -119,6 +120,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */,
5102AE8D24D181080050839C /* RSCore in Embed Frameworks */,
);
name = "Embed Frameworks";
@@ -169,10 +171,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */,
5102AE8C24D181080050839C /* RSCore in Frameworks */,
51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */,
841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */,
848E3EBD20FBCFDE0004B7ED /* RSDatabase.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -346,6 +348,7 @@
name = ArticlesDatabase;
packageProductDependencies = (
5102AE8B24D181080050839C /* RSCore */,
51B0DF1624D24EC4000AD99E /* RSDatabase */,
);
productName = Database;
productReference = 844BEE371F0AB3AA004AB7CD /* ArticlesDatabase.framework */;
@@ -403,6 +406,7 @@
mainGroup = 844BEE2D1F0AB3AA004AB7CD;
packageReferences = (
5102AE8A24D181080050839C /* XCRemoteSwiftPackageReference "RSCore" */,
51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
);
productRefGroup = 844BEE381F0AB3AA004AB7CD /* Products */;
projectDirPath = "";
@@ -669,6 +673,14 @@
minimumVersion = "1.0.0-beta1";
};
};
51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "1.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@@ -677,6 +689,11 @@
package = 5102AE8A24D181080050839C /* XCRemoteSwiftPackageReference "RSCore" */;
productName = RSCore;
};
51B0DF1624D24EC4000AD99E /* RSDatabase */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 844BEE2E1F0AB3AA004AB7CD /* Project object */;

1
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
import RSParser
import Articles

1
Frameworks/ArticlesDatabase/AuthorsTable.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import RSDatabase
import RSDatabaseObjC
import Articles
// article->authors is a many-to-many relationship.

1
Frameworks/ArticlesDatabase/Extensions/Article+Database.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import RSDatabase
import RSDatabaseObjC
import Articles
import RSParser

1
Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import RSDatabase
import RSDatabaseObjC
import Articles
extension ArticleStatus {

1
Frameworks/ArticlesDatabase/Extensions/Author+Database.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import Articles
import RSDatabase
import RSDatabaseObjC
import RSParser
// MARK: - DatabaseObject

1
Frameworks/ArticlesDatabase/Operations/FetchAllUnreadCountsOperation.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
public final class FetchAllUnreadCountsOperation: MainThreadOperation {

1
Frameworks/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
/// Fetch the unread count for a single feed.
public final class FetchFeedUnreadCountOperation: MainThreadOperation {

1
Frameworks/ArticlesDatabase/Operations/FetchUnreadCountsForFeedsOperation.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
/// Fetch the unread counts for a number of feeds.
public final class FetchUnreadCountsForFeedsOperation: MainThreadOperation {

1
Frameworks/ArticlesDatabase/SearchTable.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
import Articles
import RSParser

1
Frameworks/ArticlesDatabase/StatusesTable.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import RSCore
import RSDatabase
import RSDatabaseObjC
import Articles
// Article->ArticleStatus is a to-one relationship.

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

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {
/* Begin PBXBuildFile section */
@@ -14,11 +14,26 @@
51554C1F228B701F0055115A /* SyncDatabase_project_debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */; };
51554C21228B701F0055115A /* SyncDatabase_project_release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */; };
51554C22228B701F0055115A /* SyncDatabase_target.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1D228B701F0055115A /* SyncDatabase_target.xcconfig */; };
51554C36228B72F40055115A /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C35228B72F40055115A /* RSDatabase.framework */; };
51554C38228B7DAC0055115A /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51554C37228B7DAC0055115A /* Constants.swift */; };
51554C3A228B83380055115A /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C39228B83380055115A /* Articles.framework */; };
51B0DF1324D24EA6000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1224D24EA6000AD99E /* RSDatabase */; };
51B0DF1424D24EA6000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1224D24EA6000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
51B0DEC524D245A2000AD99E /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
51B0DF1424D24EA6000AD99E /* RSDatabase in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
51554BEB228B6E8F0055115A /* SyncDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SyncDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
51554BEF228B6E8F0055115A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -39,8 +54,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
51B0DF1324D24EA6000AD99E /* RSDatabase in Frameworks */,
51554C3A228B83380055115A /* Articles.framework in Frameworks */,
51554C36228B72F40055115A /* RSDatabase.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -111,12 +126,16 @@
51554BE8228B6E8F0055115A /* Frameworks */,
51554BE9228B6E8F0055115A /* Resources */,
51C8F349234FB0C40048ED95 /* Run Script: Verfiy No Build Settings */,
51B0DEC524D245A2000AD99E /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = SyncDatabase;
packageProductDependencies = (
51B0DF1224D24EA6000AD99E /* RSDatabase */,
);
productName = SyncDatabase;
productReference = 51554BEB228B6E8F0055115A /* SyncDatabase.framework */;
productType = "com.apple.product-type.framework";
@@ -143,6 +162,9 @@
en,
);
mainGroup = 51554BE1228B6E8F0055115A;
packageReferences = (
51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
);
productRefGroup = 51554BEC228B6E8F0055115A /* Products */;
projectDirPath = "";
projectRoot = "";
@@ -252,6 +274,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "1.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
51B0DF1224D24EA6000AD99E /* RSDatabase */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 51554BE2228B6E8F0055115A /* Project object */;
}

1
Frameworks/SyncDatabase/SyncStatusTable.swift
View File

@@ -10,6 +10,7 @@ import Foundation
import RSCore
import Articles
import RSDatabase
import RSDatabaseObjC
struct SyncStatusTable: DatabaseTable {