Skip to content

Commit 1935fd4

Browse files
committed
Build: Move gradle wrapper jar to a dot dir (#30146)
This commit moves the gradle wrapper jar file to a hidden directory, so that it does not clutter the top level names seen when doing an ls in the project. The actual jar file is never manually edited, and only changed by running `./gradlew wrapper ...` so it is not important for this directory to be "visible".
1 parent 1d2d5b1 commit 1935fd4

File tree

5 files changed

+15
-22
lines changed

5 files changed

+15
-22
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
54
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
66
distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294

build.gradle

+11-18
Original file line numberDiff line numberDiff line change
@@ -444,25 +444,18 @@ task run(type: Run) {
444444
impliesSubProjects = true
445445
}
446446

447-
task wrapper(type: Wrapper)
448-
449-
gradle.projectsEvaluated {
450-
451-
allprojects {
452-
tasks.withType(Wrapper) { Wrapper wrapper ->
453-
wrapper.distributionType = DistributionType.ALL
454-
455-
wrapper.doLast {
456-
final DistributionLocator locator = new DistributionLocator()
457-
final GradleVersion version = GradleVersion.version(wrapper.gradleVersion)
458-
final URI distributionUri = locator.getDistributionFor(version, wrapper.distributionType.name().toLowerCase(Locale.ENGLISH))
459-
final URI sha256Uri = new URI(distributionUri.toString() + ".sha256")
460-
final String sha256Sum = new String(sha256Uri.toURL().bytes)
461-
wrapper.getPropertiesFile() << "distributionSha256Sum=${sha256Sum}\n"
462-
}
463-
}
447+
task wrapper(type: Wrapper) {
448+
distributionType = DistributionType.ALL
449+
jarFile = file('.gradle-wrapper/gradle-wrapper.jar')
450+
doLast {
451+
final DistributionLocator locator = new DistributionLocator()
452+
final GradleVersion version = GradleVersion.version(gradleVersion)
453+
final URI distributionUri = locator.getDistributionFor(version, distributionType.name().toLowerCase(Locale.ENGLISH))
454+
final URI sha256Uri = new URI(distributionUri.toString() + ".sha256")
455+
final String sha256Sum = new String(sha256Uri.toURL().bytes)
456+
final String existingProperties = getPropertiesFile().getText('UTF-8')
457+
getPropertiesFile().setText("${existingProperties}distributionSha256Sum=${sha256Sum}\n", 'UTF-8')
464458
}
465-
466459
}
467460

468461
static void assertLinesInFile(final Path path, final List<String> expectedLines) {

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ case "`uname`" in
6464
;;
6565
esac
6666

67-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
67+
CLASSPATH=$APP_HOME/.gradle-wrapper/gradle-wrapper.jar
6868

6969
# Determine the Java command to use to start the JVM.
7070
if [ -n "$JAVA_HOME" ] ; then

gradlew.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ set CMD_LINE_ARGS=%*
6363
:execute
6464
@rem Setup the command line
6565

66-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
66+
set CLASSPATH=%APP_HOME%\.gradle-wrapper\gradle-wrapper.jar
6767

6868
@rem Execute Gradle
6969
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

0 commit comments

Comments
 (0)