Merge branch 'master' into releases/v1

This commit is contained in:
Paul Merlin committed 2019-12-09 15:20:11 +01:00
commit a2ba194e38
2 files changed
+2 -1

No files matched your search

+1
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. |
+1 -1
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))
}