diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index f2407e3bb1..20cffcdb0d 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -44,7 +44,7 @@ let package = Package( .product(name: "Configuration", package: "BrowserServicesKit"), .product(name: "Persistence", package: "BrowserServicesKit"), ], - resources: [.process("Resources")], + resources: [.copy("Resources")], swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) ] @@ -56,7 +56,7 @@ let package = Package( "BrowserServicesKit", ], resources: [ - .process("Resources") + .copy("Resources") ] ) ] diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift index ffa67b2f73..9fc1276a18 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift @@ -44,9 +44,10 @@ final class FileResources: ResourcesRepository { throw FileResourcesError.bundleResourceURLNil } + let brokersURL = resourceURL.appendingPathComponent("Resources").appendingPathComponent("JSON") do { let fileURLs = try fileManager.contentsOfDirectory( - at: resourceURL, + at: brokersURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles] ) diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionDatabaseProviderTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionDatabaseProviderTests.swift index a449fe2794..8778506374 100644 --- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionDatabaseProviderTests.swift +++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionDatabaseProviderTests.swift @@ -56,7 +56,7 @@ final class DataBrokerProtectionDatabaseProviderTests: XCTestCase { do { // Sets up a test vault and restores data (with violations) from a `test-vault.sql` file sut = try DefaultDataBrokerProtectionDatabaseProvider(file: vaultURL, key: key, registerMigrationsHandler: Migrations.v2Migrations) - let fileURL = Bundle.module.url(forResource: "test-vault", withExtension: "sql")! + let fileURL = Bundle.module.url(forResource: "test-vault", withExtension: "sql", subdirectory: "Resources")! try sut.restoreDatabase(from: fileURL) } catch { XCTFail("Failed to create test-vault and insert data")