Revert "Support Artifact Bundle (#1388)"

This reverts commit 2c1500761d.

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Yonas Kolb 2024-02-15 21:26:35 +11:00
parent d1110b1a72
commit 084fd01c30
7 changed files with 3 additions and 24 deletions

1
.gitignore vendored
View File

@ -7,5 +7,4 @@ xcuserdata
*.xcuserstate *.xcuserstate
XcodeGen.xcodeproj XcodeGen.xcodeproj
xcodegen.zip xcodegen.zip
xcodegen.artifactbundle.zip
.vscode/launch.json .vscode/launch.json

View File

@ -48,8 +48,3 @@ brew:
archive: build archive: build
./scripts/archive.sh "$(EXECUTABLE_PATH)" ./scripts/archive.sh "$(EXECUTABLE_PATH)"
swift package plugin --allow-writing-to-package-directory generate-artifact-bundle \
--package-version $(VERSION) \
--executable-name $(EXECUTABLE_NAME) \
--build-config release \
--include-resource-path LICENSE

View File

@ -9,15 +9,6 @@
"version" : "4.6.1" "version" : "4.6.1"
} }
}, },
{
"identity" : "artifactbundlegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/freddi-kit/ArtifactBundleGen",
"state" : {
"revision" : "707e4ccc4b1c7e48e881cd5ea91e493a95df24bf",
"version" : "0.0.6"
}
},
{ {
"identity" : "graphviz", "identity" : "graphviz",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",

View File

@ -20,8 +20,8 @@ let package = Package(
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"), .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
.package(url: "https://github.com/mxcl/Version", from: "2.0.0"), .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", exact: "0.2.0"), .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", exact: "0.2.0"),
.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6")
], ],
targets: [ targets: [
.executableTarget(name: "XcodeGen", dependencies: [ .executableTarget(name: "XcodeGen", dependencies: [
"XcodeGenCLI", "XcodeGenCLI",
@ -42,8 +42,6 @@ let package = Package(
"PathKit", "PathKit",
"XcodeGenCore", "XcodeGenCore",
"GraphViz", "GraphViz",
], resources: [
.copy("SettingPresets")
]), ]),
.target(name: "ProjectSpec", dependencies: [ .target(name: "ProjectSpec", dependencies: [
"JSONUtilities", "JSONUtilities",

View File

@ -7,5 +7,5 @@
1. Run `make release` 1. Run `make release`
1. Push commit and tag to github 1. Push commit and tag to github
1. Create release from tag on GitHub using the version number and relevant changelog contents 1. Create release from tag on GitHub using the version number and relevant changelog contents
1. Run `make archive` and upload `xcodegen.zip` and `xcodegen.artifactbundle.zip` to the github release 1. Run `make archive` and upload `xcodegen.zip` to the github release
1. Run `make brew` which will open a PR on homebrew core 1. Run `make brew` which will open a PR on homebrew core

View File

@ -1 +0,0 @@
../../SettingPresets/

View File

@ -249,9 +249,6 @@ extension SettingsPresetFile {
symlink.parent() + relativePath, symlink.parent() + relativePath,
] + possibleSettingsPaths ] + 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 { guard let settingsPath = possibleSettingsPaths.first(where: { $0.exists }) else {
switch self { switch self {