feat: prep for Linux, Windows, and Android support

.github/workflows/ci.yml

@@ -32,3 +32,71 @@ jobs:
           if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
           file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
           xcodebuild test -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=iOS Simulator,name=iPhone 13 Pro,OS=15.2"
+      - name: Prepare codecov
+        uses: sersoft-gmbh/swift-coverage-action@v2
+        id: coverage-files
+        with:
+          format: lcov
+          search-paths: ./DerivedData
+        env:
+          DEVELOPER_DIR: ${{ env.CI_XCODE_13 }}
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          files: ${{join(fromJSON(steps.coverage-files.outputs.files), ',')}}
+          env_vars: IOS
+
+#  spm-test:
+#    runs-on: macos-latest
+#    steps:
+#      - uses: maxim-lobanov/setup-xcode@v1
+#        with:
+#          xcode-version: latest-stable
+#      - name: Checkout
+#        uses: actions/checkout@v2
+#      - name: Build and Test
+#        run: swift test --enable-code-coverage -v
+#      - name: Prepare codecov
+#        uses: sersoft-gmbh/swift-coverage-action@v2
+#        id: coverage-files
+#        with:
+#          format: lcov
+#          search-paths: ./.build
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v2
+#        with:
+#          files: ${{join(fromJSON(steps.coverage-files.outputs.files), ',')}}
+#          env_vars: SPM
+
+#  linux:
+#    runs-on: ubuntu-18.04
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: sersoft-gmbh/SwiftyActions@v1
+#        with:
+#          release-version: "5"
+#          github-token: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Build and Test
+#        run: swift test --enable-test-discovery --enable-code-coverage -v
+#      - name: Prepare codecov
+#        run: |
+#          llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/debug/PapyrusPackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/debug/codecov/default.profdata > info_linux.lcov
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v2
+#        with:
+#          env_vars: LINUX
+#          fail_ci_if_error: true
+
+#  windows:
+#    runs-on: windows-2019
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: MaxDesiatov/swift-windows-action@v1
+#        with:
+#          swift-version: "5.5.1"
+#          shell-action: swift test --enable-test-discovery --enable-code-coverage -v
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v2
+#        with:
+#          env_vars: WINDOWS
+

.gitignore

@@ -10,6 +10,7 @@
 xcuserdata
 profile
 *.moved-aside
