Skip to content

Commit 25a5dd0

Browse files
committed
Revert "Build: Move gradle wrapper jar to a dot dir (#30146)"
This reverts commit a324cd4. A non default gradle wrapper location causes intellij to fail in mysterious ways....
1 parent 62692d6 commit 25a5dd0

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

build.gradle

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

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')
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+
}
458464
}
465+
459466
}
460467

461468
static void assertLinesInFile(final Path path, final List<String> expectedLines) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
4-
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
5+
zipStoreBase=GRADLE_USER_HOME
66
distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294

gradlew

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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)