Skip to content

Commit 90b4922

Browse files
committed
add support for specifying the gradle distribution in the gradle-version argument
1 parent db7b76b commit 90b4922

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/main/java/org/gradle/profiler/CommandLineParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public InvocationSettings parseSettings(String[] args) throws IOException, Setti
3636
parser.nonOptions("The scenarios or task names to run");
3737
ArgumentAcceptingOptionSpec<File> projectOption = parser.accepts("project-dir", "The directory containing the build to run")
3838
.withRequiredArg().ofType(File.class).defaultsTo(new File(".").getCanonicalFile());
39-
ArgumentAcceptingOptionSpec<String> gradleVersionOption = parser.accepts("gradle-version", "Gradle version or installation to use to run build")
39+
ArgumentAcceptingOptionSpec<String> gradleVersionOption = parser.accepts("gradle-version", "Gradle version, distribution or installation to use to run build")
4040
.withRequiredArg();
4141
ArgumentAcceptingOptionSpec<File> gradleUserHomeOption = parser.accepts("gradle-user-home", "The Gradle user home to use")
4242
.withRequiredArg()

src/main/java/org/gradle/profiler/gradle/DefaultGradleBuildConfigurationReader.java

+7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.io.IOException;
1717
import java.io.InputStream;
1818
import java.io.PrintWriter;
19+
import java.net.URI;
1920
import java.nio.file.Files;
2021
import java.util.ArrayList;
2122
import java.util.Collections;
@@ -89,6 +90,12 @@ private GradleBuildConfiguration doResolveVersion(String versionString) {
8990
if (versionString.matches("\\d+(\\.\\d+)+(-.+)?")) {
9091
return probe(connector().useGradleVersion(versionString));
9192
}
93+
try {
94+
URI distributionUri = URI.create(versionString);
95+
return probe(connector().useDistribution(distributionUri));
96+
} catch (IllegalArgumentException e) {
97+
// do nothing because versionString is not gradle distribution uri
98+
}
9299
} catch (IOException e) {
93100
throw new RuntimeException("Could not locate Gradle distribution for requested version '" + versionString + "'.", e);
94101
}

0 commit comments

Comments
 (0)