+.swiftpm
 DerivedData
 .idea/
 *.hmap

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -7,8 +7,10 @@ import PackageDescription
 let package = Package(
     name: "Papyrus",
     platforms: [
-        .iOS("15.0"),
-        .macOS("12.0")
+        .iOS(.v15),
+        .macOS(.v12),
+        .tvOS(.v15),
+        .watchOS(.v8)
     ],
     products: [
         .library(
@@ -24,7 +26,8 @@ let package = Package(
         .testTarget(
             name: "PapyrusTests",
             dependencies: ["Papyrus"],
-            path: "PapyrusTests"
+            path: "PapyrusTests",
+            exclude: ["Supporting Files/Info.plist"]
         )
     ]
 )

Papyrus/Source/Logger.swift

@@ -1,3 +1,5 @@
+#if !os(Linux) && !os(Android) && !os(Windows)
+
 import Foundation
 import os.log
 
@@ -75,3 +77,4 @@ public enum LogLevel: Int {
 extension LogLevel: Comparable {
     public static func <(lhs: LogLevel, rhs: LogLevel) -> Bool { lhs.rawValue < rhs.rawValue }
 }
+#endif

Papyrus/Source/PapyrusStore.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import Foundation
 
 
@@ -7,18 +9,23 @@ import Foundation
 /// `PapyrusStore` aims to hit the sweet spot between saving raw API responses to the file system
 /// and a fully fledged database like Realm.
 public final class PapyrusStore {
-
+    #if !os(Linux) && !os(Android) && !os(Windows)
     /// The verboseness of the logger.
     public var logLevel: LogLevel {
         get { self.logger.logLevel }
         set { self.logger.logLevel = newValue }
     }
+    #endif
 
     // Private
     private let fileManager = FileManager.default
+    #if canImport(Combine)
     private var cancellables: Set<AnyCancellable> = []
+    #endif
     private let url: URL
+    #if !os(Linux) && !os(Android) && !os(Windows)
     private let logger: Logger
+    #endif
 
     private let encoder: JSONEncoder
     private let decoder: JSONDecoder
@@ -35,12 +42,14 @@ public final class PapyrusStore {
                 encoder: JSONEncoder = JSONEncoder(),
                 decoder: JSONDecoder = JSONDecoder()) {
         self.url = url
+        self.encoder = encoder
+        self.decoder = decoder
+        #if !os(Linux) && !os(Android) && !os(Windows)
         self.logger = Logger(
             subsystem: "com.reddavis.PapyrusStore",
             category: "PapyrusStore"
         )
-        self.encoder = encoder
-        self.decoder = decoder
+        #endif
         self.setupDataDirectory()
     }
 
@@ -63,7 +72,9 @@ public final class PapyrusStore {
         do {
             try self.createDirectoryIfNeeded(at: self.url)
         } catch {
+            #if !os(Linux) && !os(Android) && !os(Windows)
             self.logger.fault("Unable to create store directory: \(error)")
+            #endif
         }
     }
 
@@ -101,7 +112,9 @@ public final class PapyrusStore {
 
         // Create directory
         try self.fileManager.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+        #if !os(Linux) && !os(Android) && !os(Windows)
         self.logger.debug("Created directory: \(url.absoluteString)")
+        #endif
     }
 }
 
@@ -123,9 +136,11 @@ public extension PapyrusStore {
             self.save($0, filename: $0.filename)
             touchedDirectories.insert(self.directoryURL(for: $0.typeDescription))
         }
-
+
+        #if !os(Linux) && !os(Android) && !os(Windows)
         // Touch all changed directories
         self.logger.debug("Touching directories: \(touchedDirectories)")
+        #endif
 
         let now = Date()
         touchedDirectories.forEach {
@@ -150,9 +165,13 @@ public extension PapyrusStore {
             try self.createDirectoryIfNeeded(for: object.typeDescription)
             let data = try self.encoder.encode(object)
             try data.write(to: self.fileURL(for: object.typeDescription, filename: filename))
+            #if !os(Linux) && !os(Android) && !os(Windows)
             self.logger.debug("Saved: \(object.typeDescription) [Filename: \(filename)]")
+            #endif
         } catch {
+            #if !os(Linux) && !os(Android) && !os(Windows)
             self.logger.fault("Failed to save: \(error)")
+            #endif
         }
     }
 }
@@ -225,12 +244,16 @@ public extension PapyrusStore {
                 group.addTask {
                     let url = self.fileURL(for: String(describing: type), id: id)
                     try? self.fileManager.removeItem(at: url)
+                    #if !os(Linux) && !os(Android) && !os(Windows)
                     self.logger.debug("Deleted: \(url)")
+                    #endif
                 }
             }
 
+            #if !os(Linux) && !os(Android) && !os(Windows)
             // Touch all changed directories
             self.logger.debug("Touching directories: \(touchedDirectories)")
+            #endif
 
             let now = Date()
             for url in touchedDirectories {

Papyrus/Source/Publishers/Collection/CollectionObserverPublisher.swift

@@ -1,3 +1,4 @@
+#if canImport(Combine)
 import Combine
 import Foundation
 
@@ -22,3 +23,4 @@ struct CollectionObserverPublisher<T>: Publisher where T: Papyrus {
         subscriber.receive(subscription: subscription)
     }
 }
+#endif

Papyrus/Source/Publishers/Collection/CollectionObserverSubscription.swift

@@ -1,3 +1,4 @@
+#if canImport(Combine)
 import Combine
 import Foundation
 
@@ -70,3 +71,4 @@ where T.Input == [Output] {
             }
     }
 }
+#endif

Papyrus/Source/Publishers/Object/ObjectObserverPublisher.swift

@@ -1,3 +1,5 @@
+#if canImport(Combine)
+
 import Combine
 import Foundation
 
