Compare commits

..

5 Commits

Author SHA1 Message Date
Paul Merlin
d0c5f7955e build 2019-12-09 15:22:02 +01:00
Paul Merlin
a2ba194e38 Merge branch 'master' into releases/v1 2019-12-09 15:20:11 +01:00
Paul Merlin
0821518fd9 Merge pull request #6 from musketyr/patch-1
ignore version called "wrapper"
2019-12-09 15:18:28 +01:00
Vladimir Orany
c8b76ea3f7 Update README.md 2019-12-09 10:46:30 +01:00
Vladimir Orany
bf26498bc4 ignore version called "wrapper"
fixes #5
2019-12-09 10:44:21 +01:00
3 changed files with 3 additions and 2 deletions

View File

@@ -92,6 +92,7 @@ Moreover, you can use the following aliases:
| Alias | Selects |
| --- |---|
| `wrapper` | The Gradle wrapper's version (default, useful for matrix builds) |
| `current` | The current [stable release](https://gradle.org/install/) |
| `rc` | The current [release candidate](https://gradle.org/release-candidate/) if any, otherwise fallback to `current` |
| `nightly` | The latest [nightly](https://gradle.org/nightly/), fails if none. |

View File

@@ -44,7 +44,7 @@ run();
function resolveGradleExecutable(baseDirectory) {
return __awaiter(this, void 0, void 0, function* () {
const gradleVersion = inputOrNull("gradle-version");
if (gradleVersion != null) {
if (gradleVersion != null && gradleVersion != "wrapper") {
return path.resolve(yield provision.gradleVersion(gradleVersion));
}
const gradleExecutable = inputOrNull("gradle-executable");

View File

@@ -39,7 +39,7 @@ run();
async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
const gradleVersion = inputOrNull("gradle-version");
if (gradleVersion != null) {
if (gradleVersion != null && gradleVersion != "wrapper") {
return path.resolve(await provision.gradleVersion(gradleVersion))
}