Skip to content

Commit 084fd01

Browse files
committed
Revert "Support Artifact Bundle (#1388)"
This reverts commit 2c15007. # Conflicts: # CHANGELOG.md
1 parent d1110b1 commit 084fd01

File tree

7 files changed

+3
-24
lines changed

7 files changed

+3
-24
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ xcuserdata
77
*.xcuserstate
88
XcodeGen.xcodeproj
99
xcodegen.zip
10-
xcodegen.artifactbundle.zip
1110
.vscode/launch.json

Makefile

-5
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,3 @@ brew:
4848

4949
archive: build
5050
./scripts/archive.sh "$(EXECUTABLE_PATH)"
51-
swift package plugin --allow-writing-to-package-directory generate-artifact-bundle \
52-
--package-version $(VERSION) \
53-
--executable-name $(EXECUTABLE_NAME) \
54-
--build-config release \
55-
--include-resource-path LICENSE

Package.resolved

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
"version" : "4.6.1"
1010
}
1111
},
12-
{
13-
"identity" : "artifactbundlegen",
14-
"kind" : "remoteSourceControl",
15-
"location" : "https://github.com/freddi-kit/ArtifactBundleGen",
16-
"state" : {
17-
"revision" : "707e4ccc4b1c7e48e881cd5ea91e493a95df24bf",
18-
"version" : "0.0.6"
19-
}
20-
},
2112
{
2213
"identity" : "graphviz",
2314
"kind" : "remoteSourceControl",

Package.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ let package = Package(
2020
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
2121
.package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
2222
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", exact: "0.2.0"),
23-
.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6")
2423
],
24+
2525
targets: [
2626
.executableTarget(name: "XcodeGen", dependencies: [
2727
"XcodeGenCLI",
@@ -42,8 +42,6 @@ let package = Package(
4242
"PathKit",
4343
"XcodeGenCore",
4444
"GraphViz",
45-
], resources: [
46-
.copy("SettingPresets")
4745
]),
4846
.target(name: "ProjectSpec", dependencies: [
4947
"JSONUtilities",

RELEASE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
1. Run `make release`
88
1. Push commit and tag to github
99
1. Create release from tag on GitHub using the version number and relevant changelog contents
10-
1. Run `make archive` and upload `xcodegen.zip` and `xcodegen.artifactbundle.zip` to the github release
11-
1. Run `make brew` which will open a PR on homebrew core
10+
1. Run `make archive` and upload `xcodegen.zip` to the github release
11+
1. Run `make brew` which will open a PR on homebrew core

Sources/XcodeGenKit/SettingPresets

-1
This file was deleted.

Sources/XcodeGenKit/SettingsBuilder.swift

-3
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@ extension SettingsPresetFile {
249249
symlink.parent() + relativePath,
250250
] + possibleSettingsPaths
251251
}
252-
if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
253-
possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
254-
}
255252

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

0 commit comments

Comments
 (0)