Merge pull request #18 from dastrobu/build-fix

Build fix

Author: dastrobu

.github/workflows/ci.yaml

@@ -13,8 +13,6 @@ jobs:
       matrix:
         swift-version:
           - "5.5"
-          - "5.4"
-          - "5.3"
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -27,11 +25,18 @@ jobs:
       matrix:
         swift-version:
           - "5.5"
+          - "5.4"
+          - "5.3"
+          - "5.2"
+          - "5.1"
           - "5.0"
-          - "4"
-          - "4.0"
     runs-on: ubuntu-latest
     container: swift:${{ matrix.swift-version }}
     steps:
       - uses: actions/checkout@v2
       - run: swift test
+  ios-build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: xcodebuild -scheme vincenty -destination 'platform=iOS Simulator,name=iPhone 13'

Sources/vincenty/vincenty.swift

@@ -1,6 +1,6 @@
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux)
+#elseif canImport(Glibc)
 import Glibc
 #endif
 
@@ -41,7 +41,7 @@ public func distance(_ x: (lat: Double, lon: Double),
                      tol: Double = 1e-12,
                      maxIter: UInt = 200,
                      ellipsoid: (a: Double, f: Double) = wgs84) throws -> Double {
-    try solveInverse(x, y, tol: tol, maxIter: maxIter, ellipsoid: ellipsoid).distance;
+    return try solveInverse(x, y, tol: tol, maxIter: maxIter, ellipsoid: ellipsoid).distance;
 }
 
 

Tests/vincentyTests/XCTestManifests.swift

@@ -1,6 +1,6 @@
 import XCTest
 
-#if !os(macOS)
+#if os(Linux)
 public func allTests() -> [XCTestCaseEntry] {
     return [
         testCase(VincentyTests.allTests),