groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [2/2] groovy git commit: GROOVY-8378: Gradle wrapper bootstrapping should be more independent of the Gradle version used for bootstrapping
Date Tue, 14 Nov 2017 04:06:51 GMT
GROOVY-8378: Gradle wrapper bootstrapping should be more independent of the Gradle version
used for bootstrapping


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fc9ac3fd
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fc9ac3fd
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fc9ac3fd

Branch: refs/heads/GROOVY_2_4_X
Commit: fc9ac3fd96563757fe8029a2d284c4617435b443
Parents: b670974
Author: paulk <paulk@asert.com.au>
Authored: Tue Nov 14 13:52:14 2017 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Tue Nov 14 14:06:31 2017 +1000

----------------------------------------------------------------------
 README.adoc           |  7 +++++--
 build.gradle          |  3 +--
 gradle.properties     | 42 +++++++++++++++++++++++++++++++-----------
 gradle/wrapper.gradle | 21 ---------------------
 wrapper.gradle        | 21 +++++++++++++++++++++
 5 files changed, 58 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/fc9ac3fd/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 142fd8c..7d430b9 100644
--- a/README.adoc
+++ b/README.adoc
@@ -80,7 +80,7 @@ As mentioned in the previous paragraph, if you download the source distribution
 you need to bootstrap Gradle. This isn't needed if you clone from the Github repo.
 
 Each version of Groovy is built and tested using a specific version of Gradle.
-That version is specified by the `gradleVersion` property defined in the `build.gradle`
+That version is specified by the `gradle_version` property defined in the `gradle.properties`
 file within the root directory. Luckily you shouldn't need to know that version and,
 after bootstrapping, you should use the `gradlew` command which will ensure the
 correct version is always used.
@@ -91,9 +91,12 @@ expecting.
 
 To bootstrap Gradle, at the top directory of your unpacked source, run the command:
 
-    gradle wrapper
+    gradle -b wrapper.gradle wrapper
 
 On Unix-like systems, use `./gradle`.
+If the version of Gradle you have installed is close to the required version,
+you might be able to get away without the `-b wrapper.gradle` above, but if in
+doubt leave it in.
 
 *NOTE*: At this point, the Gradle wrapper should be set up and from now on you should use
 the `gradlew` command instead of `gradle`. (On Unix-like systems, use `./gradlew`).

http://git-wip-us.apache.org/repos/asf/groovy/blob/fc9ac3fd/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 522f9b8..ba52d64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -155,7 +155,6 @@ ext {
     commonsHttpClientVersion = '3.1'
     eclipseOsgiVersion = '3.9.1-v20140110-1610'
     gparsVersion = '1.2.1'
-    gradleVersion = '2.14.1'
     ivyVersion = '2.4.0'
     jansiVersion = '1.11'
     jarjarVersion = '1.3'
@@ -354,7 +353,7 @@ task ensureGrammars {
 }
 
 apply from: 'gradle/utils.gradle'
-apply from: 'gradle/wrapper.gradle'
+apply from: 'wrapper.gradle'
 
 task dgmConverter(dependsOn:compileJava) {
     description = 'Generates DGM info file required for faster startup.'

http://git-wip-us.apache.org/repos/asf/groovy/blob/fc9ac3fd/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 31a42c6..27017bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,32 @@
-groovycMain_mx=384m
+# 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.
+
+groovyVersion = 2.4.13-SNAPSHOT
+# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
+groovyBundleVersion = 2.4.13.SNAPSHOT
+
+gradle_version=2.14.1
+
+groovyJUnit_ms=512m
+groovyJUnit_mx=1g
 groovyJUnit_permSize=64m
-groovyBundleVersion=2.4.13.SNAPSHOT
-javacMain_mx=384m
-groovyVersion=2.4.13-SNAPSHOT
-org.gradle.jvmargs=-Xmx1G -XX:MaxPermSize=384m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
-groovyJUnit_mx=512m
-groovycTest_mx=640m
-groovycExamples_mx=384m
-groovyJUnit_ms=256m
-javaDoc_mx=640m
-groovyJUnit_maxPermSize=184m
+groovyJUnit_maxPermSize=256m
+
+javacMain_mx=512m
+groovycMain_mx=1g
+groovycTest_mx=1g
+
+javaDoc_mx=1g
+org.gradle.jvmargs=-Xms800m -Xmx1500m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled
-XX:+CMSPermGenSweepingEnabled

http://git-wip-us.apache.org/repos/asf/groovy/blob/fc9ac3fd/gradle/wrapper.gradle
----------------------------------------------------------------------
diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle
deleted file mode 100644
index 208277a..0000000
--- a/gradle/wrapper.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  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.
- */
-tasks.withType(Wrapper) {
-    gradleVersion = project.gradleVersion
-}

http://git-wip-us.apache.org/repos/asf/groovy/blob/fc9ac3fd/wrapper.gradle
----------------------------------------------------------------------
diff --git a/wrapper.gradle b/wrapper.gradle
new file mode 100644
index 0000000..235b061
--- /dev/null
+++ b/wrapper.gradle
@@ -0,0 +1,21 @@
+/*
+ *  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.
+ */
+tasks.withType(Wrapper) {
+    gradleVersion = gradle_version
+}


Mime
View raw message