Skip to content

Commit 512ec95

Browse files
committed
load Bundle.module
1 parent 2ed1bee commit 512ec95

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,3 @@ archive: build
5252
--package-version $(VERSION) \
5353
--executable-name $(EXECUTABLE_NAME) \
5454
--build-config release \
55-
--include-resource-path $(CURRENT_PATH)/SettingPresets

Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"kind" : "remoteSourceControl",
1515
"location" : "https://github.com/freddi-kit/ArtifactBundleGen",
1616
"state" : {
17-
"revision" : "8e03c58cb2648276544bbd52fe2e18ef5a4fa5af",
18-
"version" : "0.0.3"
17+
"revision" : "0c5cdf2d8e522aaf32d2f441efd002b757c5a4d2",
18+
"version" : "0.0.4"
1919
}
2020
},
2121
{

Package.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PackageDescription
44

55
let macOSOnlyDependency: [Package.Dependency]
66
#if !os(Linux)
7-
macOSOnlyDependency = [Package.Dependency.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.3")]
7+
macOSOnlyDependency = [Package.Dependency.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.4")]
88
#else
99
macOSOnlyDependency = []
1010
#endif
@@ -48,6 +48,8 @@ let package = Package(
4848
"PathKit",
4949
"XcodeGenCore",
5050
"GraphViz",
51+
], resources: [
52+
.copy("SettingPresets")
5153
]),
5254
.target(name: "ProjectSpec", dependencies: [
5355
"JSONUtilities",

Sources/XcodeGenKit/SettingPresets

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../SettingPresets/

Sources/XcodeGenKit/SettingsBuilder.swift

+3
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@ extension SettingsPresetFile {
202202
symlink.parent() + relativePath,
203203
] + possibleSettingsPaths
204204
}
205+
if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
206+
possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
207+
}
205208

206209
guard let settingsPath = possibleSettingsPaths.first(where: { $0.exists }) else {
207210
switch self {

0 commit comments

Comments
 (0)