From 0c5bcbbeb9d9efe678a6b2baf6f8770feea44b9a Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 7 Apr 2024 13:34:53 -0700 Subject: [PATCH] Fix some build issues. --- .../Sources/Account/CloudKit/CloudKitAccountZone.swift | 1 + .../Account/CloudKit/CloudKitArticlesZone.swift | 1 + CloudKitSync/Package.swift | 10 ++++++++-- .../Sources/CloudKitSync/CKRecord+Extensions.swift | 6 ++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Account/Sources/Account/CloudKit/CloudKitAccountZone.swift b/Account/Sources/Account/CloudKit/CloudKitAccountZone.swift index 7ac7babe4..3ab0dfed0 100644 --- a/Account/Sources/Account/CloudKit/CloudKitAccountZone.swift +++ b/Account/Sources/Account/CloudKit/CloudKitAccountZone.swift @@ -10,6 +10,7 @@ import Foundation import os.log import Web import Parser +import ParserObjC import CloudKit import FoundationExtras import CloudKitExtras diff --git a/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift b/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift index 116198500..1b855791e 100644 --- a/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift +++ b/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift @@ -9,6 +9,7 @@ import Foundation import os.log import Parser +import ParserObjC import Web import CloudKit import Articles diff --git a/CloudKitSync/Package.swift b/CloudKitSync/Package.swift index 0cb443e0e..d7cc608d6 100644 --- a/CloudKitSync/Package.swift +++ b/CloudKitSync/Package.swift @@ -13,7 +13,10 @@ let package = Package( dependencies: [ .package(path: "../CloudKitExtras"), .package(path: "../SyncDatabase"), - .package(path: "../Articles") + .package(path: "../Articles"), + .package(path: "../Core"), + .package(path: "../Web"), + .package(path: "../Parser"), ], targets: [ .target( @@ -21,7 +24,10 @@ let package = Package( dependencies: [ "CloudKitExtras", "SyncDatabase", - "Articles" + "Articles", + "Core", + "Web", + "Parser" ] ), .testTarget( diff --git a/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift b/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift index 91906415e..6fadcda7b 100644 --- a/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift +++ b/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift @@ -11,16 +11,14 @@ import CloudKit public extension CKRecord { - var externalID: String { + public var externalID: String { return recordID.externalID } - } public extension CKRecord.ID { - var externalID: String { + public var externalID: String { return recordName } - }