Merge pull request #6 from musketyr/patch-1

ignore version called "wrapper"
This commit is contained in:
Paul Merlin 2019-12-09 15:18:28 +01:00 committed by GitHub
commit 0821518fd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

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

View file

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