[groovy] 01/02: simplify bootstrap

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit ab34a46dfb21216609a73478bbc38e97f891227b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Dec 5 16:13:53 2020 +1000

    simplify bootstrap
---
 README.adoc                                     | 2 +-
 {wrapperBootstrap => bootstrap}/build.gradle    | 8 +++++---
 {wrapperBootstrap => bootstrap}/settings.gradle | 0
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.adoc b/README.adoc
index d0a56d2..61ea973 100644
--- a/README.adoc
+++ b/README.adoc
@@ -118,7 +118,7 @@ expecting.
 
 To bootstrap Gradle, at the top directory of your unpacked source, run the command:
 
-    gradle -p wrapperBootstrap bootstrap
+    gradle -p bootstrap
 
 On Unix-like systems, use `./gradle`.
 
diff --git a/wrapperBootstrap/build.gradle b/bootstrap/build.gradle
similarity index 80%
rename from wrapperBootstrap/build.gradle
rename to bootstrap/build.gradle
index 6191fbd..2469e25 100644
--- a/wrapperBootstrap/build.gradle
+++ b/bootstrap/build.gradle
@@ -22,14 +22,16 @@ file("$projectDir/../gradle.properties").withInputStream {
     props.load(it)
 }
 
+defaultTasks 'bootstrap'
+
 tasks.withType(Wrapper).configureEach {
     gradleVersion = props.gradle_version
 }
 
 task bootstrap(dependsOn: 'wrapper') {
     doLast {
-    ant.move file: "${projectDir}/gradlew", todir: "${projectDir}/../"
-    ant.move file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../"
-    ant.move file: "${projectDir}/gradle/wrapper", todir: "${projectDir}/../gradle/"
+        ant.move file: "${projectDir}/gradlew", todir: "${projectDir}/../"
+        ant.move file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../"
+        ant.move file: "${projectDir}/gradle/wrapper", todir: "${projectDir}/../gradle/"
     }
 }
diff --git a/wrapperBootstrap/settings.gradle b/bootstrap/settings.gradle
similarity index 100%
rename from wrapperBootstrap/settings.gradle
rename to bootstrap/settings.gradle