Working iOS valhalla

.swiftpm/xcode/xcuserdata/jacob.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "95E7184A-5252-4166-8F01-1A0F25B80F5D"
+   type = "1"
+   version = "2.0">
+</Bucket>

Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "light-swift-untar",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/UInt2048/Light-Swift-Untar.git",
+      "state" : {
+        "revision" : "fcff1f1b82373ea64b9565a364f63ffe7fdecf9f",
+        "version" : "1.0.4"
+      }
+    }
+  ],
+  "version" : 2
+}

Package.swift

@@ -1,25 +1,32 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
     name: "ValhallaMobile",
     platforms: [
-        .iOS(.v13)
-        // TODO: Add support for other platforms?
+        .iOS(.v13),
+        .watchOS(.v6),
+        .tvOS(.v13),
+        .macOS(.v10_13)
     ],
     products: [
         .library(
             name: "Valhalla",
             targets: ["Valhalla"])
     ],
     dependencies: [
-        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/UInt2048/Light-Swift-Untar.git", from: "1.0.4")
     ],
     targets: [
         .target(
             name: "Valhalla",
-            dependencies: ["ValhallaObjc", "ValhallaWrapper"],
-            path: "apple/Sources/Valhalla"
+            dependencies: [
+                "ValhallaObjc",
+                "ValhallaWrapper",
+                .product(name: "Light-Swift-Untar", package: "Light-Swift-Untar")
+            ],
+            path: "apple/Sources/Valhalla",
+            resources: [.copy("SupportData")]
         ),
         .target(
             name: "ValhallaObjc",
@@ -36,7 +43,8 @@ let package = Package(
         .testTarget(
             name: "ValhallaTests",
             dependencies: ["Valhalla"],
-            path: "apple/Tests"
+            path: "apple/Tests/ValhallaTests",
+            resources: [.copy("TestData")]
         )
     ],
     cLanguageStandard: .gnu17,

README.md

@@ -8,4 +8,10 @@ Because gradle doesn't automatically handle git submodules, you will need to man
 
 ```
 git submodule update --init --recursive
-```
+
+./build.sh
+```
+
+## References
+
+- Swift Package Manager C++ <https://www.swift.org/documentation/articles/wrapping-c-cpp-library-in-swift.html>

apple/Sources/Valhalla/TZDatabaseManager.swift

@@ -0,0 +1,26 @@
+import Foundation
+import Light_Swift_Untar
+
+enum TZDatabaseError: Error {
+    case tzdataNotFound
+    case libraryNotFound
+}
+
+final class TZDatabaseManager {
+
+    static func injectIntoMain() throws {
+        guard let tzdataFileURL = Bundle.module.url(forResource: "SupportData/tzdata", withExtension: "tar") else {
+            throw TZDatabaseError.tzdataNotFound
+        }
+
+        guard let libraryDirectory = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first else {
+            throw TZDatabaseError.libraryNotFound
+        }
+
+        let tzdataFileData = try Data(contentsOf: tzdataFileURL)
+        let libraryURL = libraryDirectory.appendingPathComponent("tzdata")
+
+        // Write the tar to Library/tzdata
+        try FileManager.default.createFilesAndDirectories(url: libraryURL, tarData: tzdataFileData)
+    }
+}

apple/Sources/Valhalla/Valhalla.swift

@@ -1,16 +1,23 @@
 import ValhallaObjc
 
-public protocol ValhallaProtocol {
+public protocol ValhallaProviding {
     init(configPath: String)
     func route(request: String) -> String
 }
 
-class Valhalla: ValhallaProtocol {
+public final class Valhalla: ValhallaProviding {
 
     private let actor = ValhallaWrapper()
     private var configPath: String
 
     public required init(configPath: String) {
+        do {
+            try TZDatabaseManager.injectIntoMain()
+        } catch {
+            // If you're circumventing this libraries injection, download tzdata.tar and put in your bundle. https://www.iana.org/time-zones
+            assertionFailure("tzdata was not inject into Bundle.main. This can be avoided by including tzdata.tar in your main bundle.")
+        }
+
         self.configPath = configPath
     }