fixing issue with build

brightdigit · Oct 22, 2024 · a3698a7 · a3698a7
1 parent 7d3c745
commit a3698a7
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 81 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1 @@
+swift-6.0/devcontainer.json
diff --git a/.github/workflows/FelinePine.yml b/.github/workflows/FelinePine.yml
@@ -94,6 +94,12 @@ jobs:
             watchOSVersion: "10.2"
             watchName: "Apple Watch Series 9 (45mm)"
             iPhoneName: "iPhone 15 Pro"
+          - runs-on: macos-15
+            xcode: "/Applications/Xcode_16.1.app"
+            iOSVersion: "18.1"
+            watchOSVersion: "11.1"
+            watchName: "Apple Watch Series 10 (46mm)"
+            iPhoneName: "iPhone 16 Pro"
     steps:
       - uses: actions/checkout@v3
       - name: Cache swift package modules

diff --git a/Sources/FelinePine/Feline.swift b/Sources/FelinePine/Feline.swift
@@ -29,17 +29,9 @@
 
 import Foundation
 
-#if swift(<6.0)
-  #if canImport(os)
-    import os
-
-  #endif
-#else
-  #if canImport(os)
-    public import os
+#if canImport(os)
 
-  #endif
-#endif
+public import os
 
 /// Defines the ``LoggingSystem`` to use as well as the category.
 public protocol Feline {
@@ -52,7 +44,6 @@ public protocol Feline {
   }
 }
 
-#if canImport(os)
   extension Feline where Self: Pine {
     /// Use the ``loggingCategory`` to define the shared logger for type.
     public static var logger: Logger {

diff --git a/Sources/FelinePine/Logger+LoggerCategory.swift b/Sources/FelinePine/Logger+LoggerCategory.swift
@@ -27,19 +27,9 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if swift(<6.0)
-  #if canImport(os)
-    import os
-
-  #endif
-#else
-  #if canImport(os)
-    public import os
-
-  #endif
-#endif
-
 #if canImport(os)
+  public import os
+
   extension Logger {
     internal init<Category: RawRepresentable>(
       subsystem: String,

diff --git a/Sources/FelinePine/Logger.swift b/Sources/FelinePine/Logger.swift
@@ -27,34 +27,6 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-//
-//  Logger.swift
-//  FelinePine
-//
-//  Created by Leo Dion.
-//  Copyright © 2024 BrightDigit.
-//
-//  Permission is hereby granted, free of charge, to any person
-//  obtaining a copy of this software and associated documentation
-//  files (the “Software”), to deal in the Software without
-//  restriction, including without limitation the rights to use,
-//  copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the
-//  Software is furnished to do so, subject to the following
-//  conditions:
-//
-//  The above copyright notice and this permission notice shall be
-//  included in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//  OTHER DEALINGS IN THE SOFTWARE.
-//
 #if canImport(os)
   public import os
   public typealias Logger = os.Logger

diff --git a/Sources/FelinePine/LoggingSystem+LoggingSystemRepository.swift b/Sources/FelinePine/LoggingSystem+LoggingSystemRepository.swift
@@ -29,16 +29,8 @@
 
 import Foundation
 
-#if swift(<6.0)
-  #if canImport(os)
-    import os
-
-  #endif
-#else
-  #if canImport(os)
-    public import os
-
-  #endif
+#if canImport(os)
+  public import os
 #endif
 
 // swiftlint:disable strict_fileprivate

diff --git a/Sources/FelinePine/LoggingSystem.swift b/Sources/FelinePine/LoggingSystem.swift
@@ -29,16 +29,8 @@
 
 import Foundation
 
-#if swift(<6.0)
-  #if canImport(os)
-    import os
-
-  #endif
-#else
-  #if canImport(os)
-    public import os
-
-  #endif
+#if canImport(os)
+  public import os
 #endif
 
 /// Defines the logging categories for your application.

diff --git a/Sources/FelinePine/Pine.swift b/Sources/FelinePine/Pine.swift
@@ -29,16 +29,8 @@
 
 import Foundation
 
-#if swift(<6.0)
-  #if canImport(os)
-    import os
-
-  #endif
-#else
-  #if canImport(os)
-    public import os
-
-  #endif
+#if canImport(os)
+  public import os
 #endif
 
 #if canImport(os)