Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace SPM dependency with Swift Tool Support #59

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Replace SPM dependency with Swift Tool Support #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,12 @@
}
},
{
"package": "llbuild",
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
"package": "swift-tools-support-core",
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
"state": {
"branch": null,
"revision": "f73b84bc1525998e5e267f9d830c1411487ac65e",
"version": "0.2.0"
}
},
{
"package": "SwiftPM",
"repositoryURL": "https://github.com/apple/swift-package-manager",
"state": {
"branch": null,
"revision": "9abcc2260438177cecd7cf5185b144d13e74122b",
"version": "0.5.0"
"revision": "81e2cda46447b4d78c18e03b0d284d76950f7c2b",
"version": "0.1.5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah nvm it's already picked that version up - how odd :/

}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/apple/swift-package-manager", .upToNextMajor(from: "0.5.0")),
.package(url: "https://github.com/apple/swift-tools-support-core.git", .upToNextMajor(from: "0.1.0")),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe if we bump the version to 0.1.5 we'll get the fix for this :)

swiftlang/swift-tools-support-core@f34f419#diff-8a8089dc1f441b3f42878901d077d13cR11

Thanks @lakpa !

.package(url: "https://github.com/kylef/PathKit", .upToNextMinor(from: "1.0.0")),
.package(url: "https://github.com/tuist/xcodeproj.git", .upToNextMajor(from: "7.8.0")),
],
Expand All @@ -34,7 +34,7 @@ let package = Package(
),
.target(
name: "XCDiffCommand",
dependencies: ["PathKit", "SPMUtility", "XCDiffCore"]
dependencies: ["PathKit", "SwiftToolsSupport-auto", "XCDiffCore"]
),
.target(
name: "XCDiffCore",
Expand Down
4 changes: 2 additions & 2 deletions Sources/XCDiffCommand/CommandRunner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
//

// swiftlint:disable type_body_length
import Basic
import Foundation
import PathKit
import SPMUtility
import TSCBasic
import TSCUtility
import XCDiffCore

public final class CommandRunner {
Expand Down
4 changes: 2 additions & 2 deletions Sources/XCDiffCommand/Constants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
// limitations under the License.
//

import Basic
import Foundation
import SPMUtility
import TSCBasic
import TSCUtility

final class Constants {
static let version: Version = {
Expand Down