From 19cf1722fa866d38fa61c6280e5dfe610b21af1c Mon Sep 17 00:00:00 2001 From: Joe Mattiello Date: Wed, 1 Mar 2023 19:45:44 -0500 Subject: [PATCH] Use em_proxy and minimuxer from gh release --- Package.swift | 28 +++++++++++++------ Plugins/CargoPlugin/Plugin.swift | 6 ++-- .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../xcshareddata/xcschemes/AltDaemon.xcscheme | 0 .../xcshareddata/xcschemes/AltPlugin.xcscheme | 0 .../xcshareddata/xcschemes/AltServer.xcscheme | 0 .../xcschemes/AltStore - Release.xcscheme | 0 .../xcshareddata/xcschemes/AltStore.xcscheme | 0 .../xcshareddata/xcschemes/AltXPC.xcscheme | 0 12 files changed, 23 insertions(+), 11 deletions(-) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/project.pbxproj (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltDaemon.xcscheme (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltPlugin.xcscheme (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltServer.xcscheme (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltStore - Release.xcscheme (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltStore.xcscheme (100%) rename {SideStore.xcodeproj => SideStore.bak.xcodeproj}/xcshareddata/xcschemes/AltXPC.xcscheme (100%) diff --git a/Package.swift b/Package.swift index 7472feda..53142331 100644 --- a/Package.swift +++ b/Package.swift @@ -190,10 +190,16 @@ let package = Package( dependencies: ["em_proxy"] ), - .binaryTarget( - name: "em_proxy", - path: "Dependencies/em_proxy/em_proxy.xcframework.zip" - ), +// .binaryTarget( +// name: "em_proxy", +// 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( name: "EmotionalDamageTests", @@ -228,10 +234,16 @@ let package = Package( ] ), - .binaryTarget( - name: "minimuxer", - path: "Dependencies/minimuxer/minimuxer.xcframework.zip" - ), +// .binaryTarget( +// name: "minimuxer", +// path: "Dependencies/minimuxer/minimuxer.xcframework.zip" +// ), + + .binaryTarget( + name: "minimuxer", + url: "https://github.com/SideStore/minimuxer/releases/download/build/minimuxer.xcframework.zip", + checksum: "7a5423ad301dacc664ee5141942781f69753346bae148699ea21b1debdc0d3b5" + ), .testTarget( name: "MiniMuxerTests", diff --git a/Plugins/CargoPlugin/Plugin.swift b/Plugins/CargoPlugin/Plugin.swift index 43d5a996..a8730a11 100644 --- a/Plugins/CargoPlugin/Plugin.swift +++ b/Plugins/CargoPlugin/Plugin.swift @@ -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 diff --git a/SideStore.xcodeproj/project.pbxproj b/SideStore.bak.xcodeproj/project.pbxproj similarity index 100% rename from SideStore.xcodeproj/project.pbxproj rename to SideStore.bak.xcodeproj/project.pbxproj diff --git a/SideStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SideStore.bak.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from SideStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to SideStore.bak.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/SideStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SideStore.bak.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from SideStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to SideStore.bak.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SideStore.bak.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to SideStore.bak.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltDaemon.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltDaemon.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltDaemon.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltDaemon.xcscheme diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltServer.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltServer.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltServer.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltServer.xcscheme diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltStore - Release.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltStore - Release.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltStore - Release.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltStore - Release.xcscheme diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltStore.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltStore.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltStore.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltStore.xcscheme diff --git a/SideStore.xcodeproj/xcshareddata/xcschemes/AltXPC.xcscheme b/SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltXPC.xcscheme similarity index 100% rename from SideStore.xcodeproj/xcshareddata/xcschemes/AltXPC.xcscheme rename to SideStore.bak.xcodeproj/xcshareddata/xcschemes/AltXPC.xcscheme