From 0b69973537d1adf17476e7f64efe899fe6d87a29 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Sat, 18 Jan 2025 12:41:09 +0100 Subject: [PATCH] Moved the files under the "Resources/Files" folder in the library target to the "Resources/Files/Sources" folder. --- .../Files/{docker_file => Sources/DockerFile} | 0 .../Files/{docker_ignore => Sources/DockerIgnore} | 0 .../Files/{git_ignore => Sources/GitIgnore} | 0 .../Resources/Files/{license => Sources/License} | 0 .../Resources/Files/{package => Sources/Package} | 0 Library/Resources/Files/{readme => Sources/Readme} | 0 Library/Sources/Internal/Enumerations/File.swift | 14 +++++++------- Library/Sources/Public/Tasks/CopyFilesTask.swift | 8 ++++---- .../Cases/Internal/Enumerations/FileTests.swift | 12 ++++++------ 9 files changed, 17 insertions(+), 17 deletions(-) rename Library/Resources/Files/{docker_file => Sources/DockerFile} (100%) rename Library/Resources/Files/{docker_ignore => Sources/DockerIgnore} (100%) rename Library/Resources/Files/{git_ignore => Sources/GitIgnore} (100%) rename Library/Resources/Files/{license => Sources/License} (100%) rename Library/Resources/Files/{package => Sources/Package} (100%) rename Library/Resources/Files/{readme => Sources/Readme} (100%) diff --git a/Library/Resources/Files/docker_file b/Library/Resources/Files/Sources/DockerFile similarity index 100% rename from Library/Resources/Files/docker_file rename to Library/Resources/Files/Sources/DockerFile diff --git a/Library/Resources/Files/docker_ignore b/Library/Resources/Files/Sources/DockerIgnore similarity index 100% rename from Library/Resources/Files/docker_ignore rename to Library/Resources/Files/Sources/DockerIgnore diff --git a/Library/Resources/Files/git_ignore b/Library/Resources/Files/Sources/GitIgnore similarity index 100% rename from Library/Resources/Files/git_ignore rename to Library/Resources/Files/Sources/GitIgnore diff --git a/Library/Resources/Files/license b/Library/Resources/Files/Sources/License similarity index 100% rename from Library/Resources/Files/license rename to Library/Resources/Files/Sources/License diff --git a/Library/Resources/Files/package b/Library/Resources/Files/Sources/Package similarity index 100% rename from Library/Resources/Files/package rename to Library/Resources/Files/Sources/Package diff --git a/Library/Resources/Files/readme b/Library/Resources/Files/Sources/Readme similarity index 100% rename from Library/Resources/Files/readme rename to Library/Resources/Files/Sources/Readme diff --git a/Library/Sources/Internal/Enumerations/File.swift b/Library/Sources/Internal/Enumerations/File.swift index 3463a6e..203ff5e 100644 --- a/Library/Sources/Internal/Enumerations/File.swift +++ b/Library/Sources/Internal/Enumerations/File.swift @@ -1,10 +1,10 @@ enum File: String { - case dockerFile = "docker_file" - case dockerIgnore = "docker_ignore" - case gitIgnore = "git_ignore" - case license - case package - case readme + case dockerFile = "DockerFile" + case dockerIgnore = "DockerIgnore" + case gitIgnore = "GitIgnore" + case license = "License" + case package = "Package" + case readme = "Readme" } // MARK: - Properties @@ -38,7 +38,7 @@ extension File { var resourcePath: String { switch self { - default: "Resources/Files" + default: "Resources/Files/Sources" } } diff --git a/Library/Sources/Public/Tasks/CopyFilesTask.swift b/Library/Sources/Public/Tasks/CopyFilesTask.swift index 774651c..65fce3d 100644 --- a/Library/Sources/Public/Tasks/CopyFilesTask.swift +++ b/Library/Sources/Public/Tasks/CopyFilesTask.swift @@ -20,17 +20,17 @@ public struct CopyFilesTask { // MARK: Functions public func callAsFunction(to rootFolder: URL) async throws (FileServiceError) { - for resource in File.allCases { + for file in File.allCases { guard let source = bundleService.url( - forResource: resource.rawValue, + forResource: file.rawValue, withExtension: nil, - subdirectory: resource.resourcePath + subdirectory: file.resourcePath ) else { assertionFailure("URL should have been initialized.") return } - let destination = rootFolder.appendingPath(resource.filePath) + let destination = rootFolder.appendingPath(file.filePath) try await fileService.copyFile(from: source, to: destination) } diff --git a/Test/Sources/Cases/Internal/Enumerations/FileTests.swift b/Test/Sources/Cases/Internal/Enumerations/FileTests.swift index 48b71ea..f28e8d6 100644 --- a/Test/Sources/Cases/Internal/Enumerations/FileTests.swift +++ b/Test/Sources/Cases/Internal/Enumerations/FileTests.swift @@ -81,12 +81,12 @@ private extension FileTests { static let resourcePaths: [String] = [ - "Resources/Files", - "Resources/Files", - "Resources/Files", - "Resources/Files", - "Resources/Files", - "Resources/Files" + "Resources/Files/Sources", + "Resources/Files/Sources", + "Resources/Files/Sources", + "Resources/Files/Sources", + "Resources/Files/Sources", + "Resources/Files/Sources" ] } }