Use em_proxy and minimuxer from gh release

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

View File

@@ -190,10 +190,16 @@ let package = Package(
dependencies: ["em_proxy"] dependencies: ["em_proxy"]
), ),
.binaryTarget( // .binaryTarget(
name: "em_proxy", // name: "em_proxy",
path: "Dependencies/em_proxy/em_proxy.xcframework.zip" // path: "Dependencies/em_proxy/em_proxy.xcframework.zip"
), // ),
.binaryTarget(
name: "em_proxy",
url: "https://github.com/SideStore/em_proxy/releases/download/build/em_proxy.xcframework.zip",
checksum: "8c745d9fdf121ab33b1007394c283d1a1a74a30efa0a52b22c29b766ea7d6a8e"
),
.testTarget( .testTarget(
name: "EmotionalDamageTests", name: "EmotionalDamageTests",
@@ -228,10 +234,16 @@ let package = Package(
] ]
), ),
.binaryTarget( // .binaryTarget(
name: "minimuxer", // name: "minimuxer",
path: "Dependencies/minimuxer/minimuxer.xcframework.zip" // path: "Dependencies/minimuxer/minimuxer.xcframework.zip"
), // ),
.binaryTarget(
name: "minimuxer",
url: "https://github.com/SideStore/minimuxer/releases/download/build/minimuxer.xcframework.zip",
checksum: "7a5423ad301dacc664ee5141942781f69753346bae148699ea21b1debdc0d3b5"
),
.testTarget( .testTarget(
name: "MiniMuxerTests", name: "MiniMuxerTests",

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