Boosted build/version; formatting; updating for new Xcode/OS; bugfixe…

…s mirrored from GRT
open-trackers · Oct 14, 2023 · 2647eca · 2647eca
1 parent 1a2efa5
commit 2647eca
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 51 deletions.
diff --git a/Sources/Entities/AppSetting-dedupe.swift b/Sources/Entities/AppSetting-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  AppSetting.swift
+//  AppSetting-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/AppSetting-encodable.swift b/Sources/Entities/AppSetting-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  AppSetting.swift
+//  AppSetting-encodable.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/MCategory-dedupe.swift b/Sources/Entities/MCategory-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  MCategory.swift
+//  MCategory-dedupe.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //
@@ -14,7 +14,7 @@ import CoreData
 import TrackerLib
 
 extension MCategory {
-    internal static func dedupe(_ context: NSManagedObjectContext, archiveID: UUID) throws {
+    static func dedupe(_ context: NSManagedObjectContext, archiveID: UUID) throws {
         let pred = getPredicate(archiveID: archiveID)
         let sort = byCreatedAt()
         var first: MCategory?

diff --git a/Sources/Entities/MCategory-encodable.swift b/Sources/Entities/MCategory-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  MCategory.swift
+//  MCategory-encodable.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/MCategory-fetch.swift b/Sources/Entities/MCategory-fetch.swift
@@ -13,7 +13,7 @@ import CoreData
 
 import TrackerLib
 
-internal extension MCategory {
+extension MCategory {
     static func getPredicate(archiveID: UUID) -> NSPredicate {
         NSPredicate(format: "archiveID == %@", archiveID as NSUUID)
     }

diff --git a/Sources/Entities/MCategory-userOrdered.swift b/Sources/Entities/MCategory-userOrdered.swift
@@ -1,5 +1,5 @@
 //
-//  MCategory.swift
+//  MCategory-userOrdered.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/MFoodGroup-dedupe.swift b/Sources/Entities/MFoodGroup-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  MFoodGroup.swift
+//  MFoodGroup-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //
@@ -14,9 +14,9 @@ import CoreData
 import TrackerLib
 
 extension MFoodGroup {
-    internal static func dedupe(_ context: NSManagedObjectContext,
-                                categoryArchiveID: UUID,
-                                groupRaw: Int16) throws
+    static func dedupe(_ context: NSManagedObjectContext,
+                       categoryArchiveID: UUID,
+                       groupRaw: Int16) throws
     {
         let pred = getPredicate(categoryArchiveID: categoryArchiveID, groupRaw: groupRaw)
         let sort = byCreatedAt()

diff --git a/Sources/Entities/MFoodGroup-encodable.swift b/Sources/Entities/MFoodGroup-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  MFoodGroup.swift
+//  MFoodGroup-encodable.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/MServing-dedupe.swift b/Sources/Entities/MServing-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  MServing.swift
+//  MServing-dedupe.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //
@@ -14,7 +14,7 @@ import CoreData
 import TrackerLib
 
 extension MServing {
-    internal static func dedupe(_ context: NSManagedObjectContext, categoryArchiveID: UUID, servingArchiveID: UUID) throws {
+    static func dedupe(_ context: NSManagedObjectContext, categoryArchiveID: UUID, servingArchiveID: UUID) throws {
         let pred = getPredicate(categoryArchiveID: categoryArchiveID, servingArchiveID: servingArchiveID)
         let sort = byCreatedAt()
         var first: MServing?

diff --git a/Sources/Entities/MServing-encodable.swift b/Sources/Entities/MServing-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  MServing.swift
+//  MServing-encodable.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/MServing-userOrdered.swift b/Sources/Entities/MServing-userOrdered.swift
@@ -1,5 +1,5 @@
 //
-//  MServing.swift
+//  MServing-userOrdered.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/ZCategory-dedupe.swift b/Sources/Entities/ZCategory-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZCategory.swift
+//  ZCategory-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //
@@ -14,7 +14,7 @@ import CoreData
 import TrackerLib
 
 extension ZCategory {
-    internal static func dedupe(_ context: NSManagedObjectContext, categoryArchiveID: UUID, inStore: NSPersistentStore) throws {
+    static func dedupe(_ context: NSManagedObjectContext, categoryArchiveID: UUID, inStore: NSPersistentStore) throws {
         let pred = getPredicate(categoryArchiveID: categoryArchiveID)
         let sort = byCreatedAt()
         var first: ZCategory?

diff --git a/Sources/Entities/ZCategory-encodable.swift b/Sources/Entities/ZCategory-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZCategory.swift
+//  ZCategory-encodable.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/ZCategory-fetch.swift b/Sources/Entities/ZCategory-fetch.swift
@@ -12,7 +12,7 @@ import CoreData
 
 import TrackerLib
 
-internal extension ZCategory {
+extension ZCategory {
     static func getPredicate(categoryArchiveID: UUID) -> NSPredicate {
         NSPredicate(format: "categoryArchiveID == %@", categoryArchiveID as NSUUID)
     }

diff --git a/Sources/Entities/ZDayRun-dedupe.swift b/Sources/Entities/ZDayRun-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZDayRun.swift
+//  ZDayRun-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //
@@ -14,9 +14,9 @@ import CoreData
 import TrackerLib
 
 extension ZDayRun {
-    internal static func dedupe(_ context: NSManagedObjectContext,
-                                consumedDay: String,
-                                inStore: NSPersistentStore) throws
+    static func dedupe(_ context: NSManagedObjectContext,
+                       consumedDay: String,
+                       inStore: NSPersistentStore) throws
     {
         let pred = getPredicate(consumedDay: consumedDay)
         let sort = byCreatedAt()

diff --git a/Sources/Entities/ZDayRun.swift b/Sources/Entities/ZDayRun.swift
@@ -29,7 +29,7 @@ public extension ZDayRun {
     }
 }
 
-internal extension ZDayRun {
+extension ZDayRun {
     /// Shallow copy of self to specified store, returning newly copied record (residing in dstStore).
     /// Does not delete self.
     /// Does NOT save context.

diff --git a/Sources/Entities/ZServing-dedupe.swift b/Sources/Entities/ZServing-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZServing.swift
+//  ZServing-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //
@@ -14,10 +14,10 @@ import CoreData
 import TrackerLib
 
 extension ZServing {
-    internal static func dedupe(_ context: NSManagedObjectContext,
-                                categoryArchiveID: UUID,
-                                servingArchiveID: UUID,
-                                inStore: NSPersistentStore) throws
+    static func dedupe(_ context: NSManagedObjectContext,
+                       categoryArchiveID: UUID,
+                       servingArchiveID: UUID,
+                       inStore: NSPersistentStore) throws
     {
         let pred = getPredicate(categoryArchiveID: categoryArchiveID, servingArchiveID: servingArchiveID)
         let sort = byCreatedAt()

diff --git a/Sources/Entities/ZServing-encodable.swift b/Sources/Entities/ZServing-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZServing.swift
+//  ZServing-encodable.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Entities/ZServingRun-dedupe.swift b/Sources/Entities/ZServingRun-dedupe.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZServingRun.swift
+//  ZServingRun-dedupe.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //
@@ -14,11 +14,11 @@ import CoreData
 import TrackerLib
 
 extension ZServingRun {
-    internal static func dedupe(_ context: NSManagedObjectContext,
-                                servingArchiveID: UUID,
-                                consumedDay: String,
-                                consumedTime: String,
-                                inStore: NSPersistentStore) throws
+    static func dedupe(_ context: NSManagedObjectContext,
+                       servingArchiveID: UUID,
+                       consumedDay: String,
+                       consumedTime: String,
+                       inStore: NSPersistentStore) throws
     {
         let pred = getPredicate(servingArchiveID: servingArchiveID,
                                 consumedDay: consumedDay,

diff --git a/Sources/Entities/ZServingRun-encodable.swift b/Sources/Entities/ZServingRun-encodable.swift
@@ -1,6 +1,6 @@
 
 //
-//  ZServingRun.swift
+//  ZServingRun-encodable.swift
 //
 // Copyright 2023  OpenAlloc LLC
 //

diff --git a/Sources/Export-utils.swift b/Sources/Export-utils.swift
@@ -18,16 +18,16 @@ import TrackerLib
                                       archiveStore: NSPersistentStore,
                                       format: ExportFormat = .CSV) throws -> Data?
     {
-        let entries: [(String, Data)] = [
-            try makeDelimFile(AppSetting.self, context, format: format, inStore: mainStore),
-            try makeDelimFile(MCategory.self, context, format: format, inStore: mainStore),
-            try makeDelimFile(MFoodGroup.self, context, format: format, inStore: mainStore),
-            try makeDelimFile(MServing.self, context, format: format, inStore: mainStore),
+        let entries: [(String, Data)] = try [
+            makeDelimFile(AppSetting.self, context, format: format, inStore: mainStore),
+            makeDelimFile(MCategory.self, context, format: format, inStore: mainStore),
+            makeDelimFile(MFoodGroup.self, context, format: format, inStore: mainStore),
+            makeDelimFile(MServing.self, context, format: format, inStore: mainStore),
 
-            try makeDelimFile(ZDayRun.self, context, format: format, inStore: archiveStore),
-            try makeDelimFile(ZCategory.self, context, format: format, inStore: archiveStore),
-            try makeDelimFile(ZServing.self, context, format: format, inStore: archiveStore),
-            try makeDelimFile(ZServingRun.self, context, format: format, inStore: archiveStore),
+            makeDelimFile(ZDayRun.self, context, format: format, inStore: archiveStore),
+            makeDelimFile(ZCategory.self, context, format: format, inStore: archiveStore),
+            makeDelimFile(ZServing.self, context, format: format, inStore: archiveStore),
+            makeDelimFile(ZServingRun.self, context, format: format, inStore: archiveStore),
         ]
 
         return try createZipArchive(context, entries: entries)

diff --git a/Sources/ZTransferUtils.swift b/Sources/ZTransferUtils.swift
@@ -66,9 +66,9 @@ public func transferToArchive(_ context: NSManagedObjectContext,
 /// Does not delete any records.
 /// Safe to run on a background context.
 /// Does NOT save context.
-internal func deepCopy(_ context: NSManagedObjectContext,
-                       fromStore srcStore: NSPersistentStore,
-                       toStore dstStore: NSPersistentStore) throws -> ([ZCategory], [ZDayRun])
+func deepCopy(_ context: NSManagedObjectContext,
+              fromStore srcStore: NSPersistentStore,
+              toStore dstStore: NSPersistentStore) throws -> ([ZCategory], [ZDayRun])
 {
     logger.debug("\(#function)")
     var copiedZCategories = [ZCategory]()

diff --git a/Tests/TestBase.swift b/Tests/TestBase.swift
@@ -1,5 +1,5 @@
 //
-//  Testbase.swift
+//  TestBase.swift
 //
 // Copyright 2022, 2023  OpenAlloc LLC
 //