Move files in CloudKitExtras to CloudKitSync. Two modules was just overkill for this — code got too spread out.
This commit is contained in:
parent
83e73821f4
commit
bdb5a12234
|
@ -19,7 +19,6 @@ let package = Package(
|
||||||
.package(path: "../Database"),
|
.package(path: "../Database"),
|
||||||
.package(path: "../SyncDatabase"),
|
.package(path: "../SyncDatabase"),
|
||||||
.package(path: "../Core"),
|
.package(path: "../Core"),
|
||||||
.package(path: "../CloudKitExtras"),
|
|
||||||
.package(path: "../ReaderAPI"),
|
.package(path: "../ReaderAPI"),
|
||||||
.package(path: "../CloudKitSync"),
|
.package(path: "../CloudKitSync"),
|
||||||
.package(path: "../NewsBlur"),
|
.package(path: "../NewsBlur"),
|
||||||
|
@ -41,7 +40,6 @@ let package = Package(
|
||||||
"SyncDatabase",
|
"SyncDatabase",
|
||||||
"Database",
|
"Database",
|
||||||
"Core",
|
"Core",
|
||||||
"CloudKitExtras",
|
|
||||||
"ReaderAPI",
|
"ReaderAPI",
|
||||||
"NewsBlur",
|
"NewsBlur",
|
||||||
"CloudKitSync",
|
"CloudKitSync",
|
||||||
|
|
|
@ -17,7 +17,6 @@ import ArticlesDatabase
|
||||||
import Web
|
import Web
|
||||||
import Secrets
|
import Secrets
|
||||||
import Core
|
import Core
|
||||||
import CloudKitExtras
|
|
||||||
import CommonErrors
|
import CommonErrors
|
||||||
import FeedFinder
|
import FeedFinder
|
||||||
import LocalAccount
|
import LocalAccount
|
||||||
|
|
|
@ -11,7 +11,6 @@ import os.log
|
||||||
import Web
|
import Web
|
||||||
import CloudKit
|
import CloudKit
|
||||||
import Articles
|
import Articles
|
||||||
import CloudKitExtras
|
|
||||||
import CloudKitSync
|
import CloudKitSync
|
||||||
|
|
||||||
@MainActor final class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
|
@MainActor final class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
|
||||||
|
|
|
@ -15,7 +15,6 @@ import SyncDatabase
|
||||||
import Articles
|
import Articles
|
||||||
import ArticlesDatabase
|
import ArticlesDatabase
|
||||||
import Database
|
import Database
|
||||||
import CloudKitExtras
|
|
||||||
import CloudKitSync
|
import CloudKitSync
|
||||||
|
|
||||||
final class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate {
|
final class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate {
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
.DS_Store
|
|
||||||
/.build
|
|
||||||
/Packages
|
|
||||||
xcuserdata/
|
|
||||||
DerivedData/
|
|
||||||
.swiftpm/configuration/registries.json
|
|
||||||
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
|
|
||||||
.netrc
|
|
|
@ -1,29 +0,0 @@
|
||||||
// swift-tools-version: 5.10
|
|
||||||
|
|
||||||
import PackageDescription
|
|
||||||
|
|
||||||
let package = Package(
|
|
||||||
name: "CloudKitExtras",
|
|
||||||
platforms: [.macOS(.v14), .iOS(.v17)],
|
|
||||||
products: [
|
|
||||||
.library(
|
|
||||||
name: "CloudKitExtras",
|
|
||||||
targets: ["CloudKitExtras"]),
|
|
||||||
],
|
|
||||||
dependencies: [
|
|
||||||
.package(path: "../FoundationExtras")
|
|
||||||
],
|
|
||||||
targets: [
|
|
||||||
.target(
|
|
||||||
name: "CloudKitExtras",
|
|
||||||
dependencies: ["FoundationExtras"],
|
|
||||||
swiftSettings: [
|
|
||||||
.enableExperimentalFeature("StrictConcurrency")
|
|
||||||
]
|
|
||||||
),
|
|
||||||
.testTarget(
|
|
||||||
name: "CloudKitExtrasTests",
|
|
||||||
dependencies: ["CloudKitExtras"]
|
|
||||||
)
|
|
||||||
]
|
|
||||||
)
|
|
|
@ -1,12 +0,0 @@
|
||||||
import XCTest
|
|
||||||
@testable import CloudKitExtras
|
|
||||||
|
|
||||||
final class CloudKitExtrasTests: XCTestCase {
|
|
||||||
func testExample() throws {
|
|
||||||
// XCTest Documentation
|
|
||||||
// https://developer.apple.com/documentation/xctest
|
|
||||||
|
|
||||||
// Defining Test Cases and Test Methods
|
|
||||||
// https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -11,7 +11,6 @@ let package = Package(
|
||||||
targets: ["CloudKitSync"]),
|
targets: ["CloudKitSync"]),
|
||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
.package(path: "../CloudKitExtras"),
|
|
||||||
.package(path: "../SyncDatabase"),
|
.package(path: "../SyncDatabase"),
|
||||||
.package(path: "../Articles"),
|
.package(path: "../Articles"),
|
||||||
.package(path: "../Core"),
|
.package(path: "../Core"),
|
||||||
|
@ -22,7 +21,6 @@ let package = Package(
|
||||||
.target(
|
.target(
|
||||||
name: "CloudKitSync",
|
name: "CloudKitSync",
|
||||||
dependencies: [
|
dependencies: [
|
||||||
"CloudKitExtras",
|
|
||||||
"SyncDatabase",
|
"SyncDatabase",
|
||||||
"Articles",
|
"Articles",
|
||||||
"Core",
|
"Core",
|
||||||
|
|
|
@ -13,7 +13,6 @@ import Parser
|
||||||
import ParserObjC
|
import ParserObjC
|
||||||
import CloudKit
|
import CloudKit
|
||||||
import FoundationExtras
|
import FoundationExtras
|
||||||
import CloudKitExtras
|
|
||||||
|
|
||||||
enum CloudKitAccountZoneError: LocalizedError {
|
enum CloudKitAccountZoneError: LocalizedError {
|
||||||
case unknown
|
case unknown
|
||||||
|
|
|
@ -14,7 +14,6 @@ import Web
|
||||||
import CloudKit
|
import CloudKit
|
||||||
import Articles
|
import Articles
|
||||||
import SyncDatabase
|
import SyncDatabase
|
||||||
import CloudKitExtras
|
|
||||||
|
|
||||||
public protocol CloudKitFeedInfoDelegate {
|
public protocol CloudKitFeedInfoDelegate {
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@ import Web
|
||||||
import SyncDatabase
|
import SyncDatabase
|
||||||
import Database
|
import Database
|
||||||
import Core
|
import Core
|
||||||
import CloudKitExtras
|
|
||||||
|
|
||||||
public protocol CloudKitSendStatusOperationDelegate: AnyObject {
|
public protocol CloudKitSendStatusOperationDelegate: AnyObject {
|
||||||
|
|
||||||
|
|
|
@ -1391,7 +1391,6 @@
|
||||||
84DC5FFD2BCE37A300F04682 /* AppDelegate+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Shared.swift"; sourceTree = "<group>"; };
|
84DC5FFD2BCE37A300F04682 /* AppDelegate+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Shared.swift"; sourceTree = "<group>"; };
|
||||||
84DCA50D2BAB643700792720 /* FoundationExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FoundationExtras; sourceTree = "<group>"; };
|
84DCA50D2BAB643700792720 /* FoundationExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FoundationExtras; sourceTree = "<group>"; };
|
||||||
84DCA50E2BABB5D800792720 /* AppKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppKitExtras; sourceTree = "<group>"; };
|
84DCA50E2BABB5D800792720 /* AppKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppKitExtras; sourceTree = "<group>"; };
|
||||||
84DCA50F2BABB65600792720 /* CloudKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CloudKitExtras; sourceTree = "<group>"; };
|
|
||||||
84DCA5102BABB6A100792720 /* UIKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = UIKitExtras; sourceTree = "<group>"; };
|
84DCA5102BABB6A100792720 /* UIKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = UIKitExtras; sourceTree = "<group>"; };
|
||||||
84DCA5232BABBA8100792720 /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = "<group>"; };
|
84DCA5232BABBA8100792720 /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = "<group>"; };
|
||||||
84DEE56422C32CA4005FC42C /* SmartFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedDelegate.swift; sourceTree = "<group>"; };
|
84DEE56422C32CA4005FC42C /* SmartFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedDelegate.swift; sourceTree = "<group>"; };
|
||||||
|
@ -2303,7 +2302,6 @@
|
||||||
51CD32A824D2CB25009ABAEF /* SyncDatabase */,
|
51CD32A824D2CB25009ABAEF /* SyncDatabase */,
|
||||||
841550F42B9E3F8000D4B345 /* Database */,
|
841550F42B9E3F8000D4B345 /* Database */,
|
||||||
841550F52B9E4D6800D4B345 /* FMDB */,
|
841550F52B9E4D6800D4B345 /* FMDB */,
|
||||||
84DCA50F2BABB65600792720 /* CloudKitExtras */,
|
|
||||||
849FEDC32BBB225E0053FB21 /* Web */,
|
849FEDC32BBB225E0053FB21 /* Web */,
|
||||||
846799F42BBD120A000854CB /* Parser */,
|
846799F42BBD120A000854CB /* Parser */,
|
||||||
84DCA5232BABBA8100792720 /* Core */,
|
84DCA5232BABBA8100792720 /* Core */,
|
||||||
|
|
Loading…
Reference in New Issue