fix gradle bootstrap process

Author: jdaugherty

README.md

@@ -112,7 +112,8 @@ For further information, please consult the [documentation](https://docs.grails.
 
 For detailed building Grails, please consult the [CONTRIBUTING.md](CONTRIBUTING.md) file. To bootstrap the project from a source distribution, you can execute: 
 
-     gradle wrapper
+    cd gralde-bootstrap
+    gradle wrapper
 
 Then you can proceed with running any valid gradle command from [CONTRIBUTING.md](CONTRIBUTING.md).
 

build.gradle

@@ -19,8 +19,6 @@ import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
-
-
 ext {
     isReproducibleBuild = System.getenv("SOURCE_DATE_EPOCH") != null
     buildInstant = java.util.Optional.ofNullable(System.getenv("SOURCE_DATE_EPOCH"))
@@ -92,7 +90,6 @@ subprojects {
 }
 
 apply {
-    from layout.projectDirectory.file('gradle/gradle-wrapper-root-config.gradle')
     from layout.projectDirectory.file('gradle/publish-root-config.gradle')
     from layout.projectDirectory.file('gradle/rat-root-config.gradle')
 }

gradle-bootstrap/build.gradle

@@ -0,0 +1,52 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+def props = new Properties()
+project.rootProject.layout.projectDirectory.file('../.sdkmanrc').asFile.withInputStream {
+    props.load(it)
+}
+tasks.withType(Wrapper).configureEach {
+    gradleVersion = props.gradle
+}
+
+defaultTasks 'bootstrap'
+tasks.register('bootstrap') {
+    dependsOn 'wrapper'
+    doLast {
+        ant.copy file: "${projectDir}/gradlew", todir: "${projectDir}/../grails-forge"
+        ant.copy file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../grails-forge"
+        ant.copy(todir: "${projectDir}/../grails-forge/gradle/wrapper") {
+            fileset(dir: "${projectDir}/gradle/wrapper") {
+                include(name: 'gradle-wrapper.jar')
+                include(name: 'gradle-wrapper.properties')
+            }
+        }
+        ant.copy file: "${projectDir}/gradlew", todir: "${projectDir}/../grails-gradle"
+        ant.copy file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../grails-gradle"
+        ant.copy(todir: "${projectDir}/../grails-gradle/gradle/wrapper") {
+            fileset(dir: "${projectDir}/gradle/wrapper") {
+                include(name: 'gradle-wrapper.jar')
+                include(name: 'gradle-wrapper.properties')
+            }
+        }
+        ant.move file: "${projectDir}/gradlew", todir: "${projectDir}/../"
+        ant.move file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../"
+        ant.move file: "${projectDir}/gradle/wrapper", todir: "${projectDir}/../gradle"
+    }
+}

gradle/gradle-wrapper-root-config.gradle renamed to gradle-bootstrap/settings.gradle

@@ -16,10 +16,4 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-def props = new Properties()
-project.rootProject.layout.projectDirectory.file('.sdkmanrc').asFile.withInputStream {
-    props.load(it)
-}
-tasks.withType(Wrapper).configureEach {
-    gradleVersion = props.gradle
-}
+

grails-gradle/build.gradle

@@ -54,6 +54,5 @@ ext {
 }
 
 apply {
-    from layout.projectDirectory.file('gradle/gradle-wrapper-root-config.gradle')
     from layout.projectDirectory.file('gradle/publish-root-config.gradle')
 }

grails-gradle/gradle/gradle-wrapper-root-config.gradle

@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip