Cleanup and testing for iOS

Rallista · Oct 13, 2024 · 7f990b9 · 7f990b9
1 parent 7e3cfb1
commit 7f990b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Package.swift b/Package.swift
@@ -53,7 +53,7 @@ let package = Package(
             ],
             path: "apple/Sources/Valhalla",
             resources: [
-                .copy("SupportData")
+                .process("SupportData")
             ]
         ),
         .target(

diff --git a/apple/Sources/Valhalla/Extensions/ValhallaConfig.swift b/apple/Sources/Valhalla/Extensions/ValhallaConfig.swift
@@ -22,8 +22,8 @@ extension ValhallaConfig {
     ///
     /// This can be used to manipulate select values as a var.
     init() {
-        guard let configJsonURL = Bundle.module.url(forResource: "SupportData/default", withExtension: "json") else {
-            fatalError("ValhallaConfig SupportData/default.json config resource not found in module bundle.")
+        guard let configJsonURL = Bundle.module.url(forResource: "default", withExtension: "json") else {
+            fatalError("ValhallaConfig default.json config resource not found in module bundle.")
         }
 
         do {
@@ -68,8 +68,8 @@ extension ValhallaConfig {
     }
 
     static func loadDefault() -> ValhallaConfig {
-        guard let configJsonURL = Bundle.module.url(forResource: "SupportData/default", withExtension: "json") else {
-            fatalError("ValhallaConfig SupportData/default.json config resource not found in module bundle.")
+        guard let configJsonURL = Bundle.module.url(forResource: "default", withExtension: "json") else {
+            fatalError("ValhallaConfig default.json config resource not found in module bundle.")
         }
 
         do {

diff --git a/apple/Sources/Valhalla/ValhallaFileManager.swift b/apple/Sources/Valhalla/ValhallaFileManager.swift
@@ -31,7 +31,7 @@ enum ValhallaFileManager {
     /// Learn more see <https://github.com/HowardHinnant/date>
     /// and <https://howardhinnant.github.io/date/tz.html#Installation>
     static func injectTzdataIntoLibrary() throws {
-        guard let tzdataFileURL = Bundle.module.url(forResource: "SupportData/tzdata", withExtension: "tar") else {
+        guard let tzdataFileURL = Bundle.module.url(forResource: "tzdata", withExtension: "tar") else {
             throw ValhallaFileManagerError.tzdataNotFound
         }