neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-16 10:13:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use em_proxy and minimuxer from gh release

Browse Source
This commit is contained in:
Joe Mattiello
2023-03-01 19:45:44 -05:00
parent c28a45f100
commit 19cf1722fa
12 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/CargoPlugin/Plugin.swift
View File

@@ -33,7 +33,7 @@ struct CargoPlugin: BuildToolPlugin {
// Manually look for configuration files, to avoid issues when the plugin does not execute our tool from the
// package source directory.
if let configuration = packageDirectory.firstConfigurationFileInParentDirectories() {
arguments.append(contentsOf: ["--config", "\(configuration.string)"])
arguments.append(contentsOf: ["--manifest-path", "\(configuration.string)"])
}
arguments += inputFiles.map(\.string)
@@ -57,7 +57,7 @@ import XcodeProjectPlugin
extension CargoPlugin: XcodeBuildToolPlugin {
func createBuildCommands(context: XcodePluginContext, target: XcodeTarget) throws -> [Command] {
let inputFilePaths = target.inputFiles
.filter { $0.type == .source && $0.path.extension == "swift" }
.filter { $0.type == .source && $0.path.extension == "toml" }
.map(\.path)
return createBuildCommands(
inputFiles: inputFilePaths,
@@ -80,7 +80,7 @@ extension Path {
///
/// - returns: Path to the configuration file, or nil if one cannot be found.
func firstConfigurationFileInParentDirectories() -> Path? {
let defaultConfigurationFileName = ".swiftlint.yml"
let defaultConfigurationFileName = "Cargo.toml"
let proposedDirectory = sequence(
first: self,
next: { path in