From 8b0c13f011e827324fa5e917ec10e87fa34bdeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fo=C5=99t?= Date: Mon, 11 Nov 2019 11:33:17 +0100 Subject: [PATCH] Switch dependencies from branch to version. (#631) * Switch dependencies from branch to version. * Update CHANGELOG. --- CHANGELOG.md | 1 + Package.resolved | 18 +++++++++--------- Package.swift | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b4727f53ef..a2461a7c7a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ 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 diff --git a/Package.resolved b/Package.resolved index 4bd4e84321c..40247bc5d12 100644 --- a/Package.resolved +++ b/Package.resolved @@ -32,27 +32,27 @@ "package": "llbuild", "repositoryURL": "https://github.com/apple/swift-llbuild.git", "state": { - "branch": "master", - "revision": "f12b35be7243c09f17c9de1f71c21abf133b9da6", - "version": null + "branch": null, + "revision": "f73b84bc1525998e5e267f9d830c1411487ac65e", + "version": "0.2.0" } }, { "package": "SwiftPM", "repositoryURL": "https://github.com/apple/swift-package-manager", "state": { - "branch": "swift-5.0-RELEASE", - "revision": "3a57975e10be0b1a8b87992ddf3a49701036f96c", - "version": null + "branch": null, + "revision": "9abcc2260438177cecd7cf5185b144d13e74122b", + "version": "0.5.0" } }, { "package": "XcodeProj", "repositoryURL": "https://github.com/tuist/XcodeProj", "state": { - "branch": "master", - "revision": "e051bb1637ccfd51d98d1b056186319c9c75f1e4", - "version": null + "branch": null, + "revision": "0bea96dacbc7031893646be56c19e7a5e2c2881d", + "version": "7.4.0" } } ] diff --git a/Package.swift b/Package.swift index deec46d5556..39a462bf164 100644 --- a/Package.swift +++ b/Package.swift @@ -26,8 +26,8 @@ let package = Package( targets: ["TuistGenerator"]), ], dependencies: [ - .package(url: "https://github.com/tuist/XcodeProj", .branch("master")), - .package(url: "https://github.com/apple/swift-package-manager", .branch("swift-5.0-RELEASE")), + .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")), ], targets: [ .target(