load Bundle.module

yonaskolb · Sep 6, 2023 · 512ec95 · 512ec95
1 parent 2ed1bee
commit 512ec95
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -52,4 +52,3 @@ archive: build
 		--package-version $(VERSION) \
 		--executable-name $(EXECUTABLE_NAME) \
 		--build-config release \
-		--include-resource-path $(CURRENT_PATH)/SettingPresets
diff --git a/Package.resolved b/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/freddi-kit/ArtifactBundleGen",
       "state" : {
-        "revision" : "8e03c58cb2648276544bbd52fe2e18ef5a4fa5af",
-        "version" : "0.0.3"
+        "revision" : "0c5cdf2d8e522aaf32d2f441efd002b757c5a4d2",
+        "version" : "0.0.4"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 
 let macOSOnlyDependency: [Package.Dependency]
 #if !os(Linux)
-    macOSOnlyDependency = [Package.Dependency.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.3")]
+    macOSOnlyDependency = [Package.Dependency.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.4")]
 #else
     macOSOnlyDependency = []
 #endif
@@ -48,6 +48,8 @@ let package = Package(
             "PathKit",
             "XcodeGenCore",
             "GraphViz",
+        ], resources: [
+            .copy("SettingPresets")
         ]),
         .target(name: "ProjectSpec", dependencies: [
             "JSONUtilities",

diff --git a/Sources/XcodeGenKit/SettingPresets b/Sources/XcodeGenKit/SettingPresets
@@ -0,0 +1 @@
+../../SettingPresets/
diff --git a/Sources/XcodeGenKit/SettingsBuilder.swift b/Sources/XcodeGenKit/SettingsBuilder.swift
@@ -202,6 +202,9 @@ extension SettingsPresetFile {
                 symlink.parent() + relativePath,
             ] + possibleSettingsPaths
         }
+        if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
+            possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
+        }
 
         guard let settingsPath = possibleSettingsPaths.first(where: { $0.exists }) else {
             switch self {