Merge pull request #50 from lhoward/lhoward/linux

Fixes for building `OSCKitCore` on Linux

Author: orchetect

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
 
   iOS:
     name: iOS
-    runs-on: macos-lates
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@main
     - uses: maxim-lobanov/setup-xcode@v1
@@ -107,7 +107,7 @@ jobs:
 
   tvOS:
     name: tvOS
-    runs-on: macos-lates
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@main
     - uses: maxim-lobanov/setup-xcode@v1
@@ -143,7 +143,7 @@ jobs:
 
   watchOS:
     name: watchOS
-    runs-on: macos-lates
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@main
     - uses: maxim-lobanov/setup-xcode@v1
@@ -215,3 +215,13 @@ jobs:
       run: xcodebuild -project "Examples/UDP Socket/OSC UDP Socket.xcodeproj" -resolvePackageDependencies | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
     - name: UDP Socket - Build
       run: xcodebuild build -project "Examples/UDP Socket/OSC UDP Socket.xcodeproj" -scheme "OSC UDP Socket" -destination "generic/platform=macOS,name=Any Mac" | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+
+  linux:
+    name: Linux (OSCKitCore)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@main
+    - name: Build
+      run: swift build
+    - name: Unit Tests
+      run: swift test

Package.swift

@@ -6,22 +6,48 @@ import PackageDescription
 let package = Package(
     name: "OSCKit",
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13)],
-    products: [
-        .library(
-            name: "OSCKit",
-            targets: ["OSCKit"]
-        ),
-        .library(
-            name: "OSCKitCore",
-            targets: ["OSCKitCore"]
-        )
-    ],
-    dependencies: [
-        .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket", from: "7.0.0"),
-        .package(url: "https://github.com/orchetect/SwiftASCII", from: "1.1.5"),
+    products: products,
+    dependencies: dependencies,
+    targets: targets
+)
+
+var products: [Product] {
+    var products: [Product] = []
+    
+    #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
+    products += [
+        .library(name: "OSCKit", targets: ["OSCKit"])
+    ]
+    #endif
+    
+    products += [
+        .library(name: "OSCKitCore", targets: ["OSCKitCore"])
+    ]
+    return products
+}
+
+var dependencies: [Package.Dependency] {
+    var dependencies: [Package.Dependency] = []
+    
+    #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
+    dependencies += [
+        .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket", from: "7.0.0")
+    ]
+    #endif
+    
+    dependencies += [
+        .package(url: "https://github.com/orchetect/SwiftASCII", from: "1.2.0"),
         .package(url: "https://github.com/apple/swift-numerics", from: "1.0.2")
-    ],
-    targets: [
+    ]
+    
+    return dependencies
+}
+
+var targets: [Target] {
+    var targets: [Target] = []
+    
+    #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
+    targets += [
         .target(
             name: "OSCKit",
             dependencies: [
@@ -34,15 +60,19 @@ let package = Package(
             ],
             swiftSettings: [.define("DEBUG", .when(configuration: .debug))]
         ),
+        .testTarget(
+            name: "OSCKitTests",
+            dependencies: ["OSCKit"]
+        )
+    ]
+    #endif
+    
+    targets += [
         .target(
             name: "OSCKitCore",
             dependencies: ["SwiftASCII"],
             swiftSettings: [.define("DEBUG", .when(configuration: .debug))]
         ),
-        .testTarget(
-            name: "OSCKitTests",
-            dependencies: ["OSCKit"]
-        ),
         .testTarget(
             name: "OSCKitCoreTests",
             dependencies: [
@@ -51,4 +81,6 @@ let package = Package(
             ]
         )
     ]
-)
+    
+    return targets
+}

README.md

@@ -4,7 +4,9 @@
 
 [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Forchetect%2FOSCKit%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/orchetect/OSCKit) [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Forchetect%2FOSCKit%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/orchetect/OSCKit) [![Xcode 16](https://img.shields.io/badge/Xcode-16-blue.svg?style=flat)](https://developer.apple.com/swift) [![License: MIT](http://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)](https://github.com/orchetect/OSCKit/blob/main/LICENSE)
 
-Open Sound Control ([OSC](https://opensoundcontrol.stanford.edu)) library for macOS, iOS, tvOS, and visionOS written in Swift.
+Open Sound Control ([OSC](https://opensoundcontrol.stanford.edu)) library written in Swift.
+
+The core library is compatible with Apple platforms and Linux. The network layer is currently built for only Apple platforms.
 
 - OSC address pattern matching and dispatch
 - Convenient OSC message value type masking, validation and strong-typing

Sources/OSCKitCore/Utilities/Outsourced/Data.swift

@@ -9,6 +9,7 @@
 /// ----------------------------------------------
 /// ----------------------------------------------
 
+import CoreFoundation
 import Foundation
 
 // MARK: - Int

Sources/OSCKitCore/Utilities/Outsourced/FloatingPoint and Darwin.swift

@@ -9,7 +9,11 @@
 /// ----------------------------------------------
 /// ----------------------------------------------
 
+#if canImport(Darwin)
 import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#endif
 
 extension FloatingPoint {
     /// Similar to `Int.quotientAndRemainder(dividingBy:)` from the standard Swift library.

Tests/OSCKitCoreTests/OSCTimeTag/OSCTimeTag Static Constructors Tests.swift

@@ -15,6 +15,8 @@ import Testing
     #elseif os(tvOS) || os(watchOS)
     // allow more time variance for CI pipeline to de-flake
     let tolerance: TimeInterval = 0.01
+    #else // linux
+    let tolerance: TimeInterval = 0.01
     #endif
 
     // MARK: - Static Constructors

Tests/OSCKitCoreTests/OSCTimeTag/OSCTimeTag Tests.swift

@@ -14,6 +14,8 @@ import Testing
     let tolerance: TimeInterval = 0.001
     #elseif targetEnvironment(macCatalyst) || os(iOS) || os(tvOS) || os(watchOS)
     let tolerance: TimeInterval = 0.01
+    #else // linux
+    let tolerance: TimeInterval = 0.05
     #endif
 
     @Test
@@ -204,9 +206,10 @@ import Testing
 
     @Test
     func now_date() {
+        let date = Date()
         let tag = OSCTimeTag.now()
         let captureDate = tag.date
-        #expect(Date().timeIntervalSince(captureDate).isApproximatelyEqual(to: 0.0, absoluteTolerance: tolerance))
+        #expect(date.timeIntervalSince(captureDate).isApproximatelyEqual(to: 0.0, absoluteTolerance: tolerance))
     }
 
     @Test

Tests/OSCKitCoreTests/Test Utilities.swift

@@ -4,18 +4,26 @@
 //  © 2020-2025 Steffan Andrews • Licensed under MIT License
 //
 
+import CoreFoundation
 import Foundation
 import Testing
 
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+private let USEC_PER_SEC = 1_000_000
+#endif
+
 /// Use as a condition for individual tests that rely on stable/precise system timing.
 func isSystemTimingStable(
     duration: TimeInterval = 0.1,
     tolerance: TimeInterval = 0.01
 ) -> Bool {
-    let durationMS = UInt32(duration * TimeInterval(USEC_PER_SEC))
+    let durationUS = UInt32(duration * TimeInterval(USEC_PER_SEC))
 
     let start = Date()
-    usleep(durationMS)
+    usleep(durationUS)
     let end = Date()
     let diff = end.timeIntervalSince(start)