@@ -28,3 +30,4 @@ struct ObjectObserverPublisher<T>: Publisher where T: Papyrus & Equatable {
         subscriber.receive(subscription: subscription)
     }
 }
+#endif

Papyrus/Source/Publishers/Object/ObjectObserverSubscription.swift

@@ -1,3 +1,4 @@
+#if canImport(Combine)
 import Combine
 import Foundation
 
@@ -62,3 +63,4 @@ where T.Input == Output,
         }
     }
 }
+#endif

Papyrus/Source/Queries/CollectionQuery.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import Foundation
 
 
@@ -68,7 +70,8 @@ public class CollectionQuery<T> where T: Papyrus {
         self.sort = onSort
         return self
     }
-
+
+    #if canImport(Combine)
     /// Observe changes to the query.
     /// - Returns: A publisher that emits values when
     /// valid objects are changed.
@@ -79,7 +82,8 @@ public class CollectionQuery<T> where T: Papyrus {
             .replaceError(with: [])
             .eraseToAnyPublisher()
     }
-
+    #endif
+
     /// Observe changes to the query.
     /// - Returns: A `AsyncThrowingStream` instance.
     public func stream() -> AsyncThrowingStream<[T], Error> {

Papyrus/Source/Queries/ObjectQuery.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import Foundation
 
 
@@ -40,7 +42,8 @@ public class ObjectQuery<T: Papyrus> {
             throw PapyrusStore.QueryError.invalidSchema(details: error)
         }
     }
-
+
+    #if canImport(Combine)
     /// Observe changes to the query via a publisher.
     /// - Returns: A publisher that emits values when
     /// valid objects are changed.
@@ -51,6 +54,7 @@ public class ObjectQuery<T: Papyrus> {
         )
         .eraseToAnyPublisher()
     }
+    #endif
 
     /// Observe changes to the query via an async stream.
     /// - Returns: A `AsyncThrowingStream` instance.

PapyrusTests/Source/Tests/CollectionObserverPublisherTests.swift

@@ -1,3 +1,4 @@
+#if canImport(Combine)
 import Combine
 import XCTest
 @testable import Papyrus
@@ -105,3 +106,4 @@ final class CollectionObserverPublisherTests: XCTestCase {
         self.waitForExpectations(timeout: 2.0)
     }
 }
+#endif

PapyrusTests/Source/Tests/CollectionQueryTests.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import XCTest
 @testable import Papyrus
 
@@ -7,7 +9,9 @@ import XCTest
 final class CollectionQueryTests: XCTestCase {
     private var storeDirectory: URL!
     private let numberOfDummyObjects = 10
+    #if canImport(Combine)
     private var cancellables: Set<AnyCancellable>!
+    #endif
 
     // MARK: Setup
 

PapyrusTests/Source/Tests/ObjectObserverPublisherTests.swift

@@ -1,3 +1,4 @@
+#if canImport(Combine)
 import Combine
 import XCTest
 @testable import Papyrus
@@ -184,3 +185,4 @@ extension ObjectObserverPublisherTests {
         )
     }
 }
+#endif

PapyrusTests/Source/Tests/ObjectQueryTests.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import XCTest
 @testable import Papyrus
 
@@ -7,7 +9,9 @@ import XCTest
 final class ObjectQueryTests: XCTestCase {
     private let fileManager = FileManager.default
     private var storeDirectory: URL!
+    #if canImport(Combine)
     private var cancellables: Set<AnyCancellable>!
+    #endif
 
     // MARK: Setup
 

PapyrusTests/Source/Tests/PapyrusStoreTests.swift

@@ -1,4 +1,6 @@
+#if canImport(Combine)
 import Combine
+#endif
 import XCTest
 @testable import Papyrus
 
@@ -8,7 +10,9 @@ final class PapyrusStoreTests: XCTestCase {
     private let fileManager = FileManager.default
     private var store: PapyrusStore!
     private var storeDirectory: URL!
+    #if canImport(Combine)
     private var cancellables: Set<AnyCancellable>!
+    #endif
 
     // MARK: Setup