Skip to content

Commit

Permalink
Revert "Switch dependencies from branch to version. (tuist#631)"
Browse files Browse the repository at this point in the history
This reverts commit 8b0c13f.
  • Loading branch information
Marek For虒t committed Nov 11, 2019
1 parent 95ddb06 commit 4644c38
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Expand Up @@ -18,7 +18,6 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/

### Changed

- Change dependencies in `Package.resolved` to version from branch https://github.com/tuist/tuist/pull/631 by @fortmarek
- Rename `TuistCore` to `TuistSupport` https://github.com/tuist/tuist/pull/621 by @pepibumur.
- Introduce `Systems.shared`, `TuistTestCase`, and `TuistUnitTestCase` https://github.com/tuist/tuist/pull/519 by @pepibumur.
- Change generated object version behaviour to mimic Xcode 11 by @adamkhazi
Expand Down
18 changes: 9 additions & 9 deletions Package.resolved
Expand Up @@ -32,27 +32,27 @@
"package": "llbuild",
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
"state": {
"branch": null,
"revision": "f73b84bc1525998e5e267f9d830c1411487ac65e",
"version": "0.2.0"
"branch": "master",
"revision": "f12b35be7243c09f17c9de1f71c21abf133b9da6",
"version": null
}
},
{
"package": "SwiftPM",
"repositoryURL": "https://github.com/apple/swift-package-manager",
"state": {
"branch": null,
"revision": "9abcc2260438177cecd7cf5185b144d13e74122b",
"version": "0.5.0"
"branch": "swift-5.0-RELEASE",
"revision": "3a57975e10be0b1a8b87992ddf3a49701036f96c",
"version": null
}
},
{
"package": "XcodeProj",
"repositoryURL": "https://github.com/tuist/XcodeProj",
"state": {
"branch": null,
"revision": "0bea96dacbc7031893646be56c19e7a5e2c2881d",
"version": "7.4.0"
"branch": "master",
"revision": "e051bb1637ccfd51d98d1b056186319c9c75f1e4",
"version": null
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Expand Up @@ -26,8 +26,8 @@ let package = Package(
targets: ["TuistGenerator"]),
],
dependencies: [
.package(url: "https://github.com/tuist/XcodeProj", .upToNextMajor(from: "7.4.0")),
.package(url: "https://github.com/apple/swift-package-manager", .upToNextMajor(from: "0.5.0")),
.package(url: "https://github.com/tuist/XcodeProj", .branch("master")),
.package(url: "https://github.com/apple/swift-package-manager", .branch("swift-5.0-RELEASE")),
],
targets: [
.target(
Expand Down

0 comments on commit 4644c38

Please sign in to comment.