Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
eskatos committed Oct 28, 2019
1 parent 580b26a commit 064f85c
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,24 @@ function resolveGradleExecutable(baseDirectory) {
return __awaiter(this, void 0, void 0, function* () {
const gradleVersion = inputOrNull("gradle-version");
if (gradleVersion != null) {
return provision.gradleVersion(gradleVersion);
return path.resolve(yield provision.gradleVersion(gradleVersion));
}
const gradleExecutable = inputOrNull("gradle-executable");
if (gradleExecutable != null) {
return path.join(baseDirectory, gradleExecutable);
return path.resolve(baseDirectory, gradleExecutable);
}
const wrapperDirectory = inputOrNull("wrapper-directory");
const executableDirectory = wrapperDirectory != null
? path.join(baseDirectory, wrapperDirectory)
: baseDirectory;
return path.join(executableDirectory, gradlew.wrapperFilename());
return path.resolve(executableDirectory, gradlew.wrapperFilename());
});
}
function resolveBuildRootDirectory(baseDirectory) {
let buildRootDirectory = inputOrNull("build-root-directory");
return buildRootDirectory == null ? baseDirectory : path.join(baseDirectory, buildRootDirectory);
return buildRootDirectory == null
? path.resolve(baseDirectory)
: path.resolve(baseDirectory, buildRootDirectory);
}
function parseCommandLineArguments() {
const input = inputOrNull("arguments");
Expand Down

0 comments on commit 064f85c

Please sign in to comment.