diff --git a/.gitignore b/.gitignore index cf9a40a5..1f55464b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,4 @@ xcuserdata *.xcuserstate XcodeGen.xcodeproj xcodegen.zip -xcodegen.artifactbundle.zip .vscode/launch.json diff --git a/Makefile b/Makefile index 1c30de3c..d726d9bc 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,3 @@ brew: archive: build ./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 diff --git a/Package.resolved b/Package.resolved index 3ae8a3da..e0328c8f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -9,15 +9,6 @@ "version" : "4.6.1" } }, - { - "identity" : "artifactbundlegen", - "kind" : "remoteSourceControl", - "location" : "https://github.com/freddi-kit/ArtifactBundleGen", - "state" : { - "revision" : "707e4ccc4b1c7e48e881cd5ea91e493a95df24bf", - "version" : "0.0.6" - } - }, { "identity" : "graphviz", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index c8940fe4..676226e6 100644 --- a/Package.swift +++ b/Package.swift @@ -20,8 +20,8 @@ let package = Package( .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/SwiftDocOrg/GraphViz.git", exact: "0.2.0"), - .package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6") ], + targets: [ .executableTarget(name: "XcodeGen", dependencies: [ "XcodeGenCLI", @@ -42,8 +42,6 @@ let package = Package( "PathKit", "XcodeGenCore", "GraphViz", - ], resources: [ - .copy("SettingPresets") ]), .target(name: "ProjectSpec", dependencies: [ "JSONUtilities", diff --git a/RELEASE.md b/RELEASE.md index ebd890a8..60e27d38 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -7,5 +7,5 @@ 1. Run `make release` 1. Push commit and tag to github 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 brew` which will open a PR on homebrew core \ No newline at end of file +1. Run `make archive` and upload `xcodegen.zip` to the github release +1. Run `make brew` which will open a PR on homebrew core diff --git a/Sources/XcodeGenKit/SettingPresets b/Sources/XcodeGenKit/SettingPresets deleted file mode 120000 index 1137a5ea..00000000 --- a/Sources/XcodeGenKit/SettingPresets +++ /dev/null @@ -1 +0,0 @@ -../../SettingPresets/ \ No newline at end of file diff --git a/Sources/XcodeGenKit/SettingsBuilder.swift b/Sources/XcodeGenKit/SettingsBuilder.swift index 81047de7..69aadf6f 100644 --- a/Sources/XcodeGenKit/SettingsBuilder.swift +++ b/Sources/XcodeGenKit/SettingsBuilder.swift @@ -249,9 +249,6 @@ 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 {