diff --git a/Package.resolved b/Package.resolved index 75eba8c..6cccc12 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,15 +1,6 @@ { - "originHash" : "da1b8d53747ed3a05d8e36b2882c3cb3a39ecccae3fbd0dea15e8ea56e8342a4", + "originHash" : "8c1ea0038d0df7a497986fcd4d48362febb400754dc0930cc30160975008e1d8", "pins" : [ - { - "identity" : "felinepine", - "kind" : "remoteSourceControl", - "location" : "https://github.com/brightdigit/FelinePine.git", - "state" : { - "revision" : "d2ed8f98a67e45bfa89d3947ea99fcf9b5260064", - "version" : "1.0.0-beta.4" - } - }, { "identity" : "swift-log", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index f3a6c4f..402183e 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( name: "FelinePineLogging", platforms: [.iOS(.v14), .watchOS(.v7), .macOS(.v11)], dependencies: [ - .package(url: "https://github.com/brightdigit/FelinePine.git", from: "1.0.0-beta.4"), + .package(path: "../FelinePine"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0") ], products: [ diff --git a/Package@swift-6.swift b/Package@swift-6.swift index 4a9b558..47fade5 100644 --- a/Package@swift-6.swift +++ b/Package@swift-6.swift @@ -38,7 +38,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/brightdigit/FelinePine.git", from: "1.0.0-beta.4"), + .package(path: "../FelinePine"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0") ], targets: [ diff --git a/Sources/FelinePineLogging/Loggable.swift b/Sources/FelinePineLogging/Loggable.swift index 343547c..1c9b009 100644 --- a/Sources/FelinePineLogging/Loggable.swift +++ b/Sources/FelinePineLogging/Loggable.swift @@ -30,7 +30,7 @@ import Logging import Foundation -//#if canImport(os) || canImport(Logging) +//#if canImport(os) // public typealias FelinePineProtocol = Feline & Pine //#else // public typealias FelinePineProtocol = Feline diff --git a/Sources/FelinePineLogging/LoggingSystem.swift b/Sources/FelinePineLogging/LoggingSystem.swift index 97baca0..4bdcf23 100644 --- a/Sources/FelinePineLogging/LoggingSystem.swift +++ b/Sources/FelinePineLogging/LoggingSystem.swift @@ -54,7 +54,7 @@ // /// Subsystem to use for each ``Logger``. // /// By default, this is `Bundle.main.bundleIdentifier`. // static var subsystem: String { get } -// #if canImport(os) || canImport(Logging) +// #if canImport(os) // /// Fetches the correct logger based on the category. // static func logger(forCategory category: Category) -> Logger // #endif diff --git a/Sources/FelinePineLogging/Pine.swift b/Sources/FelinePineLogging/Pine.swift index 472865d..8f28ae7 100644 --- a/Sources/FelinePineLogging/Pine.swift +++ b/Sources/FelinePineLogging/Pine.swift @@ -30,20 +30,12 @@ import Foundation #if swift(<6.0) - #if canImport(os) - import os - #elseif canImport(Logging) import Logging - #endif #else - #if canImport(os) - public import os - #elseif canImport(Logging) public import Logging - #endif #endif -#if canImport(os) || canImport(Logging) +#if canImport(Logging) /// Defines a shared logger for the type. /// /// Provides a shared ``Logger`` to use in this type. diff --git a/Tests/FelinePineLoggingTests/FelinePineTests.swift b/Tests/FelinePineLoggingTests/FelinePineTests.swift index 425b724..db71553 100644 --- a/Tests/FelinePineLoggingTests/FelinePineTests.swift +++ b/Tests/FelinePineLoggingTests/FelinePineTests.swift @@ -32,7 +32,7 @@ import XCTest internal final class FelinePineTests: XCTestCase { internal func testLogger() throws { - #if canImport(os) || canImport(Logging) + #if canImport(os) _ = MockType.logger XCTAssert(true) #else diff --git a/Tests/FelinePineLoggingTests/LoggingSystemTests.swift b/Tests/FelinePineLoggingTests/LoggingSystemTests.swift index e89d9c1..6921964 100644 --- a/Tests/FelinePineLoggingTests/LoggingSystemTests.swift +++ b/Tests/FelinePineLoggingTests/LoggingSystemTests.swift @@ -45,7 +45,7 @@ internal final class LoggingSystemTests: XCTestCase { } internal func testLogger() throws { - #if canImport(os) || canImport(Logging) + #if canImport(os) for category in MockSystem.Category.allCases { _ = MockSystem.logger(forCategory: category) }