Skip to content

Commit a799939

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 092dd6c commit a799939

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
@@ -440,18 +440,25 @@ task run(type: Run) {
440440
impliesSubProjects = true
441441
}
442442

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

457464
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)