From bdb5a12234cbb95957d519f648aac586689ec795 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 22 Apr 2024 18:07:21 -0700 Subject: [PATCH] =?UTF-8?q?Move=20files=20in=20CloudKitExtras=20to=20Cloud?= =?UTF-8?q?KitSync.=20Two=20modules=20was=20just=20overkill=20for=20this?= =?UTF-8?q?=20=E2=80=94=20code=20got=20too=20spread=20out.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Account/Package.swift | 2 -- .../CloudKitAccountDelegate.swift | 1 - .../CloudKitAccountZoneDelegate.swift | 1 - .../CloudKitArticlesZoneDelegate.swift | 1 - CloudKitExtras/.gitignore | 8 ----- CloudKitExtras/Package.swift | 29 ------------------- .../CloudKitExtrasTests.swift | 12 -------- CloudKitSync/Package.swift | 2 -- .../CloudKitSync/CloudKitAccountZone.swift | 1 - .../CloudKitSync/CloudKitArticlesZone.swift | 1 - .../Sources/CloudKitSync}/CloudKitError.swift | 0 .../CloudKitSendStatusOperation.swift | 1 - .../Sources/CloudKitSync}/CloudKitZone.swift | 0 .../CloudKitSync}/CloudKitZoneResult.swift | 0 NetNewsWire.xcodeproj/project.pbxproj | 2 -- 15 files changed, 61 deletions(-) delete mode 100644 CloudKitExtras/.gitignore delete mode 100644 CloudKitExtras/Package.swift delete mode 100644 CloudKitExtras/Tests/CloudKitExtrasTests/CloudKitExtrasTests.swift rename {CloudKitExtras/Sources/CloudKitExtras => CloudKitSync/Sources/CloudKitSync}/CloudKitError.swift (100%) rename {CloudKitExtras/Sources/CloudKitExtras => CloudKitSync/Sources/CloudKitSync}/CloudKitZone.swift (100%) rename {CloudKitExtras/Sources/CloudKitExtras => CloudKitSync/Sources/CloudKitSync}/CloudKitZoneResult.swift (100%) diff --git a/Account/Package.swift b/Account/Package.swift index 2aac255df..8382fd9b0 100644 --- a/Account/Package.swift +++ b/Account/Package.swift @@ -19,7 +19,6 @@ let package = Package( .package(path: "../Database"), .package(path: "../SyncDatabase"), .package(path: "../Core"), - .package(path: "../CloudKitExtras"), .package(path: "../ReaderAPI"), .package(path: "../CloudKitSync"), .package(path: "../NewsBlur"), @@ -41,7 +40,6 @@ let package = Package( "SyncDatabase", "Database", "Core", - "CloudKitExtras", "ReaderAPI", "NewsBlur", "CloudKitSync", diff --git a/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift b/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift index 95c513f8d..c0f1a0bd8 100644 --- a/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift +++ b/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift @@ -17,7 +17,6 @@ import ArticlesDatabase import Web import Secrets import Core -import CloudKitExtras import CommonErrors import FeedFinder import LocalAccount diff --git a/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift index 4797a3b57..3c5ec3e7f 100644 --- a/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift @@ -11,7 +11,6 @@ import os.log import Web import CloudKit import Articles -import CloudKitExtras import CloudKitSync @MainActor final class CloudKitAcountZoneDelegate: CloudKitZoneDelegate { diff --git a/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift index 2af489ac7..57b04119c 100644 --- a/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift @@ -15,7 +15,6 @@ import SyncDatabase import Articles import ArticlesDatabase import Database -import CloudKitExtras import CloudKitSync final class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate { diff --git a/CloudKitExtras/.gitignore b/CloudKitExtras/.gitignore deleted file mode 100644 index 0023a5340..000000000 --- a/CloudKitExtras/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -/.build -/Packages -xcuserdata/ -DerivedData/ -.swiftpm/configuration/registries.json -.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata -.netrc diff --git a/CloudKitExtras/Package.swift b/CloudKitExtras/Package.swift deleted file mode 100644 index 51df15379..000000000 --- a/CloudKitExtras/Package.swift +++ /dev/null @@ -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"] - ) - ] -) diff --git a/CloudKitExtras/Tests/CloudKitExtrasTests/CloudKitExtrasTests.swift b/CloudKitExtras/Tests/CloudKitExtrasTests/CloudKitExtrasTests.swift deleted file mode 100644 index 7cd08150f..000000000 --- a/CloudKitExtras/Tests/CloudKitExtrasTests/CloudKitExtrasTests.swift +++ /dev/null @@ -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 - } -} diff --git a/CloudKitSync/Package.swift b/CloudKitSync/Package.swift index f2cb8d2fd..2ed916f02 100644 --- a/CloudKitSync/Package.swift +++ b/CloudKitSync/Package.swift @@ -11,7 +11,6 @@ let package = Package( targets: ["CloudKitSync"]), ], dependencies: [ - .package(path: "../CloudKitExtras"), .package(path: "../SyncDatabase"), .package(path: "../Articles"), .package(path: "../Core"), @@ -22,7 +21,6 @@ let package = Package( .target( name: "CloudKitSync", dependencies: [ - "CloudKitExtras", "SyncDatabase", "Articles", "Core", diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift index 61e5768ce..8f3b566a5 100644 --- a/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift +++ b/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift @@ -13,7 +13,6 @@ import Parser import ParserObjC import CloudKit import FoundationExtras -import CloudKitExtras enum CloudKitAccountZoneError: LocalizedError { case unknown diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift index 821939d40..e0c98cccd 100644 --- a/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift +++ b/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift @@ -14,7 +14,6 @@ import Web import CloudKit import Articles import SyncDatabase -import CloudKitExtras public protocol CloudKitFeedInfoDelegate { diff --git a/CloudKitExtras/Sources/CloudKitExtras/CloudKitError.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitError.swift similarity index 100% rename from CloudKitExtras/Sources/CloudKitExtras/CloudKitError.swift rename to CloudKitSync/Sources/CloudKitSync/CloudKitError.swift diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift index a680055f8..73f633020 100644 --- a/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift +++ b/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift @@ -13,7 +13,6 @@ import Web import SyncDatabase import Database import Core -import CloudKitExtras public protocol CloudKitSendStatusOperationDelegate: AnyObject { diff --git a/CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift similarity index 100% rename from CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift rename to CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift diff --git a/CloudKitExtras/Sources/CloudKitExtras/CloudKitZoneResult.swift b/CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift similarity index 100% rename from CloudKitExtras/Sources/CloudKitExtras/CloudKitZoneResult.swift rename to CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 2e5ebfd26..04aecf97f 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -1391,7 +1391,6 @@ 84DC5FFD2BCE37A300F04682 /* AppDelegate+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Shared.swift"; sourceTree = ""; }; 84DCA50D2BAB643700792720 /* FoundationExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FoundationExtras; sourceTree = ""; }; 84DCA50E2BABB5D800792720 /* AppKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppKitExtras; sourceTree = ""; }; - 84DCA50F2BABB65600792720 /* CloudKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CloudKitExtras; sourceTree = ""; }; 84DCA5102BABB6A100792720 /* UIKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = UIKitExtras; sourceTree = ""; }; 84DCA5232BABBA8100792720 /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = ""; }; 84DEE56422C32CA4005FC42C /* SmartFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedDelegate.swift; sourceTree = ""; }; @@ -2303,7 +2302,6 @@ 51CD32A824D2CB25009ABAEF /* SyncDatabase */, 841550F42B9E3F8000D4B345 /* Database */, 841550F52B9E4D6800D4B345 /* FMDB */, - 84DCA50F2BABB65600792720 /* CloudKitExtras */, 849FEDC32BBB225E0053FB21 /* Web */, 846799F42BBD120A000854CB /* Parser */, 84DCA5232BABBA8100792720 /* Core */,